Merge pull request #6827 from phadej/update-bounds-20200520

Update dependency bounds
haskell · May 20, 2020 · 120e539 · 120e539
2 parents a4b1708 + 986954c
commit 120e539
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 29 deletions.
diff --git a/Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -13,7 +13,7 @@ library
   build-depends:
     , base
     , Cabal       ^>=3.3.0.0
-    , QuickCheck  ^>=2.13.2
+    , QuickCheck  ^>=2.13.2 || ^>=2.14
 
   if !impl(ghc >= 8.0)
     build-depends: semigroups

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -296,7 +296,7 @@ library
     filepath   >= 1.3.0.1  && < 1.5,
     pretty     >= 1.1.1    && < 1.2,
     process    >= 1.1.0.2  && < 1.7,
-    time       >= 1.4.0.1  && < 1.10
+    time       >= 1.4.0.1  && < 1.11
 
   if flag(bundled-binary-generic)
     build-depends: binary >= 0.5.1.1 && < 0.7
@@ -679,14 +679,14 @@ test-suite unit-tests
     pretty,
     rere >=0.1 && <0.2,
     tagged,
-    tasty >= 1.2.3 && < 1.3,
+    tasty >= 1.2.3 && < 1.4,
     tasty-hunit,
     tasty-quickcheck,
     temporary,
     text,
     transformers,
     Diff >=0.4 && <0.5,
-    QuickCheck >= 2.13.2 && < 2.14,
+    QuickCheck >= 2.14 && < 2.15,
     Cabal
   ghc-options: -Wall
   default-language: Haskell2010
@@ -707,7 +707,7 @@ test-suite parser-tests
     bytestring,
     directory,
     filepath,
-    tasty >= 1.2.3 && < 1.3,
+    tasty >= 1.2.3 && < 1.4,
     tasty-hunit,
     tasty-quickcheck,
     tasty-golden >=2.3.1.1 && <2.4,
@@ -738,7 +738,7 @@ test-suite check-tests
     bytestring,
     directory,
     filepath,
-    tasty >= 1.2.3 && < 1.3,
+    tasty >= 1.2.3 && < 1.4,
     tasty-golden >=2.3.1.1 && <2.4,
     Diff >=0.4 && <0.5,
     Cabal
@@ -814,7 +814,7 @@ test-suite rpmvercmp
     bytestring
 
   build-depends:
-    tasty >= 1.2.3 && < 1.3,
+    tasty >= 1.2.3 && < 1.4,
     tasty-hunit,
     tasty-quickcheck,
     QuickCheck

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -356,7 +356,7 @@ executable cabal
         random     >= 1        && < 1.2,
         stm        >= 2.0      && < 2.6,
         tar        >= 0.5.0.3  && < 0.6,
-        time       >= 1.5.0.1  && < 1.10,
+        time       >= 1.5.0.1  && < 1.11,
         transformers >= 0.4.2.0 && < 0.6,
         zlib       >= 0.5.3    && < 0.7,
         hackage-security >= 0.6.0.1 && < 0.7,

diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
@@ -40,7 +40,7 @@
         random     >= 1        && < 1.2,
         stm        >= 2.0      && < 2.6,
         tar        >= 0.5.0.3  && < 0.6,
-        time       >= 1.5.0.1  && < 1.10,
+        time       >= 1.5.0.1  && < 1.11,
         transformers >= 0.4.2.0 && < 0.6,
         zlib       >= 0.5.3    && < 0.7,
         hackage-security >= 0.6.0.1 && < 0.7,
@@ -481,7 +481,6 @@
     UnitTests.Distribution.Client.Targets
     UnitTests.Distribution.Client.FileMonitor
     UnitTests.Distribution.Client.Get
-    UnitTests.Distribution.Client.GenericInstances
     UnitTests.Distribution.Client.Glob
     UnitTests.Distribution.Client.GZipUtils
     UnitTests.Distribution.Client.Init.FileCreators
@@ -521,15 +520,15 @@
         tar,
         time,
         zlib,
-        network-uri < 2.6.2.0,
+        network-uri >= 2.6.2.0 && <2.6.4.0,
         network,
-        tasty >= 1.2.3 && <1.3,
+        tasty >= 1.2.3 && <1.4,
         tasty-golden >=2.3.1.1 && <2.4,
         tasty-hunit >= 0.10,
         tasty-quickcheck,
         tagged,
         tree-diff,
-        QuickCheck >= 2.8.2
+        QuickCheck >= 2.14 && <2.15
 
   ghc-options: -threaded
 
@@ -556,7 +555,7 @@
         containers,
         deepseq,
         tagged,
-        tasty >= 1.2.3 && <1.3,
+        tasty >= 1.2.3 && <1.4,
         tasty-hunit >= 0.10
 
   ghc-options: -threaded
@@ -585,9 +584,9 @@
         hashable,
         random,
         tagged,
-        tasty >= 1.2.3 && <1.3,
+        tasty >= 1.2.3 && <1.4,
         tasty-quickcheck,
-        QuickCheck >= 2.8.2,
+        QuickCheck >= 2.14 && <2.15,
         pretty-show >= 1.6.15
 
   ghc-options: -threaded
@@ -614,7 +613,7 @@
         directory,
         edit-distance,
         filepath,
-        tasty >= 1.2.3 && <1.3,
+        tasty >= 1.2.3 && <1.4,
         tasty-hunit >= 0.10,
         tagged
 

diff --git a/cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs b/cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs
diff --git a/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs b/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs
@@ -3,6 +3,11 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
+-- simplifier goes nuts otherwise
+#if __GLASGOW_HASKELL__ < 806
+{-# OPTIONS_GHC -funfolding-use-threshold=30 #-}
+#endif
+
 module UnitTests.Distribution.Client.ProjectConfig (tests) where
 
 #if !MIN_VERSION_base(4,8,0)

diff --git a/cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs b/cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs
@@ -20,8 +20,6 @@ import Distribution.Client.Types
 import Distribution.Client.Types.OverwritePolicy         (OverwritePolicy)
 import Distribution.Client.Types.SourceRepo              (SourceRepositoryPackage)
 
-import UnitTests.Distribution.Client.GenericInstances ()
-
 import Data.TreeDiff.Class
 import Data.TreeDiff.Instances.Cabal ()
 import Network.URI