From fcb8d47fcd3398132da439f601f449fd9c7e9f05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Aug 2015 15:28:40 +0200 Subject: [PATCH] Switch ghcjs to ghc 7.10.2. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 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 1e56981fe8f3..48e7c14f317b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -7,7 +7,7 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy; + inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy; # Many packages fail with: # haddock: internal error: expectJust getPackageDetails diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5e3c6d6f0e05..43fc9976ec7b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -44,8 +44,8 @@ rec { libiconv = pkgs.darwin.libiconv; }); - ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7101; + ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs { + ghc = compiler.ghc7102; }; jhc = callPackage ../development/compilers/jhc {