diff options
| author | Peter Simons <simons@cryp.to> | 2016-08-27 12:34:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 12:34:14 +0200 |
| commit | 44289f81e98f1d1217209741b1e1e631a9511a75 (patch) | |
| tree | d23fa4d214e08ca4c6a5972d23e3d9e6db59ea6d /pkgs/development | |
| parent | 739261f3bca8d0e4f86d7423b1d9438fb31b18d0 (diff) | |
| parent | 5f8891153be81519e53b864777e65b4b956c07d5 (diff) | |
| download | nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar.gz nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar.bz2 nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar.lz nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar.xz nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.tar.zst nixpkgs-44289f81e98f1d1217209741b1e1e631a9511a75.zip | |
Merge pull request #18022 from mboes/ghcHEAD
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 0f3b57949b7..eebdaca5f83 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 [ |