From 8364393bcb58a95826da918f7001d52af26588c0 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 12 Dec 2021 15:07:17 +0200 Subject: [PATCH 1/2] cabal-ghc901.project: naively enable brittany --- cabal-ghc901.project | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 18e63db8f3..7f8ca9f0b0 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -41,19 +41,12 @@ index-state: 2021-11-29T08:11:07Z constraints: -- These plugins don't work on GHC9 yet - haskell-language-server +ignore-plugins-ghc-bounds -brittany -class -stylishhaskell -tactic, + haskell-language-server +ignore-plugins-ghc-bounds -class -stylishhaskell -tactic, ghc-lib-parser ^>= 9.0 -- although we are not building all plugins cabal solver phase is run for all packages -- this way we track explicitly all transitive dependencies which need support for ghc-9 allow-newer: - brittany:base, - brittany:ghc, - brittany:ghc-boot-th, - -- for brittany - butcher:base, - multistate:base, - data-tree-print:base, stylish-haskell:Cabal, stylish-haskell:ghc-lib-parser, From d8501449d9442c6c98633bf933153f3f55e137c7 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 12 Dec 2021 15:33:44 +0200 Subject: [PATCH 2/2] haskell-language-server.cabal: bump brittany flag <(9.0.1->9.2.1) --- haskell-language-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 1ca23e09dc..d12144a343 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -303,7 +303,7 @@ common stylishHaskell cpp-options: -DstylishHaskell common brittany - if flag(brittany) && (impl(ghc < 9.0.1) || flag(ignore-plugins-ghc-bounds)) + if flag(brittany) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) build-depends: hls-brittany-plugin ^>=1.0.0.1 cpp-options: -Dbrittany