From 1d28f2ba6980971290b8acf9d57383f57bc845a8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 5 Jan 2018 01:44:06 -0200
Subject: [PATCH 1/2] Add watcom-1.0 license
---
lib/licenses.nix | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1fdcc15fd725..29d6abf3648b 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -2,7 +2,7 @@
let
spdx = lic: lic // {
- url = "http://spdx.org/licenses/${lic.spdxId}";
+ url = "http://spdx.org/licenses/${lic.spdxId}.html";
};
in
@@ -564,6 +564,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Vovida Software License v1.0";
};
+ watcom = spdx {
+ spdxId = "Watcom-1.0";
+ fullName = "Sybase Open Watcom Public License 1.0";
+ };
+
w3c = spdx {
spdxId = "W3C";
fullName = "W3C Software Notice and License";
@@ -598,5 +603,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
spdxId = "ZPL-2.1";
fullName = "Zope Public License 2.1";
};
-
}
From 4a553dc247e80b3361da31cff4e25d62a60a75b4 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 5 Jan 2018 01:47:15 -0200
Subject: [PATCH 2/2] jwasm: init at git-2017-11-22
---
pkgs/development/compilers/jwasm/default.nix | 27 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 pkgs/development/compilers/jwasm/default.nix
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
new file mode 100644
index 000000000000..9800b33e7a9e
--- /dev/null
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, cmake }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "jwasm-${version}";
+ version = "git-2017-11-22";
+
+ src = fetchFromGitHub {
+ owner = "JWasm";
+ repo = "JWasm";
+ rev = "26f97c8b5c9d9341ec45538701116fa3649b7766";
+ sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/";
+
+ meta = {
+ description = "A MASM-compatible x86 assembler";
+ homepage = http://jwasm.github.io/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.darwin ++ platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2074d9986eef..8fddd2481e77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6215,6 +6215,8 @@ with pkgs;
julia = julia_06;
+ jwasm = callPackage ../development/compilers/jwasm { };
+
kotlin = callPackage ../development/compilers/kotlin { };
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {