From e7a327da5cffdf5e77e1924906a4f0983591bd3e Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 9 Dec 2017 10:52:13 +0000 Subject: [PATCH] ghcHEAD: 8.3.20170808 -> 8.5.20171208 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 92ba3f6a46e..3f5dfa65958 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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 ."; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 111893f93b7..7e52fdb29fc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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;