Skip to content

Commit

Permalink
Remove final allow-newer for 9.10 (#4329)
Browse files Browse the repository at this point in the history
* Remove final allow-newer for 9.10

Revised on hackage

* Bound cabal-gild to avoid new broken versions
  • Loading branch information
michaelpj committed Jun 20, 2024
1 parent 54f4108 commit 2f00507
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
12 changes: 4 additions & 8 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ packages:
./hls-plugin-api
./hls-test-utils

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

tests: True
test-show-details: direct

benchmarks: True

write-ghc-environment-files: never

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



if impl(ghc >= 9.9)
allow-newer:
haddock-library:base,
haddock-library:containers,
-- https://github.com/haskell/haskell-language-server/issues/4324
benchmarks: False
else
benchmarks: True
3 changes: 2 additions & 1 deletion haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ test-suite hls-cabal-gild-plugin-tests
, hls-test-utils == 2.9.0.0

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

-----------------------------
Expand Down

0 comments on commit 2f00507

Please sign in to comment.