Skip to content

Commit 22d1c7a

Browse files
authored
Remove dependency on QuickCheck 2.16 + remove allow-newer QuickCheck (#7295)
* Remove dependency on QuickCheck 2.16 + remove allow-newer QuickCheck * Fix CI warning
1 parent c3a0ee5 commit 22d1c7a

File tree

7 files changed

+51
-54
lines changed

7 files changed

+51
-54
lines changed

cabal.project

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ index-state:
1616
-- Bump both the following dates if you need newer packages from Hackage
1717
, hackage.haskell.org 2025-07-16T09:24:19Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2025-07-02T14:54:39Z
19+
, cardano-haskell-packages 2025-08-27T16:08:15Z
2020

2121
program-options
2222
ghc-options: -Werror
@@ -88,12 +88,6 @@ allow-newer:
8888
, inline-r:containers
8989
, inline-r:primitive
9090

91-
allow-newer:
92-
-- https://github.com/phadej/vec/issues/121
93-
ral:QuickCheck,
94-
fin:QuickCheck,
95-
bin:QuickCheck,
96-
9791
-- https://github.com/IntersectMBO/plutus/pull/7236
9892
constraints: setup.optparse-applicative >=0.19.0.0
9993
allow-newer: turtle:optparse-applicative

flake.lock

Lines changed: 24 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/pkgs.nix

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,26 @@ import inputs.nixpkgs {
99
inputs.haskell-nix.overlay
1010
inputs.iohk-nix.overlays.haskell-nix-crypto
1111
inputs.iohk-nix.overlays.haskell-nix-extra
12+
13+
# Disable the libsigsegv test suite on x86_64-darwin.
14+
#
15+
# On Apple Silicon machines using older Rosetta releases,
16+
# libsigsegv's stack overflow tests fail with "Abort trap"
17+
# due to incomplete emulation of synchronous exceptions.
18+
#
19+
# Newer Rosetta versions (e.g. darwin24.6.0) do not exhibit this issue,
20+
# so this workaround can be removed once those versions are widespread.
21+
#
22+
# This package is a transitive dependency of TeX Live,
23+
# so without this overlay TeX Live cannot be built with affected
24+
# Rosetta versions.
25+
#
26+
# TODO: Remove this once `ci.iog.io` macOS builders are updated to a
27+
# newer version of macOS.
28+
(final: prev: {
29+
libsigsegv = prev.libsigsegv.overrideAttrs (old: {
30+
doCheck = old.doCheck && prev.stdenv.hostPlatform.system != "x86_64-darwin";
31+
});
32+
})
1233
];
1334
}

plutus-core/plutus-core.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ library plutus-core-testlib
832832
, pretty-simple
833833
, prettyprinter >=1.1.0.1
834834
, prettyprinter-configurable
835-
, QuickCheck >=2.16
835+
, QuickCheck
836836
, quickcheck-instances
837837
, quickcheck-transformer
838838
, size-based

plutus-core/testlib/PlutusCore/Generators/QuickCheck/Builtin.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import Data.Text (Text)
3030
import Data.Text qualified as Text
3131
import Data.Text.Encoding qualified as Text
3232
import Data.Vector.Strict qualified as Strict
33-
import Test.QuickCheck hiding (Some (..))
33+
import Test.QuickCheck
3434
import Test.QuickCheck.Instances.ByteString ()
3535
import Test.QuickCheck.Instances.Vector ()
3636
import Universe

plutus-core/untyped-plutus-core/testlib/Evaluation/Builtins/BLS12_381.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import Data.ByteString as BS (empty, length, pack)
2323
import Data.List as List (foldl', genericReplicate, length, nub)
2424
import Text.Printf (printf)
2525

26-
import Test.QuickCheck hiding (Some (..))
26+
import Test.QuickCheck
2727
import Test.Tasty
28-
import Test.Tasty.QuickCheck hiding (Some (..))
28+
import Test.Tasty.QuickCheck
2929

3030
-- QuickCheck utilities
3131

plutus-core/untyped-plutus-core/testlib/Evaluation/Builtins/Costing.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import Data.Maybe
2222
import Data.SatInt
2323
import Test.QuickCheck.Gen
2424
import Test.Tasty
25-
import Test.Tasty.QuickCheck hiding (Some (..))
25+
import Test.Tasty.QuickCheck
2626

2727
deriving newtype instance Foldable NonEmptyList -- QuickCheck...
2828

0 commit comments

Comments
 (0)