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

Merge pull request #70259 from andir/rust-checkflags

Browse Source 
rust introduce `checkFlags` to parametrize test execution
This commit is contained in:
Andreas Rammhold 2019-10-21 17:33:10 +02:00 committed by GitHub
commit 8d77a83e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,8 +149,8 @@ stdenv.mkDerivation (args // {
checkPhase = args.checkPhase or '' checkPhase = args.checkPhase or ''
runHook preCheck runHook preCheck
echo "Running cargo test" echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck runHook postCheck
''; '';

12
pkgs/development/tools/rust/cbindgen/default.nix
View File

@ -2,21 +2,23 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen"; pname = "rust-cbindgen";
version = "0.9.0"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eqrion"; owner = "eqrion";
repo = "cbindgen"; repo = "cbindgen";
rev = "v${version}"; rev = "v${version}";
sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19";
}; };
cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security; buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
# https://github.com/eqrion/cbindgen/issues/338 checkFlags = [
RUSTC_BOOTSTRAP = 1; # https://github.com/eqrion/cbindgen/issues/338
"--skip test_expand"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A project for generating C bindings from Rust code"; description = "A project for generating C bindings from Rust code";