From 163c469b24d89ceafed5d49755133f5205fe16fc Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Jan 2023 19:10:57 -0500 Subject: [PATCH] cargo-release: fix build, add figsoda as a maintainer --- .../tools/rust/cargo-release/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index ae7d19ddcca..dc487953568 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -1,11 +1,12 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, Security -, curl -, openssl , pkg-config +, openssl +, stdenv +, curl +, darwin +, git }: rustPlatform.buildRustPackage rec { @@ -28,15 +29,19 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security curl + darwin.apple_sdk.frameworks.Security + ]; + + checkInputs = [ + git ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; - homepage = "https://github.com/sunng87/cargo-release"; + homepage = "https://github.com/crate-ci/cargo-release"; changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ figsoda gerschtli ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354fa60ea1e..dc0fa64046a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15509,9 +15509,7 @@ with pkgs; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-release = callPackage ../development/tools/rust/cargo-release { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-release = callPackage ../development/tools/rust/cargo-release { }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { inherit (darwin.apple_sdk.frameworks) Security;