From d02a5e9c72386a47622daa93d7951b8957f87c3c Mon Sep 17 00:00:00 2001 From: John Ky Date: Mon, 22 Sep 2025 00:00:23 +1000 Subject: [PATCH 1/7] chore(deps): upgrade hedgehog-extras from ^>=0.8 to ^>=0.10 Updates hedgehog-extras dependency to version 0.10, which introduces breaking API changes requiring MonadBaseControl constraint additions to test code. - Add FlexibleContexts language extension for constraint handling - Import Control.Monad.Trans.Control for MonadBaseControl - Add MonadBaseControl IO constraint to hash_trip_fun signature - Add MonadAssertion constraint for hedgehog compatibility Also updates hackage index to 2025-09-10 to access the newer version. --- cabal.project | 3 +-- cardano-cli/cardano-cli.cabal | 2 +- .../test/cardano-cli-test/Test/Cli/Run/Hash.hs | 13 ++++++++++++- flake.lock | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index 7bf08979ef..8ec1dc6d45 100644 --- a/cabal.project +++ b/cabal.project @@ -13,7 +13,7 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2025-06-22T20:18:27Z + , hackage.haskell.org 2025-09-10T10:05:13Z , cardano-haskell-packages 2025-09-15T19:20:34Z packages: @@ -64,4 +64,3 @@ if impl (ghc >= 9.12) allow-newer: -- https://github.com/kapralVV/Unique/issues/11 , Unique:hashable - diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index a7c9e15d61..0fbe6af805 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -331,7 +331,7 @@ library cardano-cli-test-lib exceptions, filepath, hedgehog, - hedgehog-extras >=0.7.1, + hedgehog-extras ^>=0.10, http-types, lifted-base, mmorph, diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Run/Hash.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Run/Hash.hs index 7e1923d869..d2398cd1f7 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/Run/Hash.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Run/Hash.hs @@ -1,9 +1,12 @@ +{-# LANGUAGE FlexibleContexts #-} + {- HLINT ignore "Use camelCase" -} module Test.Cli.Run.Hash where import Control.Monad (void) import Control.Monad.Catch (MonadCatch) +import Control.Monad.Trans.Control (MonadBaseControl) import Control.Monad.Trans.Resource (MonadResource) import GHC.Stack @@ -24,7 +27,15 @@ hprop_hash_trip = -- Test that @cardano-cli hash --text > file1@ and -- @cardano-cli --text --out-file file2@ yields -- similar @file1@ and @file2@ files. -hash_trip_fun :: (MonadTest m, MonadCatch m, MonadResource m, HasCallStack) => String -> m () +hash_trip_fun + :: ( MonadBaseControl IO m + , MonadTest m + , MonadCatch m + , MonadResource m + , H.MonadAssertion m + , HasCallStack + ) + => String -> m () hash_trip_fun input = H.moduleWorkspace "tmp" $ \tempDir -> do hashFile <- noteTempFile tempDir "hash.txt" diff --git a/flake.lock b/flake.lock index 98ebbaa2d6..0a7daed291 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1750552134, - "narHash": "sha256-KC/e7tQOID9SgRkmH3BNlnPZ7sn3v5k5GyllLmSZicY=", + "lastModified": 1758414423, + "narHash": "sha256-XNdw1qUe/y0RA/J1rjHXckcJd/eZjUYutR9w+BG+ta4=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a5d60b2d3c435cf26848e34b92e28f96e13cde7c", + "rev": "bf07667a271f84b5f8ffa734c8376e1c6ffa8e5a", "type": "github" }, "original": { From 32eacdcb635cc28f039d745b7941d4000dd0e847 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 26 Sep 2025 14:57:26 +1000 Subject: [PATCH 2/7] chore(nix): unpin haskell.nix version Removes the fixed 2024.09.15 version pin from haskell.nix input, allowing the project to track the latest haskell.nix infrastructure. This update brings: - Latest GHC compiler infrastructure improvements - Updated Haskell Language Server (HLS) versions 2.10 and 2.11 - New hackage-for-stackage and hackage-internal inputs - Removal of deprecated hydra and ghc-8.6.5-iohk dependencies - Addition of nixpkgs-2411 and nixpkgs-2505 channels The flake.lock updates reflect the new dependency graph structure with cleaner separation between hackage snapshots and internal tooling. --- flake.lock | 315 ++++++++++++++++++++--------------------------------- flake.nix | 2 +- 2 files changed, 121 insertions(+), 196 deletions(-) diff --git a/flake.lock b/flake.lock index 0a7daed291..ec009a0858 100644 --- a/flake.lock +++ b/flake.lock @@ -153,20 +153,36 @@ "type": "github" } }, - "ghc-8.6.5-iohk": { + "hackage-for-stackage": { "flake": false, "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "lastModified": 1758846300, + "narHash": "sha256-uS0e51ny5rGdI5HiOttTYMjGyOqBSoraXDWCY7gFc9g=", "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "repo": "hackage.nix", + "rev": "813f87b29c01a70bf479ff7c72b240d7d6a3fe16", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "for-stackage", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage-internal": { + "flake": false, + "locked": { + "lastModified": 1750307553, + "narHash": "sha256-iiafNoeLHwlSLQTyvy8nPe2t6g5AV4PPcpMeH/2/DLs=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "f7867baa8817fab296528f4a4ec39d1c7c4da4f3", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", + "repo": "hackage.nix", "type": "github" } }, @@ -195,12 +211,16 @@ "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": [ "hackageNix" ], + "hackage-for-stackage": "hackage-for-stackage", + "hackage-internal": "hackage-internal", + "hls": "hls", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.10": "hls-2.10", + "hls-2.11": "hls-2.11", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -210,39 +230,50 @@ "hls-2.8": "hls-2.8", "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", + "nixpkgs-2411": "nixpkgs-2411", + "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1726275037, - "narHash": "sha256-q0+NlcOGV1eQRN1FjLpt5li6iyPQPeky37hwP5JLqVU=", + "lastModified": 1758847890, + "narHash": "sha256-rGX7RF8Au5ZJJSqlQivsl4seyEslI/K3OnEC9ulLwNM=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "a93d40302777a9ce268b3bc57caae3f7fdae1ce1", + "rev": "46abef90b4101ff9253a574cf6fbdc74b78a5863", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "2024.09.15", "repo": "haskell.nix", "type": "github" } }, + "hls": { + "flake": false, + "locked": { + "lastModified": 1741604408, + "narHash": "sha256-tuq3+Ip70yu89GswZ7DSINBpwRprnWnl6xDYnS4GOsc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "682d6894c94087da5e566771f25311c47e145359", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -277,6 +308,40 @@ "type": "github" } }, + "hls-2.10": { + "flake": false, + "locked": { + "lastModified": 1743069404, + "narHash": "sha256-q4kDFyJDDeoGqfEtrZRx4iqMVEC2MOzCToWsFY+TOzY=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "2318c61db3a01e03700bd4b05665662929b7fe8b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.11": { + "flake": false, + "locked": { + "lastModified": 1747306193, + "narHash": "sha256-/MmtpF8+FyQlwfKHqHK05BdsxC9LHV70d/FiMM7pzBM=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "46ef4523ea4949f47f6d2752476239f1c6d806fe", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.11.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -399,16 +464,16 @@ "hls-2.9": { "flake": false, "locked": { - "lastModified": 1718469202, - "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", + "lastModified": 1719993701, + "narHash": "sha256-wy348++MiMm/xwtI9M3vVpqj2qfGgnDcZIGXw8sF1sA=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "40891bccb235ebacce020b598b083eab9dda80f1", + "rev": "90319a7e62ab93ab65a95f8f2bcf537e34dae76a", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.9.0.0", + "ref": "2.9.0.1", "repo": "haskell-language-server", "type": "github" } @@ -429,29 +494,6 @@ "type": "github" } }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, "incl": { "inputs": { "nixlib": "nixlib" @@ -473,7 +515,7 @@ "iohkNix": { "inputs": { "blst": "blst", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "secp256k1": "secp256k1", "sodium": "sodium" }, @@ -494,11 +536,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1717479972, - "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "lastModified": 1755243078, + "narHash": "sha256-GLbl1YaohKdpzZVJFRdcI1O1oE3F3uBer4lFv3Yy0l8=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "2ed34002247213fc435d0062350b91bab920626e", + "rev": "150605195cb7183a6fb7bed82f23fedf37c6f52a", "type": "github" }, "original": { @@ -508,43 +550,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1667696192, @@ -562,96 +567,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", + "owner": "nixos", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -690,11 +615,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1720122915, - "narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=", + "lastModified": 1735564410, + "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "835cf2d3f37989c5db6585a28de967a667a75fb1", + "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", "type": "github" }, "original": { @@ -704,50 +629,50 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-2411": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-2505": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1754477006, + "narHash": "sha256-suIgZZHXdb4ca9nN4MIcmdjeN+ZWsTwCtYAG4HExqAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "4896699973299bffae27d0d9828226983544d9e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-25.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", - "owner": "nixos", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-22.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -820,11 +745,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1726100060, - "narHash": "sha256-nvxogFYvwoUuqTHKyn1vcOuQFKEGGlXiTNzTDHeOImk=", + "lastModified": 1758845522, + "narHash": "sha256-SgkvlWF9a+Qrkn791ZOiUVt3wuZXRJ06YjpTZMRy+R8=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "732fcc1460200a3050697a056a0fe9d460d0dbec", + "rev": "e2f097d435e38fb6e649efa4a95e214a506a1da5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a2cd84d84..b663ef375b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake = false; }; haskellNix = { - url = "github:input-output-hk/haskell.nix?ref=2024.09.15"; + url = "github:input-output-hk/haskell.nix"; inputs.hackage.follows = "hackageNix"; }; nixpkgs.follows = "haskellNix/nixpkgs-unstable"; From be102b48e80e570da6e0e041272de41b9dff2752 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 26 Sep 2025 14:16:48 +1000 Subject: [PATCH 3/7] chore(build): update cross compiler to ghc 9.6.7 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b663ef375b..c6517c149d 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ defaultCompiler = "ghc982"; # Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the # latter if you change this value. - crossCompilerVersion = "ghc966"; + crossCompilerVersion = "ghc967"; in {inherit (inputs) incl;} // inputs.flake-utils.lib.eachSystem supportedSystems ( From 114321b8cc21aa0a7fae2cb8a598daff83c9a9c8 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 26 Sep 2025 16:12:25 +1000 Subject: [PATCH 4/7] ci: upgrade github-script action from v6 to v7 --- .github/workflows/check-pr-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pr-changelog.yml b/.github/workflows/check-pr-changelog.yml index 8edcf155b3..4a776bb138 100644 --- a/.github/workflows/check-pr-changelog.yml +++ b/.github/workflows/check-pr-changelog.yml @@ -20,7 +20,7 @@ jobs: - name: Fail if PR changelog is not correct if: ${{ github.event_name != 'merge_group' }} - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: check-changelog with: github-token: ${{ secrets.GITHUB_TOKEN }} From 18633ce1058a8bf1b9d05170cc45fe09f7182592 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Mon, 18 Aug 2025 16:52:04 +0200 Subject: [PATCH 5/7] fix(build): resolve basement mingw32 compilation error Adds --hsc2hs-option=--cflag=-Wno-int-conversion to the basement package configure flags to suppress int conversion warnings that cause build failures on mingw32 Windows targets. This fixes a known issue where basement's C bindings fail to compile under mingw32 due to stricter type checking in newer GCC versions. --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index c6517c149d..a7687ba2de 100644 --- a/flake.nix +++ b/flake.nix @@ -144,6 +144,7 @@ modules = [ ({pkgs, ...}: { packages.cardano-cli.configureFlags = ["--ghc-option=-Werror"] ++ gitRevFlag; + packages.basement.configureFlags = [ "--hsc2hs-option=--cflag=-Wno-int-conversion" ]; }) ({ pkgs, From 0745879fb2d8c1276babc270136c558568ca707a Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 26 Sep 2025 19:00:47 +1200 Subject: [PATCH 6/7] chore(deps): update iohkNix with blst v0.3.14 and nixpkgs 25.05 Updates critical cryptographic and build infrastructure dependencies to their latest stable versions for improved performance and security. - Upgrade blst from v0.3.11 to v0.3.14 (supranational BLS12-381 library) - Update nixpkgs from release-22.11 to release-25.05 - Refresh iohk-nix with latest dependency pins The blst upgrade includes performance improvements and bug fixes for BLS signature operations. The nixpkgs update provides newer compiler toolchains and system packages required for the build infrastructure. --- flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index ec009a0858..10e9d4bba2 100644 --- a/flake.lock +++ b/flake.lock @@ -36,16 +36,16 @@ "blst": { "flake": false, "locked": { - "lastModified": 1691598027, - "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", + "lastModified": 1739372843, + "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", "owner": "supranational", "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", + "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", "type": "github" }, "original": { "owner": "supranational", - "ref": "v0.3.11", + "ref": "v0.3.14", "repo": "blst", "type": "github" } @@ -520,11 +520,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1734618971, - "narHash": "sha256-5StB/VhWHOj3zlBxshqVFa6cwAE0Mk/wxRo3eEfcy74=", + "lastModified": 1757407040, + "narHash": "sha256-rSHOQli+iffMmneSF/Ov8Uci6APaROWen+EfRb5mmiU=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "dc900a3448e805243b0ed196017e8eb631e32240", + "rev": "a94259528eb6d37073512d1767f14fd8ea12a8f0", "type": "github" }, "original": { @@ -567,16 +567,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "lastModified": 1751071626, + "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "rev": "a47938d89bdf8e279ad432bd6a473cf4c430f48c", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-22.11", + "ref": "release-25.05", "repo": "nixpkgs", "type": "github" } From 080ac73347f7610fa49253c57a83d40732507ad7 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 26 Sep 2025 19:45:51 +1200 Subject: [PATCH 7/7] fix(build): constrain network package for WINE test compatibility Adds constraint network <3.2.8.0 specifically for Windows builds to work around network-3.2.8.0 issues when running tests under WINE (see https://github.com/haskell/network/issues/604). This ensures test suites can run successfully in cross-platform CI environments using WINE for Windows testing. --- cabal.project | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cabal.project b/cabal.project index 8ec1dc6d45..4a67ee6a7b 100644 --- a/cabal.project +++ b/cabal.project @@ -35,6 +35,8 @@ extra-packages: Cabal if os(windows) constraints: time ^>=1.14 allow-newer: *:time + -- Needed for running tests with WINE (see https://github.com/haskell/network/issues/604) + constraints: network <3.2.8.0 -- Depending on C++ for just so slightly faster utf8 parsing is a bit annoying -- especially as it brings in all kinds of complications for GHC.