Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 6 additions & 1 deletion nix/build-support/stacklock2nix/cabal2nixArgsForPkg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions nix/build-support/stacklock2nix/suggestedOverlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down