From 934d07c20626092005beeac269099325b2a82f9d Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 19 Jun 2024 17:52:49 +0100 Subject: [PATCH 1/2] Remove final allow-newer for 9.10 Revised on hackage --- cabal.project | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index 705e53f5cb..e430c76dee 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 From e2439fc5538b19738732b445bb7447357129563e Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 20 Jun 2024 12:32:05 +0100 Subject: [PATCH 2/2] Bound cabal-gild to avoid new broken versions --- haskell-language-server.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index fb231850a7..0a325deaf6 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 -----------------------------