Skip to content

Commit 823a9e8

Browse files
committed
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.
1 parent 246cae9 commit 823a9e8

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
## 5.2.1
3+
4+
* Handle `splitmix >= 0.1.3.2` no longer having a `testu01` test suite.
5+
Starting in splitmix-0.1.3.2, the testu01 test suite was removed and moved
6+
to a separate package.
7+
[#72](https://github.com/cdepillabout/stacklock2nix/pull/72)
8+
9+
* Add `dontCheck` for `integer-logarithms`. The test suite requires a version
10+
of QuickCheck that is not in Stackage LTS-24.
11+
[#72](https://github.com/cdepillabout/stacklock2nix/pull/72)
12+
213
## 5.2.0
314

415
* Adds `all-cabal-nixes` argument to stacklock2nix. This gives an

nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ cabal2nixArgsOverrides {
117117
#
118118
# However, testu01 is only used on Linux, so we don't need to do anything
119119
# if this is not Linux.
120-
if pkgs.lib.versionAtLeast ver "0.1.0.4" then
120+
#
121+
# Starting in splitmix-0.1.3.2, the testu01 test suite was removed (moved
122+
# to a separate package), so we no longer need to pass testu01 at all.
123+
if pkgs.lib.versionAtLeast ver "0.1.3.2" then
124+
{}
125+
else if pkgs.lib.versionAtLeast ver "0.1.0.4" then
121126
if pkgs.stdenv.isLinux then
122127
{ testu01 = null; }
123128
else

nix/build-support/stacklock2nix/suggestedOverlay.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ hfinal: hprev: with haskell.lib.compose; {
177177

178178
HUnit = dontCheck hprev.HUnit;
179179

180+
# Tests have a dependency on a QuickCheck version that is not in Stackage.
181+
integer-logarithms = dontCheck hprev.integer-logarithms;
182+
180183
# Tests try to access internet.
181184
js-jquery = dontCheck hprev.js-jquery;
182185

0 commit comments

Comments
 (0)