From f15466ecf7d2deba080f726d3879a9c3fd235bdf Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 27 Dec 2018 04:04:11 +0100 Subject: [PATCH 1/2] cargo-release: 0.10.0 -> 0.10.5 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 562f92121d6..8bb5861a23c 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "cargo-release-${version}"; - version = "0.10.0"; + version = "0.10.5"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "${version}"; - sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0"; + sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; }; - cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5"; + cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq"; meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; From db5fe5d240cfb262a92640de36f39d1689eb631a Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 27 Dec 2018 11:46:50 +0200 Subject: [PATCH 2/2] cargo-release: fix darwin build --- pkgs/tools/package-management/cargo-release/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 8bb5861a23c..116337e067e 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { name = "cargo-release-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = https://github.com/sunng87/cargo-release; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba2c979b42..14e381b7a14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,7 +7465,9 @@ in cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; - cargo-release = callPackage ../tools/package-management/cargo-release { }; + cargo-release = callPackage ../tools/package-management/cargo-release { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { };