From 3c3b6eec5fdf1b855edc297cdaaca4e62b18b2b3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 12:57:10 -0400 Subject: [PATCH 1/2] cargo-release: fix license --- pkgs/tools/package-management/cargo-release/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index cc577098562b..2f2a09b46cf9 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = "https://github.com/sunng87/cargo-release"; - license = with licenses; [ mit ]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli ]; }; } From 36773ed064e7fa16426650356149a7abd7e19094 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 12:57:56 -0400 Subject: [PATCH 2/2] cargo-release: 0.16.3 -> 0.17.0 --- .../package-management/cargo-release/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 2f2a09b46cf9..5cec6589c11d 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { - owner = "sunng87"; + owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-VAXuxHCayjmuI26rhJroEBbnyJ4z+w7HY5TNTanYvpw="; + sha256 = "04vp2w07da9b4cfrdp8jj5fp5v7xzdx2946v7195n2krhrdhq957"; }; - cargoSha256 = "sha256-cXuAPQ8xRkeixWNYGjStNipbn4xIc1NsfVqROd6RHdg="; + cargoSha256 = "0ch22aysbpp38xny3sfbzrbsflfva57dlslkdqsmf4a7bckpbkhs"; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate'';