3.14 pre-flight checks: bump dependencies (haskell#10244)

* allow hashable-1.5 * allow tasty-quickcheck 0.11, and in case of cabal-install:test move to ^>=0.11 --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mpickering · Aug 12, 2024 · 461f1cf · 461f1cf
1 parent f617dfd
commit 461f1cf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,
@@ -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
@@ -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