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: d07702964756
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba8da789d6d2
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 31, 2019

  1. cargo-audit: init at 0.9.1 

    cargo-audit is a subcommand for cargo which audits Cargo.lock files for crates
with security vulnerabilities

(cherry picked from commit 4941a8b)
    @basvandijk
    basvandijk committed Oct 31, 2019
    Copy the full SHA
    77be04e View commit details

  2. cargo-audit: 0.9.1 -> 0.9.3 

    (cherry picked from commit f898aae)
    @ivan @basvandijk
    ivan authored and basvandijk committed Oct 31, 2019
    Copy the full SHA
    291469d View commit details

  3. cargo-audit: 0.9.3 -> 0.10.0 

    0.10.0 (2019-10-13)

* Upgrade rustsec to v0.16; new self-audit system (#155)
* Upgrade to Abscissa v0.4; MSRV 1.36 (#154)

(cherry picked from commit e2b0849)
    @basvandijk
    basvandijk committed Oct 31, 2019
    Copy the full SHA
    fcdc52a View commit details

  4. Merge pull request #72361 from basvandijk/cargo-audit-in-19.09 

    Backport cargo-audit to 19.09
    @basvandijk
    basvandijk authored Oct 31, 2019
    Copy the full SHA
    ba8da78 View commit details
Showing with 31 additions and 0 deletions.
  1. +28 −0 pkgs/tools/package-management/cargo-audit/default.nix
  2. +3 −0 pkgs/top-level/all-packages.nix
28 changes: 28 additions & 0 deletions pkgs/tools/package-management/cargo-audit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
version = "0.10.0";

src = fetchFromGitHub {
owner = "RustSec";
repo = "cargo-audit";
rev = "v${version}";
sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m";
};

cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y";

buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];

# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;

meta = with lib; {
description = "Audit Cargo.lock files for crates with security vulnerabilities";
homepage = "https://rustsec.org";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ basvandijk ];
platforms = platforms.all;
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8309,6 +8309,9 @@ in

defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };

cargo-audit = callPackage ../tools/package-management/cargo-audit {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-download = callPackage ../tools/package-management/cargo-download { };
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
cargo-graph = callPackage ../tools/package-management/cargo-graph { };