From dd8ca92da3d632e0d3b5e0249ae6dc4c772b3842 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Sat, 3 Aug 2024 17:46:05 +0000 Subject: [PATCH 1/2] allow hashable-1.5 --- cabal-install/cabal-install.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 115b9457d4b..cf01fcf37ac 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -231,7 +231,7 @@ library edit-distance >= 0.2.2 && < 0.3, exceptions >= 0.10.4 && < 0.11, filepath >= 1.4.0.0 && < 1.6, - hashable >= 1.0 && < 1.5, + hashable >= 1.0 && < 1.6, HTTP >= 4000.1.5 && < 4000.5, mtl >= 2.0 && < 2.4, network-uri >= 2.6.0.2 && < 2.7, From 7788026c7cb2f4542bb019b391b3a75cee96d013 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Sat, 3 Aug 2024 17:42:40 +0000 Subject: [PATCH 2/2] allow tasty-quickcheck 0.11, and in case of cabal-install:test move to ^>=0.11 --- Cabal-described/Cabal-described.cabal | 2 +- Cabal-tests/Cabal-tests.cabal | 4 ++-- cabal-install-solver/cabal-install-solver.cabal | 2 +- cabal-install/cabal-install.cabal | 4 ++-- .../Distribution/Solver/Modular/QuickCheck/Utils.hs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal index d8471940cea..86b516d94ef 100644 --- a/Cabal-described/Cabal-described.cabal +++ b/Cabal-described/Cabal-described.cabal @@ -19,7 +19,7 @@ library , QuickCheck , rere >=0.1 && <0.3 , tasty <1.6 - , tasty-quickcheck <0.11 + , tasty-quickcheck <0.12 exposed-modules: Distribution.Described diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal index 52647f8a6b4..f7fdc2fb85d 100644 --- a/Cabal-tests/Cabal-tests.cabal +++ b/Cabal-tests/Cabal-tests.cabal @@ -70,7 +70,7 @@ test-suite unit-tests , QuickCheck >=2.14 && <2.15 , tasty >=1.2.3 && <1.6 , tasty-hunit - , tasty-quickcheck <0.11 + , tasty-quickcheck <0.12 , temporary , text @@ -175,7 +175,7 @@ test-suite rpmvercmp QuickCheck , tasty >=1.2.3 && <1.6 , tasty-hunit - , tasty-quickcheck <0.11 + , tasty-quickcheck <0.12 c-sources: tests/cbits/rpmvercmp.c cc-options: -Wall diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 4bc75a32569..be76df236c8 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -135,5 +135,5 @@ Test-Suite unit-tests , Cabal-syntax , cabal-install-solver , tasty >= 1.2.3 && <1.6 - , tasty-quickcheck <0.11 + , tasty-quickcheck <0.12 , tasty-hunit >= 0.10 diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index cf01fcf37ac..db6d1452ae3 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -350,7 +350,7 @@ test-suite unit-tests zlib, tasty >= 1.2.3 && <1.6, tasty-golden >=2.3.1.1 && <2.4, - tasty-quickcheck <0.11, + tasty-quickcheck ^>=0.11, tasty-expected-failure, tasty-hunit >= 0.10, tree-diff, @@ -439,6 +439,6 @@ test-suite long-tests tasty >= 1.2.3 && <1.6, tasty-expected-failure, tasty-hunit >= 0.10, - tasty-quickcheck <0.11, + tasty-quickcheck <0.12, QuickCheck >= 2.14 && <2.16, pretty-show >= 1.6.15 diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck/Utils.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck/Utils.hs index 72283639cd9..c1882bc659a 100644 --- a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck/Utils.hs +++ b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck/Utils.hs @@ -31,7 +31,7 @@ instance IsTest QCWithSeed where run options (QCWithSeed test) progress = do replay <- case lookupOption options of - QuickCheckReplay (Just override) -> return override - QuickCheckReplay Nothing -> getStdRandom random + QuickCheckReplayLegacy override -> return override + _ -> getStdRandom random notice normal $ "Using --quickcheck-replay=" ++ show replay - run (setOption (QuickCheckReplay (Just replay)) options) test progress + run (setOption (QuickCheckReplayLegacy replay) options) test progress