Fix #8377: allow text-2.0 and time-1.12 in cabal-install

cabal-install/cabal-install.cabal

@@ -221,10 +221,10 @@ library
         random     >= 1.2      && < 1.3,
         stm        >= 2.0      && < 2.6,
         tar        >= 0.5.0.3  && < 0.6,
-        time       >= 1.5.0.1  && < 1.12,
+        time       >= 1.5.0.1  && < 1.13,
         zlib       >= 0.5.3    && < 0.7,
         hackage-security >= 0.6.2.0 && < 0.7,
-        text       >= 1.2.3    && < 1.3,
+        text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.1,
         parsec     >= 3.1.13.0 && < 3.2,
         regex-base  >= 0.94.0.0 && <0.95,
         regex-posix >= 0.96.0.0 && <0.97,

cabal-testsuite/cabal-testsuite.cabal

@@ -57,7 +57,7 @@ library
     Test.Cabal.ScriptEnv0
 
   build-depends:
-    , aeson                 ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0
+    , aeson                 ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0 || ^>= 2.1.0.0
     , async                 ^>= 2.2.1
     , attoparsec            ^>= 0.13.2.2 || ^>=0.14.1
     , base16-bytestring     ^>= 0.1.1.6 || ^>= 1.0.0.0
@@ -67,15 +67,15 @@ library
     , directory             ^>= 1.2.0.1 || ^>= 1.3.0.0
     , exceptions            ^>= 0.10.0
     , filepath              ^>= 1.3.0.1 || ^>= 1.4.0.0
-    , network-wait          ^>= 0.1.2.0
-    , optparse-applicative  ^>= 0.14.3.0 || ^>=0.15.1.0 || ^>=0.16.0.0
+    , network-wait          ^>= 0.1.2.0 || ^>= 0.2.0.0
+    , optparse-applicative  ^>= 0.14.3.0 || ^>=0.15.1.0 || ^>=0.16.0.0 || ^>= 0.17.0.0
     , process               ^>= 1.2.1.0 || ^>= 1.4.2.0 || ^>= 1.6.1.0
     , regex-base            ^>= 0.94.0.1
     , regex-tdfa            ^>= 1.2.3.1 || ^>=1.3.1.0
     , retry                 ^>= 0.9.1.0
     , array                 ^>= 0.4.0.1 || ^>= 0.5.0.0
     , temporary             ^>= 1.3
-    , text                  ^>= 1.2.3.1
+    , text                  ^>= 1.2.3.1 || ^>= 2.0.1
     , transformers          ^>= 0.3.0.0 || ^>= 0.4.2.0 || ^>= 0.5.2.0
 
   if !os(windows)

cabal-testsuite/src/Test/Cabal/Prelude.hs

@@ -641,7 +641,7 @@ withRemoteRepo repoDir m = do
           (\_ -> do
             -- wait for the python webserver to come up with a exponential
             -- backoff starting from 50ms, up to a maximum wait of 60s
-            waitTcpVerbose putStrLn (limitRetriesByCumulativeDelay 60000000 $ exponentialBackoff 50000) "localhost" "8000"
+            _ <- waitTcpVerbose putStrLn (limitRetriesByCumulativeDelay 60000000 $ exponentialBackoff 50000) "localhost" "8000"
             runReaderT m (env { testHaveRepo = True }))
 
 

cabal.project

@@ -20,6 +20,11 @@ allow-newer:
 constraints: rere -rere-cfg
 constraints: these -assoc
 
+-- Andreas, 2022-08-19, https://github.com/haskell/cabal/issues/8377
+-- Force latest dependencies in the development version:
+constraints: text >= 2.0
+constraints: time >= 1.12
+
 -- So us hackers get all the assertion failures early:
 --
 -- NOTE: currently commented out, see