Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ee02a9d42b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d77a83e96fc
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 20, 2019

  1. buildRustPackage: support checkFlags and checkFlagsArray

    @andir
    andir committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d130224 View commit details

  2. rust-cbindgen: skip expand tests 

    The expand tests require unstable rust features.
    @andir
    andir committed Oct 20, 2019
    Copy the full SHA
    06744bb View commit details

  3. rust-cbdindgen: 0.9.0 -> 0.9.1

    @andir
    andir committed Oct 20, 2019
    Copy the full SHA
    e07c297 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #70259 from andir/rust-checkflags 

    rust introduce `checkFlags` to parametrize test execution
    @andir
    andir authored Oct 21, 2019
    Copy the full SHA
    8d77a83 View commit details
Showing with 9 additions and 7 deletions.
  1. +2 −2 pkgs/build-support/rust/default.nix
  2. +7 −5 pkgs/development/tools/rust/cbindgen/default.nix
4 changes: 2 additions & 2 deletions pkgs/build-support/rust/default.nix
View file
Original file line number Diff line number Diff line change
@@ -149,8 +149,8 @@ stdenv.mkDerivation (args // {

checkPhase = args.checkPhase or ''
runHook preCheck
echo "Running cargo test"
cargo test
echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck
'';

12 changes: 7 additions & 5 deletions pkgs/development/tools/rust/cbindgen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,23 @@

rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
version = "0.9.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88";
sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19";
};

cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w";
cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

# https://github.com/eqrion/cbindgen/issues/338
RUSTC_BOOTSTRAP = 1;
checkFlags = [
# https://github.com/eqrion/cbindgen/issues/338
"--skip test_expand"
];

meta = with stdenv.lib; {
description = "A project for generating C bindings from Rust code";