haskell-language-server 2.0 (#1975)

* haskell-language-server 2.0

* Fix hydra job names

* Include ghcide patch when needed

Author: hamishmack

build.nix

@@ -56,10 +56,15 @@ in rec {
           inherit evalPackages;
         };
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
-      hls-latest = tool compiler-nix-name "haskell-language-server" {
+      "hls-110" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-1.10";
       };
+    } // {
+      "hls-20" = tool compiler-nix-name "haskell-language-server" {
+        inherit evalPackages;
+        src = pkgs.haskell-nix.sources."hls-2.0";
+      };
     })
   );
 

flake.lock

@@ -13,6 +13,7 @@
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
     flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
     "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
+    "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.0"; flake = false; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";

flake.nix

@@ -89,7 +89,7 @@ in {
       "ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc8105" "ghc8106" "ghc8107" "ghc810420210212"
     ]) [
       (fromUntil "1.7.0.0" "1.8.0.0" ../patches/ghcide-1.7-unboxed-tuple-fix-issue-1455.patch)
-      (fromUntil "1.8.0.0" "1.11.0.0" ../patches/ghcide-1.8-unboxed-tuple-fix-issue-1455.patch)
+      (fromUntil "1.8.0.0" "2.1.0.0" ../patches/ghcide-1.8-unboxed-tuple-fix-issue-1455.patch)
     ]
     # This is needed for a patch only applied to ghc810420210212
     ++ pkgs.lib.optional (__elem config.compiler.nix-name [