From 986954c61a93118464d749c61014765b8a2b8088 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Wed, 20 May 2020 13:16:09 +0300 Subject: [PATCH] Update dependency bounds - Also drop GenericInstances as URI has Generic instance now. - simplifier goes nuts on ProjectConfig instances... --- Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal | 2 +- Cabal/Cabal.cabal | 12 ++++++------ cabal-install/cabal-install.cabal | 2 +- cabal-install/cabal-install.cabal.pp | 17 ++++++++--------- .../Distribution/Client/GenericInstances.hs | 10 ---------- .../Distribution/Client/ProjectConfig.hs | 5 +++++ .../Distribution/Client/TreeDiffInstances.hs | 2 -- 7 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs diff --git a/Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal index c1dc1886cc7..1f257a541af 100644 --- 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 index dd7556dd5ae..35bff084130 100644 --- 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 index b3487292f84..3eb2b75f86e 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -354,7 +354,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 index 0bf2b42ec71..5968f4d640c 100644 --- 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, @@ -479,7 +479,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 @@ -519,15 +518,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 @@ -554,7 +553,7 @@ containers, deepseq, tagged, - tasty >= 1.2.3 && <1.3, + tasty >= 1.2.3 && <1.4, tasty-hunit >= 0.10 ghc-options: -threaded @@ -583,9 +582,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 @@ -612,7 +611,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 deleted file mode 100644 index 78569ab01a0..00000000000 --- a/cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs +++ /dev/null @@ -1,10 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} - -module UnitTests.Distribution.Client.GenericInstances () where - -import Network.URI -import GHC.Generics - -deriving instance Generic URIAuth diff --git a/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs b/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs index d881b5d4145..e9f73b0eb1b 100644 --- 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 index 0de6ec08646..f8247f2ee03 100644 --- 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