From 3b49ae00d1275da012c1277cea1ac1438f0ffd53 Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Wed, 19 Jul 2023 13:04:34 +0200 Subject: [PATCH 1/2] Update boot GHC to 9.6 Because we are heading straight for 9.10 on master --- ghc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc.nix b/ghc.nix index bbe0658..3326198 100644 --- a/ghc.nix +++ b/ghc.nix @@ -14,8 +14,8 @@ in { system ? builtins.currentSystem , nixpkgs , all-cabal-hashes -, bootghc ? "ghc927" -, version ? "9.3" +, bootghc ? "ghc96" +, version ? "9.9" , hadrianCabal ? hadrianPath , useClang ? false # use Clang for C compilation , withLlvm ? false From f500a4f91aadaabc58501f675f3c9847b0f521f9 Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Wed, 19 Jul 2023 13:08:22 +0200 Subject: [PATCH 2/2] Newer happy Without upper bound on mtl --- ghc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc.nix b/ghc.nix index 3326198..c590e98 100644 --- a/ghc.nix +++ b/ghc.nix @@ -132,7 +132,7 @@ let happy = if lib.versionAtLeast version "9.1" - then noTest (hspkgs.callHackage "happy" "1.20.0" { }) + then noTest (hspkgs.callHackage "happy" "1.20.1.1" { }) else noTest (haskell.packages.ghc865Binary.callHackage "happy" "1.19.12" { }); alex =