diff --git a/cabal.project b/cabal.project index 705e53f5c..e430c76de 100644 --- a/cabal.project +++ b/cabal.project @@ -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 @@ -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 diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index fb231850a..0a325deaf 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -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 -----------------------------