From 823a9e81b2ee4bfb0e1c7a403b70b2f570d78a1d Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 28 Jan 2026 15:16:15 +0900 Subject: [PATCH] Handle splitmix >= 0.1.3.2 removing testu01 test suite Starting in splitmix-0.1.3.2, the testu01 test suite was removed and moved to a separate package. This means we no longer need to pass `testu01 = null` for these versions. Also add `dontCheck` for `integer-logarithms` since its test suite requires QuickCheck >= 2.16, but Stackage LTS-24 only has QuickCheck 2.15. --- CHANGELOG.md | 11 +++++++++++ .../stacklock2nix/cabal2nixArgsForPkg.nix | 7 ++++++- nix/build-support/stacklock2nix/suggestedOverlay.nix | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aa2428..c2234dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ +## 5.2.1 + +* Handle `splitmix >= 0.1.3.2` no longer having a `testu01` test suite. + Starting in splitmix-0.1.3.2, the testu01 test suite was removed and moved + to a separate package. + [#72](https://github.com/cdepillabout/stacklock2nix/pull/72) + +* Add `dontCheck` for `integer-logarithms`. The test suite requires a version + of QuickCheck that is not in Stackage LTS-24. + [#72](https://github.com/cdepillabout/stacklock2nix/pull/72) + ## 5.2.0 * Adds `all-cabal-nixes` argument to stacklock2nix. This gives an diff --git a/nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix b/nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix index f1f39ac..48ce1f3 100644 --- a/nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix +++ b/nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix @@ -117,7 +117,12 @@ cabal2nixArgsOverrides { # # However, testu01 is only used on Linux, so we don't need to do anything # if this is not Linux. - if pkgs.lib.versionAtLeast ver "0.1.0.4" then + # + # Starting in splitmix-0.1.3.2, the testu01 test suite was removed (moved + # to a separate package), so we no longer need to pass testu01 at all. + if pkgs.lib.versionAtLeast ver "0.1.3.2" then + {} + else if pkgs.lib.versionAtLeast ver "0.1.0.4" then if pkgs.stdenv.isLinux then { testu01 = null; } else diff --git a/nix/build-support/stacklock2nix/suggestedOverlay.nix b/nix/build-support/stacklock2nix/suggestedOverlay.nix index c96fa30..5705670 100644 --- a/nix/build-support/stacklock2nix/suggestedOverlay.nix +++ b/nix/build-support/stacklock2nix/suggestedOverlay.nix @@ -177,6 +177,9 @@ hfinal: hprev: with haskell.lib.compose; { HUnit = dontCheck hprev.HUnit; + # Tests have a dependency on a QuickCheck version that is not in Stackage. + integer-logarithms = dontCheck hprev.integer-logarithms; + # Tests try to access internet. js-jquery = dontCheck hprev.js-jquery;