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

rls: tie version to rustc's

This commit is contained in:
Symphorien Gibol 2019-08-16 19:03:38 +02:00 committed by Bas van Dijk
parent bc0764421e
commit d9d0647046
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/rust/default.nix
View File

@ -66,6 +66,7 @@
inherit CoreFoundation Security; inherit CoreFoundation Security;
}; };
clippy = self.callPackage ./clippy.nix { inherit Security; }; clippy = self.callPackage ./clippy.nix { inherit Security; };
rls = self.callPackage ./rls { inherit CoreFoundation Security; };
}); });
}; };
} }

24
pkgs/development/tools/rust/rls/default.nix → pkgs/development/compilers/rust/rls/default.nix
View File

@ -4,17 +4,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rls"; pname = "rls";
# with rust 1.x you can only build rls version 1.x.y inherit (rustPlatform.rust.rustc) src version;
version = "1.36.0";
src = fetchFromGitHub { # changes hash of vendor directory otherwise
owner = "rust-lang"; dontUpdateAutotoolsGnuConfigScripts = true;
repo = pname;
rev = version;
sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn";
};
cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin"; cargoVendorDir = "vendor";
preBuild = ''
pushd src/tools/rls
# client tests are flaky
rm tests/client.rs
'';
# a nightly compiler is required unless we use this cheat code. # a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1; RUSTC_BOOTSTRAP=1;
@ -27,10 +27,8 @@ rustPlatform.buildRustPackage rec {
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
doCheck = true; doCheck = true;
preCheck = ''
# client tests are flaky preInstall = "popd";
rm tests/client.rs
'';
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''

4
pkgs/top-level/all-packages.nix
View File

@ -8288,9 +8288,7 @@ in
pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
rainicorn = callPackage ../development/tools/rust/rainicorn { }; rainicorn = callPackage ../development/tools/rust/rainicorn { };
rls = callPackage ../development/tools/rust/rls { inherit (rustPackages) rls;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
rustfmt = rustPackages.rustfmt; rustfmt = rustPackages.rustfmt;
rustracer = callPackage ../development/tools/rust/racer { rustracer = callPackage ../development/tools/rust/racer {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;