Merge pull request #32503 from mpickering/ghc-head-updates-8.5

ghcHEAD: 8.3.20170808 -> 8.5.20171209
This commit is contained in:
Peter Simons 2017-12-09 19:27:04 +01:00 committed by GitHub
commit 73d85455e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -5,7 +5,7 @@
# If enabled GHC will be build with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
, enableIntegerSimple ? false, gmp
, version ? "8.3.20170808"
, version ? "8.5.20171209"
}:
let
@ -13,7 +13,7 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
rev = "14457cf6a50f708eecece8f286f08687791d51f7";
rev = "4335c07ca7e64624819b22644d7591853826bd75";
commonPreConfigure = ''
echo ${version} >VERSION
@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y";
sha256 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85";
};
postPatch = "patchShebangs .";

View file

@ -86,7 +86,7 @@ in rec {
selfPkgs = packages.ghc822;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc802;
bootPkgs = packages.ghc822;
inherit (bootPkgs) alex happy;
inherit buildPlatform targetPlatform;
selfPkgs = packages.ghcHEAD;