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.

Sign up for GitHub

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

Jump to bottom

Remove final allow-newer for 9.10 #4329

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Remove final allow-newer for 9.10 #4329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934d07c
Remove final allow-newer for 9.10
michaelpj Jun 19, 2024
e2439fc
Bound cabal-gild to avoid new broken versions
michaelpj Jun 20, 2024
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
12 changes: 4 additions & 8 deletions cabal.project
View file
Open in desktop
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess benchmarks: True is default right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it up above.

3 changes: 2 additions & 1 deletion haskell-language-server.cabal
View file
Open in desktop
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
Loading