diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:11:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:11:01 +0200 |
| commit | f001c81c1accfd3c3e9ca96f51a20be92875bc0d (patch) | |
| tree | 6e9c5c362cf3ff2ffcc25694c51272d3c35fbf9f /pkgs/top-level | |
| parent | 3c09808160bd06eeee14bdca462fa9b3ef947271 (diff) | |
| parent | 862e4e4fdb665981b140fda9dcf7298f09fbc061 (diff) | |
| download | nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.gz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.bz2 nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.lz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.xz nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.tar.zst nixlib-f001c81c1accfd3c3e9ca96f51a20be92875bc0d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cca0b7ba3460..5fef4872db21 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -84,7 +84,7 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = compiler.ghcjs82; + ghcjs = compiler.ghcjs84; ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; @@ -166,7 +166,7 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs82; + ghcjs = packages.ghcjs84; ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs710; |