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

Merge #82342: rustPlatform: increase build-speed of checkPhase

Browse Source 
...for rust-packages (into staging)
This commit is contained in:
Vladimír Čunát
2020-06-05 09:12:30 +02:00
parent be7c11c439 59e8e7a129
commit 677e3960b5
13 changed files with 174 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/rust/cargo.nix
View File

@@ -9,8 +9,7 @@ rustPlatform.buildRustPackage {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/cargo";
postBuild = "popd";
buildAndTestSubdir = "src/tools/cargo";
passthru.rustc = rustc;

3
pkgs/development/compilers/rust/clippy.nix
View File

@@ -5,8 +5,7 @@ rustPlatform.buildRustPackage {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/clippy";
postBuild = "popd";
buildAndTestSubdir = "src/tools/clippy";
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;

5
pkgs/development/compilers/rust/rls/default.nix
View File

@@ -10,8 +10,9 @@ rustPlatform.buildRustPackage {
dontUpdateAutotoolsGnuConfigScripts = true;
cargoVendorDir = "vendor";
buildAndTestSubdir = "src/tools/rls";
preBuild = ''
pushd src/tools/rls
# client tests are flaky
rm tests/client.rs
'';
@@ -28,8 +29,6 @@ rustPlatform.buildRustPackage {
doCheck = true;
preInstall = "popd";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rls --version

9
pkgs/development/compilers/rust/rustfmt.nix
View File

@@ -6,8 +6,7 @@ rustPlatform.buildRustPackage rec {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/rustfmt";
preInstall = "popd";
buildAndTestSubdir = "src/tools/rustfmt";
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
@@ -17,12 +16,6 @@ rustPlatform.buildRustPackage rec {
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
RUSTC_BOOTSTRAP = 1;
# we run tests in debug mode so tests look for a debug build of
# rustfmt. Anyway this adds nearly no compilation time.
preCheck = ''
cargo build
'';
meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines";
homepage = "https://github.com/rust-lang-nursery/rustfmt";