diff options
| author | Peter Simons <simons@cryp.to> | 2018-04-20 07:37:34 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-04-20 10:01:31 +0200 |
| commit | 651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621 (patch) | |
| tree | 68ed41e777511cb0af04f10a7c4058090cfa1abe /pkgs/development/compilers/ghc | |
| parent | d7d692778cd04b923a57503516c5246791bc7626 (diff) | |
| download | nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar.gz nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar.bz2 nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar.lz nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar.xz nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.tar.zst nixlib-651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621.zip | |
ghc: version 8.4.2 is now a proper release
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.2.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index e381c411925b..296c10b9346c 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, autoconf, automake, coreutils, fetchurl, perl, python3 , libffi, libiconv ? null, ncurses @@ -68,13 +68,11 @@ let in stdenv.mkDerivation rec { inherit version; - inherit (src) rev; name = "${targetPrefix}ghc-${version}"; - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3"; - sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp"; + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01"; }; enableParallelBuilding = true; @@ -102,9 +100,6 @@ stdenv.mkDerivation rec { export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID - ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" |