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

Allow building cabal-3.6 with GHC 9.2 #8025

Merged
merged 2 commits into from
Mar 3, 2022
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
4 changes: 2 additions & 2 deletions Cabal-tests/Cabal-tests.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ test-suite parser-tests
main-is: ParserTests.hs
build-depends:
base
, base-compat >=0.11.0 && <0.12
, base-compat >=0.11.0 && <0.13
, bytestring
, Cabal
, Cabal-tree-diff
Expand Down Expand Up @@ -166,7 +166,7 @@ test-suite hackage-tests
, filepath

build-depends:
base-compat >=0.11.0 && <0.12
base-compat >=0.11.0 && <0.13
, base-orphans >=0.6 && <0.9
, clock >=0.8 && <0.9
, optparse-applicative >=0.13.2.0 && <0.17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ library
other-modules: Distribution.Client.Utils.Assertion
build-depends:
, array >=0.4 && <0.6
, base >=4.8 && <4.15
, base >=4.8 && <4.17
, binary >=0.7.3 && <0.9
, bytestring >=0.10.6.0 && <0.12
, Cabal ^>=3.6
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/cabal-install.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ executable cabal
build-depends:
async >= 2.0 && < 2.3,
array >= 0.4 && < 0.6,
base >= 4.8 && < 4.15,
base >= 4.8 && < 4.17,
base16-bytestring >= 0.1.1 && < 1.1.0.0,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.12,
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.6 && <4.16
, base >= 4.6 && <4.17
-- this needs to match the in-tree lib:Cabal version
, Cabal == 3.6.2.0

Expand Down Expand Up @@ -55,9 +55,9 @@ library
Test.Cabal.ScriptEnv0

build-depends:
, aeson ^>= 1.4.2.0 || ^>=1.5.0.0
, aeson ^>= 1.4.2.0 || ^>= 1.5.0.0 || ^>= 2.0.0.0
, async ^>= 2.2.1
, attoparsec ^>= 0.13.2.2
, attoparsec ^>= 0.13.2.2 || ^>= 0.14.0.0
, base16-bytestring ^>= 0.1.1.6 || ^>= 1.0.0.0
, bytestring ^>= 0.10.0.2 || ^>= 0.11.0.0
, containers ^>= 0.5.0.0 || ^>= 0.6.0.1
Expand Down Expand Up @@ -110,5 +110,5 @@ executable setup

custom-setup
-- we only depend on even stable releases of lib:Cabal
setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.* || ==3.2.* || ==3.4.*,
setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.* || ==3.2.* || ==3.4.* || ==3.6.*,
base, filepath, directory
10 changes: 0 additions & 10 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@ packages: vendor/cabal-doctest-1.0.8

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

-- Remove after hackage-repo-tool release
allow-newer:
hackage-repo-tool:optparse-applicative

allow-newer:
hackage-security:Cabal

-- https://github.com/haskell-hvr/windns/pull/2
allow-newer: windns-0.1.0.1:base

-- avoiding extra dependencies
constraints: rere -rere-cfg
constraints: these -assoc
Expand Down
3 changes: 0 additions & 3 deletions cabal.project.validate.libonly
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ package Cabal
ghc-options: -Werror -fno-ignore-asserts
package cabal-testsuite
ghc-options: -Werror -fno-ignore-asserts

-- https://github.com/haskell-hvr/cryptohash-sha256/issues/12
allow-newer: cryptohash-sha256:base
2 changes: 1 addition & 1 deletion vendor/cabal-doctest-1.0.8/cabal-doctest.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ library
other-modules:
other-extensions:
build-depends:
base >=4.3 && <4.16
base >=4.3 && <4.17
, Cabal >=1.10 && <3.8
, directory
, filepath
Expand Down