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

allow building cabal-install-3.10 with ghc-9.6 #8964

Merged
merged 1 commit into from
May 27, 2023
Merged

allow building cabal-install-3.10 with ghc-9.6 #8964

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
4 changes: 2 additions & 2 deletions Cabal-tests/Cabal-tests.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ test-suite parser-tests
, tasty-golden >=2.3.1.1 && <2.4
, tasty-hunit
, tasty-quickcheck
, tree-diff >=0.1 && <0.3
, tree-diff >=0.1 && <0.4

ghc-options: -Wall
default-language: Haskell2010
Expand Down Expand Up @@ -161,7 +161,7 @@ test-suite hackage-tests
, optparse-applicative >=0.13.2.0 && <0.17
, stm >=2.4.5.0 && <2.6
, tar >=0.5.0.3 && <0.6
, tree-diff >=0.1 && <0.3
, tree-diff >=0.1 && <0.4

ghc-options: -Wall -rtsopts -threaded
default-extensions: CPP
Expand Down
2 changes: 1 addition & 1 deletion Cabal-tree-diff/Cabal-tree-diff.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ library
, base
, Cabal-syntax ^>=3.10.0.0
, Cabal ^>=3.10.0.0
, tree-diff ^>=0.1 || ^>=0.2
, tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3

exposed-modules: Data.TreeDiff.Instances.Cabal
other-modules:
Expand Down
4 changes: 2 additions & 2 deletions cabal-install-solver/cabal-install-solver.cabal
View file
Open in desktop
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.18
, base >=4.10 && <4.19
, bytestring >=0.10.6.0 && <0.12
, Cabal ^>=3.10
, Cabal-syntax ^>=3.10
Expand Down Expand Up @@ -138,7 +138,7 @@ Test-Suite unit-tests
UnitTests.Distribution.Solver.Modular.MessageUtils

build-depends:
, base >= 4.10 && <4.18
, base >= 4.10 && <4.19
, Cabal
, Cabal-syntax
, cabal-install-solver
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 @@ -46,7 +46,7 @@ common warnings
ghc-options: -Wunused-packages

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

common cabal-dep
build-depends: Cabal ^>=3.10
Expand Down
4 changes: 2 additions & 2 deletions cabal-testsuite/cabal-testsuite.cabal
View file
Open in desktop
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.18
, base >= 4.9 && <4.19
-- this needs to match the in-tree lib:Cabal version
, Cabal ^>= 3.10.0.0
, Cabal-syntax ^>= 3.10.0.0
Expand Down Expand Up @@ -80,7 +80,7 @@ library

if !os(windows)
build-depends:
, unix ^>= 2.6.0.0 || ^>= 2.7.0.0
, unix ^>= 2.6.0.0 || ^>= 2.7.0.0 || ^>= 2.8.0.0
else
build-depends:
, Win32
Expand Down