From 21a68a3b719d31928f1a5a3ba0fc1b2fde9dbcea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 22 May 2023 17:47:51 +0800 Subject: [PATCH] allow building with ghc-9.6 --- Cabal-tests/Cabal-tests.cabal | 4 ++-- Cabal-tree-diff/Cabal-tree-diff.cabal | 2 +- cabal-install-solver/cabal-install-solver.cabal | 4 ++-- cabal-install/cabal-install.cabal | 2 +- cabal-testsuite/cabal-testsuite.cabal | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal index ce49eab8eb4..bb42abc7fc7 100644 --- a/Cabal-tests/Cabal-tests.cabal +++ b/Cabal-tests/Cabal-tests.cabal @@ -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 @@ -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 diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal index 3d3e8087b3c..d9e823426c7 100644 --- a/Cabal-tree-diff/Cabal-tree-diff.cabal +++ b/Cabal-tree-diff/Cabal-tree-diff.cabal @@ -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: diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 16a0650cbf2..30d14db08ef 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -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 @@ -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 diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index fed9aad89cd..79ef0b0e7b6 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -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 diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index e3ba1da7cbb..d1d43b32898 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -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 @@ -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