From 4021d4d5ee7338ddaff4a1c5c2e41c85da206f18 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 8 Aug 2017 17:19:02 +0000 Subject: [PATCH 1/3] Make version a parameter in GHC HEAD derivation If you want to override the source but the major version changes (ie 8.1 -> 8.3) then you also have to modify the version. Otherwise the build will fail with difficult to understand errors, making version a parameter makes it easy to override. --- pkgs/development/compilers/ghc/head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 5a505f39b1a..6573c60ac3a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,6 +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.1.20170106" }: let @@ -12,7 +13,6 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20170106"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; commonPreConfigure = '' From cf7b262485cc81feec53966fa8846d241bb78bca Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 8 Aug 2017 17:21:22 +0000 Subject: [PATCH 2/3] Boot ghc HEAD with ghc-8.0.2 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 81a32e1219f..09e3835712f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -84,7 +84,7 @@ in rec { selfPkgs = packages.ghc821; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc802; inherit (bootPkgs) alex happy; inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; From 770743bd91685befe4e3f1caee280d54c17aa641 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 8 Aug 2017 17:32:26 +0000 Subject: [PATCH 3/3] Bump ghc HEAD version ghc-8.3.20170808 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6573c60ac3a..362b4895b7e 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.1.20170106" +, version ? "8.3.20170808" }: let @@ -13,7 +13,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; + rev = "14457cf6a50f708eecece8f286f08687791d51f7"; commonPreConfigure = '' echo ${version} >VERSION @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0"; + sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; }; postPatch = "patchShebangs .";