Merge pull request #221911 from r-ryantm/auto-update/cargo-update

This commit is contained in:
figsoda 2023-03-19 10:59:03 -04:00 committed by GitHub
commit 9abbf66bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 13 deletions

View File

@ -1,33 +1,48 @@
{ lib, stdenv
{ lib
, rustPlatform
, fetchCrate
, cmake
, pkg-config
, installShellFiles
, pkg-config
, ronn
, stdenv
, curl
, libgit2
, libgit2_1_5
, libssh2
, openssl
, Security
, zlib
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
version = "11.1.2";
version = "12.0.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-Hil4v9EUVEH1j7LV1icct6ggFzGVy3f8p+LuFrlBOVA=";
sha256 = "sha256-01XtxPVYamXBwn4zwqiRvpD+mHjpIUp+JT0fu3+Peq8=";
};
cargoHash = "sha256-gOhZUJHBYti/kqfhyopRsY1PbXZdiGJZpjohMUbO/28=";
cargoHash = "sha256-x7RK6Wix5TB5/Ff2qWis3HAhBReWekeoxjcFUv19oB4=";
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
nativeBuildInputs = [
cmake
installShellFiles
pkg-config
ronn
] ++ lib.optionals stdenv.isDarwin [
curl
];
buildInputs = [ libgit2 libssh2 openssl zlib ]
++ lib.optionals stdenv.isDarwin [ curl Security ];
buildInputs = [
libgit2_1_5
libssh2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
];
postBuild = ''
# Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
@ -43,6 +58,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A cargo subcommand for checking and applying updates to installed executables";
homepage = "https://github.com/nabijaczleweli/cargo-update";
changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor ];
};

View File

@ -15997,9 +15997,7 @@ with pkgs;
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-update = callPackage ../development/tools/rust/cargo-update {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-update = callPackage ../development/tools/rust/cargo-update { };
cargo-asm = callPackage ../development/tools/rust/cargo-asm {
inherit (darwin.apple_sdk.frameworks) Security;