From 4e4baef8552cf072f9b28f752b957c9ccb1bfc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CB=8Cbod=CA=B2=C9=AA=CB=88=C9=A1r=CA=B2im?= Date: Sun, 1 May 2022 01:35:10 +0100 Subject: [PATCH 1/2] hls-haddock-comments does not support ghc-exactprint >= 1.0 And should be marked as such otherwise `cabal install haskell-language-server` generates an unbuildable plan --- .../hls-haddock-comments-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index 793e751074..e250aa16be 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -28,7 +28,7 @@ library , base >=4.12 && <5 , containers , ghc - , ghc-exactprint + , ghc-exactprint < 1 , ghcide ^>=1.6 || ^>=1.7 , hls-plugin-api ^>=1.3 || ^>=1.4 , lsp-types From a27813d12656b02858149d5038593578f2ff0d1f Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sun, 1 May 2022 01:46:12 +0100 Subject: [PATCH 2/2] Try to make CI happy --- cabal-ghc92.project | 2 ++ haskell-language-server.cabal | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal-ghc92.project b/cabal-ghc92.project index c3f074aba4..6911f59bea 100644 --- a/cabal-ghc92.project +++ b/cabal-ghc92.project @@ -77,6 +77,8 @@ allow-newer: -- https://github.com/lspitzner/butcher/pull/8 butcher:base, + hls-haddock-comments-plugin:ghc-exactprint, + implicit-hie-cradle:bytestring, implicit-hie-cradle:time, diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 9a6ce96c6a..5fc524b9d9 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -234,7 +234,7 @@ common callHierarchy cpp-options: -DcallHierarchy common haddockComments - if flag(haddockComments) + if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) build-depends: hls-haddock-comments-plugin ^>= 1.0 cpp-options: -DhaddockComments