[haskell-updates] haskellPackages.crux: unbreak (#403343)

pkgs/development/haskell-modules/configuration-common.nix

@@ -2998,19 +2998,28 @@ self: super:
     assert super.bzlib.version == "0.5.2.0";
     doJailbreak super.bzlib;
 
-  what4 = lib.pipe super.what4 [
+  inherit
-    (addTestToolDepends (
+    (lib.mapAttrs (
-      with pkgs;
+      _: pkg:
-      [
+      lib.pipe pkg [
-        cvc4
+        (addTestToolDepends (
-        cvc5
+          with pkgs;
-        z3
+          [
+            cvc4
+            cvc5
+            z3
+          ]
+        ))
+        # 2025-04-09: FIXME: template_tests still failing with:
+        #   fd:9: hPutBuf: resource vanished (Broken pipe)
+        dontCheck
+
+        doDistribute
       ]
-    ))
+    ) super)
-    # 2025-04-09: template_tests still failing with:
+    what4
-    #   fd:9: hPutBuf: resource vanished (Broken pipe)
+    what4_1_7
-    dontCheck
+    ;
-  ];
 
   copilot-theorem = lib.pipe super.copilot-theorem [
     (addTestToolDepends (with pkgs; [ z3 ]))
@@ -3086,12 +3095,24 @@ 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).
   sensei = dontCheck super.sensei;
 
+  crux = super.crux.override {
+    simple-get-opt = self.simple-get-opt_0_4;
+  };
+
   # 2025-04-23: jailbreak to allow megaparsec >= 9.7
   # 2025-04-23: test data missing from tarball
   crucible-syntax = doJailbreak (dontCheck super.crucible-syntax);

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -1079,10 +1079,8 @@ broken-packages:
   - crockford # failure in job https://hydra.nixos.org/build/233210759 at 2023-09-02
   - crocodile # failure in job https://hydra.nixos.org/build/233222277 at 2023-09-02
   - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02
-  - crucibile-llvm # what4 >=1.7 https://hydra.nixos.org/build/295428376
   - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02
   - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02
-  - crux # simple-get-opt <0.5 https://hydra.nixos.org/build/295428379
   - crypto-cipher-benchmarks # failure in job https://hydra.nixos.org/build/233195297 at 2023-09-02
   - cryptocompare # failure in job https://hydra.nixos.org/build/233192898 at 2023-09-02
   - cryptoconditions # failure in job https://hydra.nixos.org/build/233211816 at 2023-09-02

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -109,6 +109,7 @@ extra-packages:
   - primitive-unlifted == 0.1.3.1       # 2024-03-16: preserve for ghc 9.2
   - retrie < 1.2.0.0                    # 2022-12-30: preserve for ghc < 9.2
   - shake-cabal < 0.2.2.3               # 2023-07-01: last version to support Cabal 3.6.*
+  - simple-get-opt < 0.5                # 2025-05-01: for crux-0.7.2
   - stylish-haskell == 0.14.4.0         # 2022-09-19: preserve for ghc 9.0
   - stylish-haskell == 0.14.5.0         # 2025-04-14: needed for hls with ghc-lib 9.6
   - tar == 0.6.0.0                      # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2)

pkgs/development/haskell-modules/configuration-nix.nix

@@ -825,6 +825,11 @@ builtins.intersectAttrs super {
     ];
   }) super.crucible-symio;
 
+  # Test suite requires z3 to be in PATH
+  crucible-llvm = addTestToolDepends [
+    pkgs.z3
+  ] super.crucible-llvm;
+
   # Compile manpages (which are in RST and are compiled with Sphinx).
   futhark =
     overrideCabal

pkgs/development/haskell-modules/hackage-packages.nix

@@ -167644,8 +167644,6 @@ self: {
       ];
       description = "Simple top-level library for Crucible Simulation";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -607178,6 +607176,19 @@ self: {
     }
   ) { };
 
+  "simple-get-opt_0_4" = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "simple-get-opt";
+      version = "0.4";
+      sha256 = "0xr5gi22ifq6nw0q0w1rf66djsns4gfv2l9yjvxhbxr4j8bqmwik";
+      libraryHaskellDepends = [ base ];
+      description = "A simple library for processing command-line options";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "simple-get-opt" = callPackage (
     { mkDerivation, base }:
     mkDerivation {