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
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
4 changed files with 16 additions and 9 deletions
Show Stats 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 # INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let } // (let
inherit (self) hls-ghcide;
hlsScopeOverride = self: super: { hlsScopeOverride = self: super: {
# haskell-language-server uses its own fork of ghcide # haskell-language-server uses its own fork of ghcide
# 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 = hls-ghcide;
# we are faster than stack here # we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_7_1; hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_4; lsp-test = dontCheck super.lsp-test_0_11_0_4;
@ -1488,7 +1489,13 @@ self: super: {
in { in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) # 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)); 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; fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
} }
) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

6
pkgs/development/tools/haskell/haskell-language-server/default.nix
View File

@ -11,11 +11,11 @@
}: }:
mkDerivation { mkDerivation {
pname = "haskell-language-server"; pname = "haskell-language-server";
version = "0.3.0.0"; version = "0.4.0.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git"; url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gh3sgy6a08d8d3q6r2qn5r817ilzka2qkp0g0y6wsx7rjwag0yx"; sha256 = "157bsq6i824bl6krw7znp0byd8ibaqsq7mfwnkl741dmrflsxpa9";
rev = "23dda97f583e8ff39993b89c01bbd1ac24187605"; rev = "cb861b878ae01911b066182ff0d8080050c3b2d6";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;

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

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

2
pkgs/development/tools/haskell/haskell-language-server/update.sh
View File

@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell
echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version."
echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file"
# =========================== # ===========================