diff options
author | Mathieu Boespflug <m@tweag.io> | 2016-08-26 21:15:04 +0200 |
---|---|---|
committer | Mathieu Boespflug <m@tweag.io> | 2016-08-26 21:15:04 +0200 |
commit | 5f8891153be81519e53b864777e65b4b956c07d5 (patch) | |
tree | 037fbe881c0cfdc2bf6f94bf437320bdc89e1b23 /pkgs/development | |
parent | 59f04899aa173273e194d1bbead2b7ec82e0c9f8 (diff) | |
download | nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar.gz nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar.bz2 nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar.lz nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar.xz nixlib-5f8891153be81519e53b864777e65b4b956c07d5.tar.zst nixlib-5f8891153be81519e53b864777e65b4b956c07d5.zip |
haskell.compiler.ghcHEAD: update to latest upstream (20160826).
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0f3b57949b7a..eebdaca5f83c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,18 +6,18 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "7.11.20151216"; + version = "8.1.20160826"; name = "ghc-${version}"; - rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97"; + rev = "0050aff22ba04baca732bf5124002417ab667f8a"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "0rjzkzn0hz1vdnjikcbwfs5ggs8r3y4gqxfdn4jzfp45gx94wiwv"; + sha256 = "1iirb11fr8914pb6i988cfji56gs698ll819bgb0hpcdkrmffwqc"; }; 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 = '' @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ''; 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-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ |