diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2019-01-14 18:04:19 -0500 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2019-01-30 03:22:59 -0500 |
| commit | 57cb854e42b5b01b61db84c17015ca0930442dcc (patch) | |
| tree | 739891240f8a979f9ae6e2b33d566de153d8ef82 /pkgs/top-level/haskell-packages.nix | |
| parent | 27a48b714db69dcf45ff47330969a2fe4029fd07 (diff) | |
| download | nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar.gz nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar.bz2 nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar.lz nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar.xz nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.tar.zst nixlib-57cb854e42b5b01b61db84c17015ca0930442dcc.zip | |
GHCJS: Add 8.6
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 642eeb96219c..0eb7df45920a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -11,6 +11,7 @@ let "ghcjs" "ghcjs82" "ghcjs84" + "ghcjs86" "integer-simple" ]; @@ -83,7 +84,7 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; - ghcjs = compiler.ghcjs84; + ghcjs = compiler.ghcjs86; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; @@ -95,6 +96,12 @@ in { stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; + ghcjs86 = callPackage ../development/compilers/ghcjs-ng { + bootPkgs = packages.ghc863; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -155,7 +162,7 @@ in { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs84; + ghcjs = packages.ghcjs86; ghcjs82 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs82; @@ -168,6 +175,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs86 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs86; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.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. |