haskell-language-server: 1.7.0.0 -> 1.8.0.0

1 files changed, 17 insertions, 14 deletions

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 48cb8ed8c085..05585b885650 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -141,20 +141,23 @@ self: super: {
 
   mime-string = disableOptimization super.mime-string;
 
-  # Older compilers need the latest ghc-lib to build this package.
-  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
-      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
-      postPatch = ''
-        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
-      '';
-    })
-     super.hls-hlint-plugin);
-
-  haskell-language-server = appendConfigureFlags [
-      "-f-stylishhaskell"
-      "-f-brittany"
-    ]
-  super.haskell-language-server;
+  haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: {
+    ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219;
+    ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24;
+    # Pick old ormolu and fourmolu because ghc-lib-parser is not compatible
+    ormolu = doJailbreak lself.ormolu_0_1_4_1;
+    fourmolu = doJailbreak lself.fourmolu_0_3_0_0;
+    hlint = lself.hlint_3_2_8;
+    aeson = lself.aeson_1_5_6_0;
+    stylish-haskell = lself.stylish-haskell_0_13_0_0;
+    lsp-types = doJailbreak lsuper.lsp-types;
+  }));
+
+  hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: {
+    brittany = doJailbreak lself.brittany_0_13_1_2;
+    aeson = lself.aeson_1_5_6_0;
+    lsp-types = doJailbreak lsuper.lsp-types;
+  });
 
   # has a restrictive lower bound on Cabal
   fourmolu = doJailbreak super.fourmolu;