From a9679912a830aef8054b20a08b696c43257ad8f4 Mon Sep 17 00:00:00 2001 From: Fendor Date: Sun, 21 Jan 2024 10:08:21 +0100 Subject: [PATCH 1/2] Update base lower bounds for HLS --- ghcide/ghcide.cabal | 6 +++--- haskell-language-server.cabal | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 16b29fbc3d..58337f7c0a 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -14,7 +14,7 @@ homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme bug-reports: https://github.com/haskell/haskell-language-server/issues -tested-with: GHC ==9.0.2 || ==9.2.5 +tested-with: GHC == 9.8.1 || ==9.6.4 || ==9.4.8 || ==9.2.8 extra-source-files: CHANGELOG.md README.md @@ -52,7 +52,7 @@ library , aeson , array , async - , base >=4 && <5 + , base >=4.16 && <5 , base16-bytestring >=0.1.1 && <1.1 , binary , bytestring @@ -275,7 +275,7 @@ executable ghcide -- Enable collection of heap statistics main-is: Main.hs build-depends: - , base >=4 && <5 + , base >=4.16 && <5 , data-default , extra , ghcide diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index cd347c5dd1..53f0e182cc 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -14,7 +14,7 @@ copyright: The Haskell IDE Team license: Apache-2.0 license-file: LICENSE build-type: Simple -tested-with: GHC == 9.0.2 || ==9.2.5 +tested-with: GHC == 9.8.1 || ==9.6.4 || ==9.4.8 || ==9.2.8 extra-source-files: README.md ChangeLog.md @@ -35,7 +35,7 @@ source-repository head common common-deps build-depends: - , base >=4.12 && <5 + , base >=4.16 && <5 , directory , extra , filepath @@ -593,6 +593,7 @@ test-suite wrapper-test main-is: Main.hs benchmark benchmark + import: common-deps -- Depends on shake-bench which is unbuildable after this point if impl(ghc >= 9.5) buildable: False @@ -622,12 +623,8 @@ benchmark benchmark build-depends: aeson, - base == 4.*, containers, data-default, - directory, - extra, - filepath, ghcide-bench, haskell-language-server, hls-plugin-api, @@ -636,5 +633,4 @@ benchmark benchmark optparse-applicative, shake, shake-bench == 0.2.*, - text, yaml From 9ca834d783acc268a0c168b6c9f3b40543205fce Mon Sep 17 00:00:00 2001 From: Fendor Date: Sun, 21 Jan 2024 18:41:55 +0100 Subject: [PATCH 2/2] Bump lower bound --- ghcide/ghcide.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 58337f7c0a..4a7603d4b8 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -73,7 +73,7 @@ library , filepath , fingertree , focus >=1.0.3.2 - , ghc >=9.0 + , ghc >=9.2 , ghc-boot , ghc-boot-th , ghc-check >=0.5.0.8