JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell.compiler.ghcHEAD: update to latest upstream (20160826).

Browse Source
This commit is contained in:
Mathieu Boespflug 2016-08-26 21:15:04 +02:00
parent 59f04899aa
commit 5f8891153b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/ghc/head.nix
View File

@ -6,18 +6,18 @@ let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "7.11.20151216"; version = "8.1.20160826";
name = "ghc-${version}"; name = "ghc-${version}";
rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97"; rev = "0050aff22ba04baca732bf5124002417ab667f8a";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
inherit rev; inherit rev;
sha256 = "0rjzkzn0hz1vdnjikcbwfs5ggs8r3y4gqxfdn4jzfp45gx94wiwv"; sha256 = "1iirb11fr8914pb6i988cfji56gs698ll819bgb0hpcdkrmffwqc";
}; };
patches = [ patches = [
./ghc-7.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
]; ];
postUnpack = '' postUnpack = ''
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-gcc=${stdenv.cc}/bin/cc" "--with-cc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [ ] ++ stdenv.lib.optional stdenv.isDarwin [

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

@ -47,7 +47,7 @@ rec {
inherit (bootPkgs) hscolour; inherit (bootPkgs) hscolour;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc784; bootPkgs = packages.ghc7103;
inherit (bootPkgs) alex happy; inherit (bootPkgs) alex happy;
}; };
ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {