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

Merge pull request #96487 from maralorn/fix-hls 

haskellPackages.haskell-language-server: Fix expression
This commit is contained in:
maralorn 2020-08-28 00:37:37 +02:00 committed by GitHub
parent 4f2b6471e4 1b836c6f10
commit 442fe6287c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1462,7 +1462,7 @@ self: super: {
# Test disabled: it seems to freeze (is it just that it takes a long time ?) # Test disabled: it seems to freeze (is it just that it takes a long time ?)
ghcide = dontCheck super.hls-ghcide; ghcide = dontCheck super.hls-ghcide;
# we are faster than stack here # we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_6_3; hie-bios = dontCheck super.hie-bios_0_7_0;
lsp-test = dontCheck super.lsp-test_0_11_0_4; lsp-test = dontCheck super.lsp-test_0_11_0_4;
# fourmolu can‘t compile with an older aeson # fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0; aeson = dontCheck super.aeson_1_5_2_0;
@ -1470,7 +1470,8 @@ self: super: {
brittany = doJailbreak super.brittany; brittany = doJailbreak super.brittany;
}; };
in { in {
haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); # 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 = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
fourmolu = super.fourmolu.overrideScope hlsScopeOverride; fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
} }

4
pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
View File

@ -18,8 +18,8 @@ mkDerivation {
version = "0.2.0"; version = "0.2.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/wz1000/ghcide"; url = "https://github.com/wz1000/ghcide";
sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; sha256 = "112bsk2660750n94gnsgrvd30rk0ccxb8dbhka606a11pcqv5cgx";
rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; rev = "3f6cd4553279ec47d1599b502720791a4f4613cd";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;