Skip to content

Commit b24bba5

Browse files
committed
1 parent 3d28f70 commit b24bba5

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

tool-map.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,11 @@ compiler-nix-name: tool: {
3737
# Use the github source of HLS that is tested with haskell.nix CI
3838
src = { "ghc8107" = pkgs.haskell-nix.sources."hls-2.2";
3939
"ghc902" = pkgs.haskell-nix.sources."hls-2.4";
40-
}.${compiler-nix-name} or pkgs.haskell-nix.sources."hls-2.6";
40+
}.${compiler-nix-name} or pkgs.haskell-nix.sources."hls-2.9";
4141
# `tool` normally ignores the `cabal.project` (if there is one in the hackage source).
4242
# We need to use the github one (since it has settings to make hls build).
4343
cabalProject = __readFile (src + "/cabal.project");
4444
configureArgs = "--disable-benchmarks --disable-tests";
45-
modules = [{
46-
packages.ghcide.patches =
47-
(if compiler-nix-name != "ghc8107" && compiler-nix-name != "ghc902" then [
48-
# The following patch only works with hls-2.6 ...
49-
# https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
50-
./extra/ghcide-workaround.diff
51-
] else []);
52-
}];
5345
};
5446
happy = { version = "1.20.1.1"; inherit cabalProjectLocal; };
5547
alex = { version = "3.2.7.3"; inherit cabalProjectLocal; };

0 commit comments

Comments
 (0)