From 75da00cacdb25ca035ccf9a4b53a858d9d809207 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 26 Feb 2021 14:18:22 +0100
Subject: [PATCH] haskellPackages.haskell-language-server: Fix build

---
 .../haskell-modules/configuration-common.nix       | 14 +++++---------
 .../haskell-modules/configuration-hackage2nix.yaml |  4 +---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f5a653ec637..241312cd911 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1406,16 +1406,12 @@ self: super: {
   # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
   # https://github.com/haskell/haskell-language-server/issues/610
   # https://github.com/haskell/haskell-language-server/issues/611
-  haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) {
-    # 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update
-    preConfigure = ''
-      substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0"
-    '';
-  };
+  haskell-language-server = dontCheck super.haskell-language-server;
+
+  # 2020-02-26: Outdated upperbound on ghc-exactprint
+  # https://github.com/lspitzner/brittany/issues/342
+  brittany = doJailbreak super.brittany;
 
-  # 2021-02-08: Jailbreaking because of
-  # https://github.com/haskell/haskell-language-server/issues/1329
-  hls-tactics-plugin = doJailbreak super.hls-tactics-plugin;
   # 2021-02-11: Jailbreaking because of syntax error on bound revision
   hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index dccc462acd1..3a47b2869bf 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2800,14 +2800,12 @@ package-maintainers:
     - nix-diff
   maralorn:
     - reflex-dom
-    - ghcide
     - cabal-fmt
     - shh
-    - brittany
-    - hlint
     - neuron
     - releaser
     - taskwarrior
+    - haskell-language-server
   sorki:
     - cayene-lpp
     - data-stm32