Skip to content

Commit 4cdafec

Browse files
authored
Merge pull request #250 from fendor/cabal-flag-agpl
Make the AGPL flag manual in cabal
2 parents bf94639 + 1f26704 commit 4cdafec

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Diff for: exe/Main.hs

+2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
108108
, StylishHaskell.descriptor "stylish-haskell"
109109
, Retrie.descriptor "retrie"
110110
#if AGPL
111+
#if !MIN_VERSION_ghc(8,10,1)
111112
, Brittany.descriptor "brittany"
113+
#endif
112114
#endif
113115
, Eval.descriptor "eval"
114116
]

Diff for: haskell-language-server.cabal

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extra-source-files:
2020
flag agpl
2121
Description: Enable AGPL dependencies
2222
Default: True
23-
Manual: False
23+
Manual: True
2424

2525
flag pedantic
2626
Description: Enable -Werror
@@ -101,10 +101,11 @@ library
101101
else
102102
build-depends: unix
103103
if flag(agpl)
104-
build-depends:
105-
brittany
106-
exposed-modules:
107-
Ide.Plugin.Brittany
104+
if impl(ghc < 8.10)
105+
build-depends:
106+
brittany
107+
exposed-modules:
108+
Ide.Plugin.Brittany
108109

109110
ghc-options:
110111
-Wall

0 commit comments

Comments
 (0)