From 7120a77b18c12f3cb34163b70f6d61ead069a1ef Mon Sep 17 00:00:00 2001 From: Fendor Date: Wed, 29 Jul 2020 10:28:01 +0200 Subject: [PATCH] Disable Brittany for GHC Versions >= 8.10.1 --- exe/Main.hs | 2 ++ haskell-language-server.cabal | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/exe/Main.hs b/exe/Main.hs index 081f261cac1..329121ddcc2 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -106,7 +106,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins , Ormolu.descriptor "ormolu" , StylishHaskell.descriptor "stylish-haskell" #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 index ce3658ef7a6..bd378477575 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -94,10 +94,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