diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ghcjs/7.10/boot.patch (renamed from pkgs/development/compilers/ghcjs/ghcjs.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/7.10/default.nix | 50 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/7.10/shims.nix (renamed from pkgs/development/compilers/ghcjs/shims.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/7.10/stage2.nix (renamed from pkgs/development/compilers/ghcjs/stage2.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/8.0/boot.patch (renamed from pkgs/development/compilers/ghcjs/ghcjs-head.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/8.0/default.nix (renamed from pkgs/development/compilers/ghcjs/head.nix) | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/8.0/shims.nix (renamed from pkgs/development/compilers/ghcjs/head_shims.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/8.0/stage2.nix (renamed from pkgs/development/compilers/ghcjs/head_stage2.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 46 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 5 |
10 files changed, 60 insertions, 49 deletions
diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch index 9f4fa3a8b7a..9f4fa3a8b7a 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/7.10/boot.patch diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix new file mode 100644 index 00000000000..f18a094aa3c --- /dev/null +++ b/pkgs/development/compilers/ghcjs/7.10/default.nix @@ -0,0 +1,50 @@ +{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: + +bootPkgs.callPackage ../base.nix { + version = "0.2.0"; + + inherit bootPkgs cabal-install; + + ghcjsSrc = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; + }; + ghcjsBootSrc = fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "8c549931da27ba9e607f77195208ec156c840c8a"; + sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; + fetchSubmodules = true; + }; + + shims = import ./shims.nix { inherit fetchFromGitHub; }; + stage1Packages = [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ]; + stage2 = import ./stage2.nix; + + patches = [ ./boot.patch ]; +} diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix index fa706699449..fa706699449 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/7.10/shims.nix diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix index 3483afc99ef..3483afc99ef 100644 --- a/pkgs/development/compilers/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/7.10/stage2.nix diff --git a/pkgs/development/compilers/ghcjs/ghcjs-head.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch index bbb5b30468c..bbb5b30468c 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-head.patch +++ b/pkgs/development/compilers/ghcjs/8.0/boot.patch diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix index 84eb2d8bd0d..a786f536eb9 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/8.0/default.nix @@ -1,6 +1,6 @@ { fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: -bootPkgs.callPackage ./base.nix { +bootPkgs.callPackage ../base.nix { version = "0.2.020170323"; inherit bootPkgs cabal-install; @@ -18,7 +18,7 @@ bootPkgs.callPackage ./base.nix { fetchSubmodules = true; }; - shims = import ./head_shims.nix { inherit fetchFromGitHub; }; + shims = import ./shims.nix { inherit fetchFromGitHub; }; stage1Packages = [ "array" "base" @@ -44,7 +44,7 @@ bootPkgs.callPackage ./base.nix { "transformers" "unix" ]; - stage2 = import ./head_stage2.nix; + stage2 = import ./stage2.nix; - patches = [ ./ghcjs-head.patch ]; + patches = [ ./boot.patch ]; } diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix index a9a7f8d45e2..a9a7f8d45e2 100644 --- a/pkgs/development/compilers/ghcjs/head_shims.nix +++ b/pkgs/development/compilers/ghcjs/8.0/shims.nix diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix index 18c7a76dd3a..18c7a76dd3a 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/8.0/stage2.nix diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 46e9d8d72be..34c332d87d9 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -37,57 +37,23 @@ , coreutils , libiconv -, version ? "0.2.0" -, ghcjsSrc ? fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; - sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; - } -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8c549931da27ba9e607f77195208ec156c840c8a"; - sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; - fetchSubmodules = true; - } +, version +, ghcjsSrc +, ghcjsBootSrc , ghcjsBoot ? import ./ghcjs-boot.nix { inherit runCommand; src = ghcjsBootSrc; } -, shims ? import ./shims.nix { inherit fetchFromGitHub; } +, shims # This is the list of the Stage 1 packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" -, stage1Packages ? [ - "array" - "base" - "binary" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-boot" - "ghc-boot-th" - "ghc-prim" - "ghci" - "ghcjs-prim" - "ghcjs-th" - "integer-gmp" - "pretty" - "primitive" - "process" - "rts" - "template-haskell" - "time" - "transformers" - "unix" - ] +, stage1Packages , stage2 ? import ./stage2.nix -, patches ? [ ./ghcjs.patch ] +, patches # used for resolving compiler plugins , ghcLibdir ? null diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix deleted file mode 100644 index 7f3cc944001..00000000000 --- a/pkgs/development/compilers/ghcjs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ bootPkgs, cabal-install }: - -bootPkgs.callPackage ./base.nix { - inherit bootPkgs cabal-install; -} |