fix: Work around HLS issues until the next release.

hackworthltd · Jun 2, 2022 · 867327f · 867327f
1 parent 5f6bc82
commit 867327f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,6 +18,10 @@
     pre-commit-hooks-nix.inputs.nixpkgs.follows = "nixpkgs";
     # Fixes aarch64-darwin support.
     pre-commit-hooks-nix.inputs.flake-utils.follows = "flake-utils";
+
+    # Temporary workaround for HLS issues until the next release.
+    haskell-language-server.url = github:haskell/haskell-language-server;
+    haskell-language-server.flake = false;
   };
 
   outputs =
@@ -27,6 +31,7 @@
     , hacknix
     , flake-utils
     , pre-commit-hooks-nix
+    , haskell-language-server
     , ...
     }@inputs:
     let
@@ -99,6 +104,13 @@
               sqitchDir = ./sqitch;
             });
 
+            # Temporary workaround for HLS issues until the next release.
+            hls = final.haskell-nix.cabalProject' {
+              compiler-nix-name = ghcVersion;
+              src = haskell-language-server;
+              sha256map."https://github.com/pepeiborra/ekg-json"."7a0af7a8fd38045fd15fb13445bdcc7085325460" = "fVwKxGgM0S4Kv/4egVAAiAjV7QB5PBqMVMCfsv7otIQ=";
+            };
+
             primer = final.haskell-nix.cabalProject {
               compiler-nix-name = ghcVersion;
               src = ./.;
@@ -225,7 +237,10 @@
 
                 tools = {
                   ghcid = "latest";
-                  haskell-language-server = "latest";
+
+                  # Temporary workaround for HLS issues until the next release.
+                  #haskell-language-server = "latest";
+
                   cabal = "latest";
                   hlint = exceptionsWorkaround "latest";
                   weeder = exceptionsWorkaround weederVersion;
@@ -272,6 +287,9 @@
 
                   ghc8107Tools.cabal-edit
                   ghc8107Tools.cabal-fmt
+
+                  # Temporary workaround for HLS issues until the next release.
+                  hls.hsPkgs.haskell-language-server.components.exes.haskell-language-server
                 ]);
 
                 shellHook = ''