Use hls master branch for testing hls

Author: hamishmack

build.nix

@@ -57,10 +57,15 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.8.3" || ghcFromTo "9.10" "9.11") {
-      "hls-29" = tool compiler-nix-name "haskell-language-server" {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.11") {
+      "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.9";
+        src = pkgs.haskell-nix.sources.hls;
+        cabalProjectLocal = ''
+          if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3)
+            constraints: ghc-lib-parser >=9.8.4
+            allow-older: ghc-lib-parser:filepath
+        '';
       };
     })
   );

flake.lock

@@ -19,6 +19,7 @@
     "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
     "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
     "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; };
+    "hls"     = { url = "github:haskell/haskell-language-server"; flake = false; };
     hackage = {
       url = "github:input-output-hk/hackage.nix";
       flake = false;

flake.nix

@@ -1,10 +1,15 @@
-{ stdenv, testSrc, haskell-nix, compiler-nix-name, evalPackages, recurseIntoAttrs, buildPackages }:
+{ lib, stdenv, testSrc, haskell-nix, compiler-nix-name, evalPackages, recurseIntoAttrs, buildPackages }:
 let
   project = haskell-nix.cabalProject' {
     inherit compiler-nix-name evalPackages;
     name = "haskell-language-server";
-    src = haskell-nix.sources."hls-2.9";
+    src = haskell-nix.sources.hls;
     configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function
+    cabalProjectLocal = ''
+      if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3)
+        constraints: ghc-lib-parser >=9.8.4
+        allow-older: ghc-lib-parser:filepath
+    '';
   };
 in recurseIntoAttrs {
   ifdInputs = {
@@ -16,6 +21,5 @@ in recurseIntoAttrs {
   meta.disabled =
     stdenv.hostPlatform != stdenv.buildPlatform
     || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0.1" < 0
-    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.11.0" >= 0
-    || __elem compiler-nix-name ["ghc983" "ghc984"];
+    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.11.0" >= 0;
 }