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

Merge pull request #114455 from danieldk/cargo-check-flags

Browse Source 
buildRustPackage: use checkType argument
This commit is contained in:
Jörg Thalheim 2021-02-28 23:12:24 +00:00 committed by GitHub
commit 58aa8e36e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/languages-frameworks/rust.section.md
View File

@ -320,9 +320,10 @@ attributes can also be used:
variable `buildAndTestSubdir` can be used to build a crate in a variable `buildAndTestSubdir` can be used to build a crate in a
Cargo workspace. Additional maturin flags can be passed through Cargo workspace. Additional maturin flags can be passed through
`maturinBuildFlags`. `maturinBuildFlags`.
* `cargoCheckHook`: run tests using Cargo. Additional flags can be * `cargoCheckHook`: run tests using Cargo. The build type for checks
passed to Cargo using `checkFlags` and `checkFlagsArray`. By can be set using `cargoCheckType`. Additional flags can be passed to
default, tests are run in parallel. This can be disabled by setting the tests using `checkFlags` and `checkFlagsArray`. By default,
tests are run in parallel. This can be disabled by setting
`dontUseCargoParallelTests`. `dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries * `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`. that were built using `cargoBuildHook`.

2
pkgs/build-support/rust/default.nix
View File

@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
cargoBuildType = buildType; cargoBuildType = buildType;
cargoCheckType = checkType;
patchRegistryDeps = ./patch-registry-deps; patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs ++ [ nativeBuildInputs = nativeBuildInputs ++ [

2
pkgs/build-support/rust/hooks/cargo-check-hook.sh
View File

@ -15,7 +15,7 @@ cargoCheckHook() {
threads=1 threads=1
fi fi
argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen"; argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen";
( (
set -x set -x