Skip to content

Use haskell-language-server 2.11 #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 12, 2025
+32 −8
Merged

Use haskell-language-server 2.11 #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
970fb2f
Use haskell-language-server 2.11
hamishmack Jun 10, 2025
9f7d4ac
Merge remote-tracking branch 'origin/master' into hkm/hls-2.11
hamishmack Jun 12, 2025
0468451
Use existing haddock-library and haddock-api on GHC >9.12
hamishmack Jun 12, 2025
0042146
Reduce number of tests
hamishmack Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
})
);
Expand Down
8 changes: 4 additions & 4 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
# Update supported-ghc-versions.md to reflect any changes made here.
nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
ghc96 = true;
ghc98 = true;
ghc910 = true;
ghc912 = true;
ghc96 = false;
ghc98 = false;
ghc910 = false;
ghc912 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc96 = true;
ghc98 = true;
Expand Down
18 changes: 18 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 2 additions & 0 deletions lib/call-cabal-project-to-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/haskell-language-server/cabal.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
Loading