Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency bounds #6827

Merged
merged 1 commit into from
May 20, 2020
Merged

Update dependency bounds #6827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 8 additions & 9 deletions cabal-install/cabal-install.cabal.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
10 changes: 0 additions & 10 deletions cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down