Merge pull request #250 from fendor/cabal-flag-agpl

Make the AGPL flag manual in cabal
haskell · Aug 5, 2020 · 4cdafec · 4cdafec
2 parents bf94639 + 1f26704
commit 4cdafec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/exe/Main.hs b/exe/Main.hs
@@ -108,7 +108,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
       , StylishHaskell.descriptor "stylish-haskell"
       , Retrie.descriptor "retrie"
 #if AGPL
+#if !MIN_VERSION_ghc(8,10,1)
       , Brittany.descriptor    "brittany"
+#endif
 #endif
       , Eval.descriptor "eval"
       ]

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -20,7 +20,7 @@ extra-source-files:
 flag agpl
   Description: Enable AGPL dependencies
   Default:     True
-  Manual:      False
+  Manual:      True
 
 flag pedantic
   Description: Enable -Werror
@@ -101,10 +101,11 @@ library
   else
     build-depends:     unix
   if flag(agpl)
-    build-depends:
-      brittany
-    exposed-modules:
-      Ide.Plugin.Brittany
+    if impl(ghc < 8.10)
+      build-depends:
+        brittany
+      exposed-modules:
+        Ide.Plugin.Brittany
 
   ghc-options:
          -Wall