diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-18 11:51:00 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:31:04 -0500 |
| commit | a2516efb2638896df2f02e42b9f0978845db2e9f (patch) | |
| tree | 417f025d9a145d0642447853181486db696fd5c3 /pkgs/development/compilers/ghc | |
| parent | 23c29ebc9041c2bfd91f3b680c68ad81430a3ee2 (diff) | |
| download | nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar.gz nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar.bz2 nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar.lz nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar.xz nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.tar.zst nixlib-a2516efb2638896df2f02e42b9f0978845db2e9f.zip | |
ghcHEAD: Bump version ghc-8.5.20180118
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3cda1b7b6e43..9b40a0ebd6ed 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.5.20171209" +, version ? "8.5.20180118" }: assert !enableIntegerSimple -> gmp != null; @@ -32,8 +32,6 @@ assert !enableIntegerSimple -> gmp != null; let inherit (bootPkgs) ghc; - rev = "4335c07ca7e64624819b22644d7591853826bd75"; - # TODO(@Ericson2314) Make unconditional targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) @@ -69,13 +67,14 @@ let in stdenv.mkDerivation rec { - inherit version rev; + inherit version; + inherit (src) rev; name = "${targetPrefix}ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; - inherit rev; - sha256 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85"; + rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6"; + sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58"; }; enableParallelBuilding = true; @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION - echo ${rev} >GIT_COMMIT_ID + echo ${src.rev} >GIT_COMMIT_ID ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' |