@@ -117,7 +117,7 @@ flag cabalfmt
117
117
manual : True
118
118
119
119
common cabalfmt
120
- if flag(cabalfmt)
120
+ if flag(cabalfmt) && flag(cabal)
121
121
build-depends : haskell-language-server :hls-cabal-fmt-plugin
122
122
cpp-options : -Dhls_cabalfmt
123
123
@@ -129,7 +129,7 @@ flag isolateCabalfmtTests
129
129
130
130
library hls-cabal-fmt-plugin
131
131
import : defaults, pedantic, warnings
132
- if !flag(cabalfmt)
132
+ if !flag(cabalfmt) || !flag(cabal)
133
133
buildable : False
134
134
exposed-modules : Ide.Plugin.CabalFmt
135
135
hs-source-dirs : plugins/hls-cabal-fmt-plugin/src
@@ -174,7 +174,7 @@ flag cabalgild
174
174
manual : True
175
175
176
176
common cabalgild
177
- if flag(cabalgild) && (impl(ghc < 9.11 ) || flag(ignore-plugins-ghc-bounds) )
177
+ if flag(cabalgild) && flag(cabal )
178
178
build-depends : haskell-language-server :hls-cabal-gild-plugin
179
179
cpp-options : -Dhls_cabalgild
180
180
@@ -186,7 +186,7 @@ flag isolateCabalGildTests
186
186
187
187
library hls-cabal-gild-plugin
188
188
import : defaults, pedantic, warnings
189
- if !flag(cabalgild) || (impl(ghc > 9.11 ) && !flag(ignore-plugins-ghc-bounds) )
189
+ if !flag(cabalgild) || !flag(cabal )
190
190
buildable : False
191
191
exposed-modules : Ide.Plugin.CabalGild
192
192
hs-source-dirs : plugins/hls-cabal-gild-plugin/src
@@ -203,7 +203,7 @@ library hls-cabal-gild-plugin
203
203
-- The `hls-cabal-plugin` is needed for tests, as we need to install notification handlers
204
204
test-suite hls-cabal-gild-plugin-tests
205
205
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)
207
207
buildable : False
208
208
type : exitcode-stdio-1.0
209
209
hs-source-dirs : plugins/hls-cabal-gild-plugin/test
0 commit comments