From 5c1f374f59a2298fd9878ac340935024f22ccf7d Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Sat, 3 Aug 2024 17:42:40 +0000
Subject: [PATCH] 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 ++--
 .../UnitTests/Distribution/Solver/Modular/QuickCheck/Utils.hs | 4 ++--
 5 files changed, 8 insertions(+), 8 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..64e6b5b1761 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