diff options
| author | Peter Simons <simons@cryp.to> | 2018-05-17 17:55:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 17:55:59 +0200 |
| commit | b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd (patch) | |
| tree | f3ca418a301ef42c41506f44ee7f26fa7f803ff5 /pkgs/top-level | |
| parent | e5861b8e0da8b13fceab9e841359f51da66664c2 (diff) | |
| parent | 2dd3789d47da95988cea74ff213a7e990c9e3a79 (diff) | |
| download | nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar.gz nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar.bz2 nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar.lz nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar.xz nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.tar.zst nixlib-b5cef2ea66f73420b21b6bf7a2f83c51c3fb95dd.zip | |
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
Ghcjs 8.2 & 8.4
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a395fbec186..2e6bd5ebb853 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -10,7 +10,10 @@ let "ghc821Binary" "ghcCross" "ghcjs" - "ghcjsHEAD" + "ghcjs710" + "ghcjs80" + "ghcjs82" + "ghcjs84" "integer-simple" ]; @@ -76,14 +79,28 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { + ghcjs = compiler.ghcjs82; + ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; }; - ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; inherit (pkgs) cabal-install; }; + ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc822; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; + }; + ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc842; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -139,18 +156,31 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = callPackage ../development/haskell-modules rec { + ghcjs = packages.ghcjs82; + ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackage ../development/haskell-modules rec { + ghcjs80 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs82 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs82; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; + ghcjs84 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs84; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. |