Merge pull request #1327 from IntersectMBO/defensive-mempool

Defensive mempool

Author: palas

.github/workflows/release-upload.yml

@@ -159,13 +159,13 @@ jobs:
               derivation+="${{ matrix.arch }}"
               ;;
             "x86_64-linux")
-              derivation+="x86_64-linux.ghc967-x86_64-unknown-linux-musl"
+              derivation+="x86_64-linux.ghc9122-x86_64-unknown-linux-musl"
               ;;
             "aarch64-linux")
-              derivation+="x86_64-linux.ghc967-aarch64-unknown-linux-musl"
+              derivation+="x86_64-linux.ghc9122-aarch64-unknown-linux-musl"
               ;;
             "win64")
-              derivation+="x86_64-linux.ghc967-x86_64-w64-mingw32"
+              derivation+="x86_64-linux.ghc9122-x86_64-w64-mingw32"
               ;;
             *)
               echo "Unexpected matrix.arch value: ${{ matrix.arch }}"

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2025-12-02T22:23:29Z
-  , cardano-haskell-packages 2026-01-26T18:50:24Z
+  , cardano-haskell-packages 2026-01-29T01:19:14Z
 
 packages:
   cardano-cli

cardano-cli/cardano-cli.cabal

@@ -242,7 +242,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=10.22,
+    cardano-api ^>=10.23,
     cardano-binary,
     cardano-crypto,
     cardano-crypto-class ^>=2.2.3.2,

flake.lock

@@ -34,7 +34,8 @@
     defaultCompiler = "ghc984";
     # Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the
     # latter if you change this value.
-    crossCompilerVersion = "ghc967";
+    crossCompilerVersionUcrt64 = "ghc9122";
+    crossCompilerVersionMusl = "ghc967";
   in
     {inherit (inputs) incl;}
     // inputs.flake-utils.lib.eachSystem supportedSystems (
@@ -134,12 +135,17 @@
 
           # we also want cross compilation to windows on linux (and only with default compiler).
           crossPlatforms = p:
-            lib.optionals (system == "x86_64-linux" && config.compiler-nix-name == crossCompilerVersion)
-            [
-              p.ucrt64 # x86_64-windows
-              p.aarch64-multiplatform-musl # aarch64-linux (static)
-              p.musl64 # x86_64-linux (static)
-            ];
+            (
+              lib.optionals (system == "x86_64-linux" && config.compiler-nix-name == crossCompilerVersionUcrt64)
+              [
+                p.ucrt64 # x86_64-windows
+              ]
+            )
+            ++ (lib.optionals (system == "x86_64-linux" && config.compiler-nix-name == crossCompilerVersionMusl)
+              [
+                p.aarch64-multiplatform-musl # aarch64-linux (static)
+                p.musl64 # x86_64-linux (static)
+              ]);
 
           # CHaP input map, so we can find CHaP packages (needs to be more
           # recent than the index-state we set!). Can be updated with
@@ -301,7 +307,7 @@
         flake = cabalProject.flake (
           lib.optionalAttrs (system == "x86_64-linux") {
             # on linux, build/test other supported compilers
-            variants = lib.genAttrs [crossCompilerVersion] (compiler-nix-name: {
+            variants = lib.genAttrs [crossCompilerVersionMusl crossCompilerVersionUcrt64] (compiler-nix-name: {
               inherit compiler-nix-name;
             });
           }