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

ghcHEAD: Bump version ghc-8.5.20180118

Browse Source
This commit is contained in:
John Ericson 2018-01-18 11:51:00 -05:00
parent 23c29ebc90
commit a2516efb26
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? true enableShared ? true
, version ? "8.5.20171209" , version ? "8.5.20180118"
}: }:
assert !enableIntegerSimple -> gmp != null; assert !enableIntegerSimple -> gmp != null;
@ -32,8 +32,6 @@ assert !enableIntegerSimple -> gmp != null;
let let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
rev = "4335c07ca7e64624819b22644d7591853826bd75";
# TODO(@Ericson2314) Make unconditional # TODO(@Ericson2314) Make unconditional
targetPrefix = stdenv.lib.optionalString targetPrefix = stdenv.lib.optionalString
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
@ -69,13 +67,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit version rev; inherit version;
inherit (src) rev;
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
inherit rev; rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6";
sha256 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85"; sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -104,7 +103,7 @@ stdenv.mkDerivation rec {
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
echo ${version} >VERSION echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID echo ${src.rev} >GIT_COMMIT_ID
./boot ./boot
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''