Skip to content

Commit 29c6684

Browse files
committed
Enable hls-cabal-gild-plugin for GHC 9.12.2
1 parent 9474e78 commit 29c6684

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: haskell-language-server.cabal

+5-5
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ flag cabalfmt
117117
manual: True
118118

119119
common cabalfmt
120-
if flag(cabalfmt)
120+
if flag(cabalfmt) || !flag(cabal)
121121
build-depends: haskell-language-server:hls-cabal-fmt-plugin
122122
cpp-options: -Dhls_cabalfmt
123123

@@ -129,7 +129,7 @@ flag isolateCabalfmtTests
129129

130130
library hls-cabal-fmt-plugin
131131
import: defaults, pedantic, warnings
132-
if !flag(cabalfmt)
132+
if !flag(cabalfmt) || !flag(cabal)
133133
buildable: False
134134
exposed-modules: Ide.Plugin.CabalFmt
135135
hs-source-dirs: plugins/hls-cabal-fmt-plugin/src
@@ -174,7 +174,7 @@ flag cabalgild
174174
manual: True
175175

176176
common cabalgild
177-
if flag(cabalgild) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
177+
if flag(cabalgild) && flag(cabal)
178178
build-depends: haskell-language-server:hls-cabal-gild-plugin
179179
cpp-options: -Dhls_cabalgild
180180

@@ -186,7 +186,7 @@ flag isolateCabalGildTests
186186

187187
library hls-cabal-gild-plugin
188188
import: defaults, pedantic, warnings
189-
if !flag(cabalgild) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
189+
if !flag(cabalgild) || !flag(cabal)
190190
buildable: False
191191
exposed-modules: Ide.Plugin.CabalGild
192192
hs-source-dirs: plugins/hls-cabal-gild-plugin/src
@@ -203,7 +203,7 @@ library hls-cabal-gild-plugin
203203
-- The `hls-cabal-plugin` is needed for tests, as we need to install notification handlers
204204
test-suite hls-cabal-gild-plugin-tests
205205
import: defaults, pedantic, test-defaults, warnings
206-
if !flag(cabalgild) || !flag(cabal) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
206+
if !flag(cabalgild) || !flag(cabal)
207207
buildable: False
208208
type: exitcode-stdio-1.0
209209
hs-source-dirs: plugins/hls-cabal-gild-plugin/test

0 commit comments

Comments
 (0)