From 1c55c0b3a12d3ea8d058d1cefc97f1f692b6e844 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 10 Jan 2025 00:45:08 +1300 Subject: [PATCH 1/3] Fix tests that break with latest random package and ghc 9.12.1 Without this fix the cabal planner chooses a plan that while valid based on the constraints, uses old versions of some packages that fail to build. --- test/cabal.project.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cabal.project.local b/test/cabal.project.local index 139f84d65..cdecdf5ac 100644 --- a/test/cabal.project.local +++ b/test/cabal.project.local @@ -3,7 +3,7 @@ if impl(ghc>=9.12.1) -- being shipped with a newer compiler. If you extend this -- be very careful to only extend it for absolutely necessary packages -- otherwise we risk running into broken build-plans down the line. - allow-newer: *:base, *:template-haskell, *:ghc-prim + allow-newer: *:base, *:template-haskell, *:ghc-prim, uuid-types:random, QuickCheck:random, cabal-install:random if impl(ghc > 9.13) allow-newer: *:containers, *:time, *:ghc-bignum From 249f21481a528b139864b42e7caa6ae086dbd139 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 10 Jan 2025 13:35:45 +1300 Subject: [PATCH 2/3] ifdLevel 2 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4d7a252e9..eafbf034c 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ let callFlake = import flake-compat; - ifdLevel = 3; + ifdLevel = 2; runningHydraEvalTest = false; defaultCompiler = "ghc928"; config = import ./config.nix; From f3222b86c3cf9b79e2423de25a6c0add5f7f9ad5 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 11 Jan 2025 01:10:01 +1300 Subject: [PATCH 3/3] ifdLevel 3 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index eafbf034c..4d7a252e9 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ let callFlake = import flake-compat; - ifdLevel = 2; + ifdLevel = 3; runningHydraEvalTest = false; defaultCompiler = "ghc928"; config = import ./config.nix;