Merge pull request #1291 from input-output-hk/fix-hls

Work around an issue in HLS 2.6

flake.nix

@@ -8,6 +8,12 @@
       url = "github:input-output-hk/cardano-haskell-packages?ref=repo";
       flake = false;
     };
+    # Use a patched 2.6.0.0 as we are also affected by
+    # https://github.com/haskell/haskell-language-server/issues/4046
+    hls = {
+      url = "github:cardano-scaling/haskell-language-server?ref=2.6-patched";
+      flake = false;
+    };
     cardano-node.url = "github:intersectmbo/cardano-node/8.7.3";
     mithril.url = "github:input-output-hk/mithril/2347.0";
   };

nix/hydra/shell.nix

@@ -14,10 +14,10 @@ let
 
   cabal = pkgs.haskell-nix.cabal-install.${compiler};
 
+  # Build HLS form our fork (see flake.nix)
   haskell-language-server = pkgs.haskell-nix.tool compiler "haskell-language-server" rec {
-    src = pkgs.haskell-nix.sources."hls-2.6";
+    src = inputs.hls;
     cabalProject = builtins.readFile (src + "/cabal.project");
-    sha256map."https://github.com/pepeiborra/ekg-json"."7a0af7a8fd38045fd15fb13445bdcc7085325460" = "sha256-fVwKxGgM0S4Kv/4egVAAiAjV7QB5PBqMVMCfsv7otIQ=";
   };
 
   libs = [
@@ -57,7 +57,7 @@ let
   ];
 
   devInputs = if withoutDevTools then [ ] else [
-    # Essenetial for a good IDE
+    # Essential for a good IDE
     haskell-language-server
     # The interactive Glasgow Haskell Compiler as a Daemon
     pkgs.haskellPackages.ghcid