ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Switch ghcjs to ghc 7.10.2.

Browse Source
This commit is contained in:
Peter Simons 2015-08-06 15:28:40 +02:00
parent 961011aea1
commit fcb8d47fcd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -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

4
pkgs/top-level/haskell-packages.nix
View File

@ -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 {