From 966e34ca776fc8491428b208a7eca81ae2b1fec1 Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Thu, 29 Jan 2026 04:24:08 +0100 Subject: [PATCH 1/2] Bump `cardano-api-10.23.0.0` --- cabal.project | 2 +- cardano-cli/cardano-cli.cabal | 2 +- flake.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 9a6c2fc282..f2de36c18b 100644 --- a/cabal.project +++ b/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 diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 01aee5759a..e12028a9fe 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/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, diff --git a/flake.lock b/flake.lock index 98fbc68938..715663e6de 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1769459742, - "narHash": "sha256-nS+nujs7nocUpWgQ9qvsB5V1BcP4mbVpkoksskwkwQY=", + "lastModified": 1769651866, + "narHash": "sha256-5zf9YWt584gC+M7uxvJAVmkZ7CzJQdmFqH8CMtPjBZ4=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "2ece2c26fab870bf822dc67e956aaf0dcad8d324", + "rev": "50cc893217a20b78e7c260a73d6831364ec05890", "type": "github" }, "original": { From f30522ebed8944b19b79317951bc2a6152f9f661 Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Thu, 29 Jan 2026 23:38:16 +0100 Subject: [PATCH 2/2] Change cross-compilation to GHC-9.12 --- .github/workflows/release-upload.yml | 6 +++--- flake.nix | 22 ++++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml index 0667bd5d85..c2b9573f15 100644 --- a/.github/workflows/release-upload.yml +++ b/.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 }}" diff --git a/flake.nix b/flake.nix index 857771e27e..8f8ad22e4f 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }); }