From 2ff702e9375982c8236301c44a44c4788290baf3 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 05:27:14 +0100 Subject: [PATCH] cargo-crev: 0.19.4 -> 0.20.1 Fixes build: https://hydra.nixos.org/build/152282553 --- .../tools/rust/cargo-crev/default.nix | 20 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 9e95ee4430cc..9803cd531e7e 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -3,28 +3,38 @@ , rustPlatform , perl , pkg-config +, SystemConfiguration , Security , curl , libiconv , openssl +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; - rev = "v${version}"; - sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q="; + rev = version; + sha256 = "sha256-j2dafXUI6rDEYboSAciMeNma/YaBYKuQZgMUGVU+oBQ="; }; - cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8="; + cargoSha256 = "sha256-khrpS6QFpweKbTbR0YhAJTTrgDoZl9fzYPDs+JE1mtA="; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name "Nixpkgs Test" + git config --global user.email "nobody@example.com" + ''; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security libiconv curl ]; + + checkInputs = [ git ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16d365c26217..10cb58fdf1da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12322,7 +12322,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny {