From 1f27ec822211162c1635cda2e1cf3b2eaddf816e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 1 May 2025 16:54:37 +0200 Subject: [PATCH] haskellPackages.crucible*: use what4 >= 1.7 Explicitly requested by crucible-llvm. --- .../haskell-modules/configuration-common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 16d7cbeadd23..1730aae264a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3084,7 +3084,15 @@ self: super: # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 crucible = assert super.crucible.version == "0.7.2"; - doJailbreak super.crucible; + doJailbreak ( + super.crucible.override { + what4 = self.what4_1_7; + } + ); + + crucible-llvm = super.crucible-llvm.override { + what4 = self.what4_1_7; + }; # Test suite invokes cabal-install in a way incompatible with our generic builder # (i.e. tries to re-use the ghc package db / environment from dist-newstyle).