Skip to content

Commit 835d1d8

Browse files
authored
Use hls-2.10 (#2344)
1 parent 000b672 commit 835d1d8

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

build.nix

+1-6
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@ in rec {
6060
} // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.11") {
6161
"hls" = tool compiler-nix-name "haskell-language-server" {
6262
inherit evalPackages;
63-
src = pkgs.haskell-nix.sources.hls;
64-
cabalProjectLocal = ''
65-
if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3)
66-
constraints: ghc-lib-parser >=9.8.4
67-
allow-older: ghc-lib-parser:filepath
68-
'';
63+
src = pkgs.haskell-nix.sources."hls-2.10";
6964
};
7065
})
7166
);

flake.lock

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
2020
"hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
2121
"hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; };
22+
"hls-2.10" = { url = "github:haskell/haskell-language-server/2.10.0.0"; flake = false; };
2223
"hls" = { url = "github:haskell/haskell-language-server"; flake = false; };
2324
hackage = {
2425
url = "github:input-output-hk/hackage.nix";

test/haskell-language-server/cabal.nix

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@ let
33
project = haskell-nix.cabalProject' {
44
inherit compiler-nix-name evalPackages;
55
name = "haskell-language-server";
6-
src = haskell-nix.sources.hls;
6+
src = haskell-nix.sources."hls-2.10";
77
configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function
8-
cabalProjectLocal = ''
9-
if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3)
10-
constraints: ghc-lib-parser >=9.8.4
11-
allow-older: ghc-lib-parser:filepath
12-
'';
138
};
149
in recurseIntoAttrs {
1510
ifdInputs = {

0 commit comments

Comments
 (0)