Skip to content

Commit 2f00507

Browse files
authored
Remove final allow-newer for 9.10 (#4329)
* Remove final allow-newer for 9.10 Revised on hackage * Bound cabal-gild to avoid new broken versions
1 parent 54f4108 commit 2f00507

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

cabal.project

+4-8
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ packages:
77
./hls-plugin-api
88
./hls-test-utils
99

10-
index-state: 2024-06-13T17:12:34Z
10+
index-state: 2024-07-20T00:00:00Z
1111

1212
tests: True
1313
test-show-details: direct
1414

15+
benchmarks: True
16+
1517
write-ghc-environment-files: never
1618

1719
-- Many of our tests only work single-threaded, and the only way to
@@ -40,12 +42,6 @@ constraints:
4042
-- in the future, thus: TODO: remove this flag.
4143
bitvec -simd,
4244

43-
44-
4545
if impl(ghc >= 9.9)
46-
allow-newer:
47-
haddock-library:base,
48-
haddock-library:containers,
46+
-- https://github.com/haskell/haskell-language-server/issues/4324
4947
benchmarks: False
50-
else
51-
benchmarks: True

haskell-language-server.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ test-suite hls-cabal-gild-plugin-tests
207207
, hls-test-utils == 2.9.0.0
208208

209209
if flag(isolateCabalGildTests)
210-
build-tool-depends: cabal-gild:cabal-gild ^>=1.3
210+
-- https://github.com/tfausak/cabal-gild/issues/89
211+
build-tool-depends: cabal-gild:cabal-gild >= 1.3 && < 1.3.2
211212
cpp-options: -Dhls_isolate_cabalgild_tests
212213

213214
-----------------------------

0 commit comments

Comments
 (0)