diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-01-31 20:06:56 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-01-31 20:44:49 -0500 |
commit | c01eb0695424135f6669da5982f68ead5ef7316d (patch) | |
tree | 4617938c9236fb36d191754fc499dfc588980fc0 /pkgs | |
parent | ec1e4d54958463f3893b356420e847cff7948af8 (diff) | |
download | nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar.gz nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar.bz2 nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar.lz nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar.xz nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.tar.zst nixlib-c01eb0695424135f6669da5982f68ead5ef7316d.zip |
ghcjs: build with GHC 7.10.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 6e8c0be7d0d9..b59c3447a2b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -12,7 +12,7 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools; + inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 14bb80ebf04d..00b8f9ba9285 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -50,8 +50,8 @@ rec { inherit (packages.ghc784) ghc alex happy; }; - ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7102; + ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { + ghc = compiler.ghc7103; }; jhc = callPackage ../development/compilers/jhc { |