Use haskell-language-server 2.11 (#2387)

* Use haskell-language-server 2.11

* Use existing haddock-library and haddock-api on GHC >9.12

* Reduce number of tests

Author: hamishmack

build.nix

@@ -57,10 +57,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.13") {
       "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.10";
+        src = pkgs.haskell-nix.sources."hls-2.11";
       };
     })
   );

flake.lock

@@ -21,6 +21,7 @@
     "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-2.10" = { url = "github:haskell/haskell-language-server/2.10.0.0"; flake = false; };
+    "hls-2.11" = { url = "github:haskell/haskell-language-server/2.11.0.0"; flake = false; };
     "hls"     = { url = "github:haskell/haskell-language-server"; flake = false; };
     hackage = {
       url = "github:input-output-hk/hackage.nix";

flake.nix

@@ -461,6 +461,8 @@ let
                 cabal_file=${ghcSrc}/compiler/${name}.cabal.in
               elif [ -f ${ghcSrc}/libraries/${name}/${name}.cabal.in ]; then
                 cabal_file=${ghcSrc}/libraries/${name}/${name}.cabal.in
+              elif [ -f ${ghcSrc}/utils/haddock/${name}/${name}.cabal ]; then
+                cabal_file=${ghcSrc}/utils/haddock/${name}/${name}.cabal
               fi
               if [[ "$cabal_file" != "" ]]; then
                 fixed_cabal_file=$(mktemp)

lib/call-cabal-project-to-nix.nix

@@ -1126,6 +1126,9 @@ final: prev: {
             "xhtml"
           ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.4" > 0) [
             "system-cxx-std-lib"
+          ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.12" > 0) [
+            "haddock-api"
+            "haddock-library"
           ] ++ final.lib.optionals (
                   !final.stdenv.targetPlatform.isGhcjs
                && !final.stdenv.targetPlatform.isWindows

overlays/haskell.nix

@@ -3,7 +3,7 @@ let
   project = haskell-nix.cabalProject' {
     inherit compiler-nix-name evalPackages;
     name = "haskell-language-server";
-    src = haskell-nix.sources."hls-2.10";
+    src = haskell-nix.sources."hls-2.11";
     configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function
   };
 in recurseIntoAttrs {
@@ -16,5 +16,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.10.2" >= 0;
+    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.13" >= 0;
 }