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.

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

Bump dependencies for GHC 9.8 #9372

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions Cabal-tests/Cabal-tests.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ test-suite unit-tests
, Cabal-QuickCheck
, containers
, deepseq
, Diff >=0.4 && <0.5
, Diff >=0.4 && <0.6
, directory
, filepath
, integer-logarithms >=1.0.2 && <1.1
, pretty
, QuickCheck >=2.14 && <2.15
, rere >=0.1 && <0.3
, tagged
, tasty >=1.2.3 && <1.5
, tasty >=1.2.3 && <1.6
, tasty-hunit
, tasty-quickcheck
, temporary
Expand All @@ -84,14 +84,14 @@ test-suite parser-tests
main-is: ParserTests.hs
build-depends:
base
, base-compat >=0.11.0 && <0.13
, base-compat >=0.11.0 && <0.14
, bytestring
, Cabal-syntax
, Cabal-tree-diff
, Diff >=0.4 && <0.5
, Diff >=0.4 && <0.6
, directory
, filepath
, tasty >=1.2.3 && <1.5
, tasty >=1.2.3 && <1.6
, tasty-golden >=2.3.1.1 && <2.4
, tasty-hunit
, tasty-quickcheck
Expand All @@ -109,10 +109,10 @@ test-suite check-tests
, bytestring
, Cabal
, Cabal-syntax
, Diff >=0.4 && <0.5
, Diff >=0.4 && <0.6
, directory
, filepath
, tasty >=1.2.3 && <1.5
, tasty >=1.2.3 && <1.6
, tasty-expected-failure
, tasty-golden >=2.3.1.1 && <2.4

Expand Down Expand Up @@ -155,10 +155,10 @@ test-suite hackage-tests
, filepath

build-depends:
base-compat >=0.11.0 && <0.13
, base-orphans >=0.6 && <0.9
base-compat >=0.11.0 && <0.14
, base-orphans >=0.6 && <0.10
, clock >=0.8 && <0.9
, optparse-applicative >=0.13.2.0 && <0.17
, optparse-applicative >=0.13.2.0 && <0.19
, stm >=2.4.5.0 && <2.6
, tar >=0.5.0.3 && <0.6
, tree-diff >=0.1 && <0.4
Expand All @@ -178,7 +178,7 @@ test-suite rpmvercmp

build-depends:
QuickCheck
, tasty >=1.2.3 && <1.5
, tasty >=1.2.3 && <1.6
, tasty-hunit
, tasty-quickcheck

Expand All @@ -197,7 +197,7 @@ test-suite no-thunks-test
base
, bytestring
, Cabal-syntax
, tasty >=1.2.3 && <1.5
, tasty >=1.2.3 && <1.6
, tasty-hunit

-- this is test is buildable on old GHCs
Expand Down
2 changes: 1 addition & 1 deletion cabal-benchmarks/cabal-benchmarks.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ test-suite cabal-benchmarks
base
, bytestring
, Cabal-syntax
, criterion >=1.5.6.2 && <1.6
, criterion >=1.5.6.2 && <1.7
6 changes: 3 additions & 3 deletions cabal-install-solver/cabal-install-solver.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ library

build-depends:
, array >=0.4 && <0.6
, base >=4.10 && <4.19
, base >=4.10 && <4.20
, bytestring >=0.10.6.0 && <0.13
, Cabal ^>=3.11
, Cabal-syntax ^>=3.11
Expand Down Expand Up @@ -138,10 +138,10 @@ Test-Suite unit-tests
UnitTests.Distribution.Solver.Modular.MessageUtils

build-depends:
, base >= 4.10 && <4.19
, base >= 4.10 && <4.20
, Cabal
, Cabal-syntax
, cabal-install-solver
, tasty >= 1.2.3 && <1.5
, tasty >= 1.2.3 && <1.6
, tasty-quickcheck
, tasty-hunit >= 0.10
6 changes: 3 additions & 3 deletions cabal-install/cabal-install.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ common warnings
ghc-options: -Wunused-packages

common base-dep
build-depends: base >=4.10 && <4.19
build-depends: base >=4.10 && <4.20

common cabal-dep
build-depends: Cabal ^>=3.11
Expand Down Expand Up @@ -229,7 +229,7 @@ library
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 || >= 2.0 && < 2.1,
text >= 1.2.3 && < 1.3 || >= 2.0 && < 2.2,
parsec >= 3.1.13.0 && < 3.2,
regex-base >= 0.94.0.0 && <0.95,
regex-posix >= 0.96.0.0 && <0.97,
Expand Down Expand Up @@ -332,7 +332,7 @@ test-suite unit-tests
tar,
time,
zlib,
tasty >= 1.2.3 && <1.5,
tasty >= 1.2.3 && <1.6,
tasty-golden >=2.3.1.1 && <2.4,
tasty-quickcheck,
tasty-hunit >= 0.10,
Expand Down
8 changes: 4 additions & 4 deletions cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ common shared
default-language: Haskell2010

build-depends:
, base >= 4.9 && <4.19
, base >= 4.9 && <4.20
-- this needs to match the in-tree lib:Cabal version
, Cabal ^>= 3.11.0.0
, Cabal-syntax ^>= 3.11.0.0
Expand Down Expand Up @@ -57,7 +57,7 @@ library
Test.Cabal.ScriptEnv0

build-depends:
, aeson ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0 || ^>= 2.1.0.0
, aeson ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0 || ^>= 2.1.0.0 || ^>= 2.2.1.0
, async ^>= 2.2.1
, attoparsec ^>= 0.13.2.2 || ^>=0.14.1
, base64-bytestring ^>= 1.0.0.0 || ^>= 1.1.0.0 || ^>= 1.2.0.0
Expand All @@ -68,14 +68,14 @@ library
, exceptions ^>= 0.10.0
, filepath ^>= 1.3.0.1 || ^>= 1.4.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
, optparse-applicative ^>= 0.14.3.0 || ^>=0.15.1.0 || ^>=0.16.0.0 || ^>= 0.17.0.0 || ^>= 0.18.1.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 || ^>= 2.0.1
, text ^>= 1.2.3.1 || ^>= 2.0.1 || ^>= 2.1
, transformers ^>= 0.3.0.0 || ^>= 0.4.2.0 || ^>= 0.5.2.0 || ^>= 0.6.0.2

if !os(windows)
Expand Down
8 changes: 0 additions & 8 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@ packages: cabal-benchmarks/

optional-packages: ./vendored/*/*.cabal

allow-newer:
hackage-security:Cabal

-- avoiding extra dependencies
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

program-options
ghc-options: -fno-ignore-asserts
Loading