Skip to content

Commit 2370b57

Browse files
committed
allow building with ghc-9.6
1 parent 5a83705 commit 2370b57

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Cabal-tests/Cabal-tests.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ test-suite parser-tests
9595
, tasty-golden >=2.3.1.1 && <2.4
9696
, tasty-hunit
9797
, tasty-quickcheck
98-
, tree-diff >=0.1 && <0.3
98+
, tree-diff >=0.1 && <0.4
9999

100100
ghc-options: -Wall
101101
default-language: Haskell2010
@@ -161,7 +161,7 @@ test-suite hackage-tests
161161
, optparse-applicative >=0.13.2.0 && <0.17
162162
, stm >=2.4.5.0 && <2.6
163163
, tar >=0.5.0.3 && <0.6
164-
, tree-diff >=0.1 && <0.3
164+
, tree-diff >=0.1 && <0.4
165165

166166
ghc-options: -Wall -rtsopts -threaded
167167
default-extensions: CPP

Cabal-tree-diff/Cabal-tree-diff.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ library
1313
, base
1414
, Cabal-syntax ^>=3.10.0.0
1515
, Cabal ^>=3.10.0.0
16-
, tree-diff ^>=0.1 || ^>=0.2
16+
, tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3
1717

1818
exposed-modules: Data.TreeDiff.Instances.Cabal
1919
other-modules:

cabal-install-solver/cabal-install-solver.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ library
105105

106106
build-depends:
107107
, array >=0.4 && <0.6
108-
, base >=4.10 && <4.18
108+
, base >=4.10 && <4.19
109109
, bytestring >=0.10.6.0 && <0.12
110110
, Cabal ^>=3.10
111111
, Cabal-syntax ^>=3.10
@@ -138,7 +138,7 @@ Test-Suite unit-tests
138138
UnitTests.Distribution.Solver.Modular.MessageUtils
139139

140140
build-depends:
141-
, base >= 4.10 && <4.18
141+
, base >= 4.10 && <4.19
142142
, Cabal
143143
, Cabal-syntax
144144
, cabal-install-solver

cabal-install/cabal-install.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ common warnings
4646
ghc-options: -Wunused-packages
4747

4848
common base-dep
49-
build-depends: base >=4.10 && <4.18
49+
build-depends: base >=4.10 && <4.19
5050

5151
common cabal-dep
5252
build-depends: Cabal ^>=3.10

cabal-testsuite/cabal-testsuite.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ common shared
2626
default-language: Haskell2010
2727

2828
build-depends:
29-
, base >= 4.9 && <4.18
29+
, base >= 4.9 && <4.19
3030
-- this needs to match the in-tree lib:Cabal version
3131
, Cabal ^>= 3.10.0.0
3232
, Cabal-syntax ^>= 3.10.0.0
@@ -80,7 +80,7 @@ library
8080

8181
if !os(windows)
8282
build-depends:
83-
, unix ^>= 2.6.0.0 || ^>= 2.7.0.0
83+
, unix ^>= 2.6.0.0 || ^>= 2.7.0.0 || ^>= 2.8.0.0
8484
else
8585
build-depends:
8686
, Win32

0 commit comments

Comments
 (0)