public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.haskell-language-server: 0.3.0 -> 0.4.0

Browse Source
This commit is contained in:
Malte Brandy
2020-09-04 03:24:17 +02:00
parent 037e178a43
commit 89cfe01679
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -1473,10 +1473,11 @@ self: super: {
# INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let
inherit (self) hls-ghcide;
hlsScopeOverride = self: super: {
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
ghcide = dontCheck super.hls-ghcide;
ghcide = hls-ghcide;
# we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_4;
@@ -1488,7 +1489,13 @@ self: super: {
in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357)
haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
hls-ghcide = appendPatch (dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride))
(pkgs.fetchpatch {
# This patch loosens the hie-bios upper bound.
# It is already merged into upstream and won‘t be needed for ghcide 0.4.0
url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch";
sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz";
});
fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
}
) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super