From eb3493f84cbd07f56325ae3ea0032a9e34eb9e13 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Aug 2023 20:34:01 -0400 Subject: [PATCH] cargo-make: 0.36.12 -> 0.36.13 Diff: https://diff.rs/cargo-make/0.36.12/0.36.13 Changelog: https://github.com/sagiegurari/cargo-make/blob/0.36.13/CHANGELOG.md --- .../tools/rust/cargo-make/default.nix | 32 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 0a2301152e46..2677eff21a10 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,31 +1,32 @@ { lib -, stdenv -, fetchurl -, runCommand -, fetchCrate , rustPlatform -, Security -, openssl +, fetchCrate , pkg-config -, SystemConfiguration -, libiconv +, bzip2 +, openssl +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.12"; + version = "0.36.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dsHjSy3LV6L/P5cAKTqOjT4LM33qvjKTIHGcqrBzWqU="; + hash = "sha256-9EnVO2CJY5y01mxSWphbuTVnckgUr6L8GrFy1nQcqT8="; }; + cargoHash = "sha256-K6D5e9inuB1y3VcEW73ikrkTcewnZyW7kdHSDkWxC3w="; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - - cargoHash = "sha256-w1TmUMEKg1/VP/AQQWdW4olp0gwCm9zmiuPQ9fQh9ak="; + buildInputs = [ + bzip2 + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; # Some tests fail because they need network access. # However, Travis ensures a proper build. @@ -36,7 +37,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A Rust task runner and build tool"; homepage = "https://github.com/sagiegurari/cargo-make"; + changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ figsoda xrelkd ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b5a8bf8e3f..baa5c659d8de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17088,9 +17088,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; - cargo-make = callPackage ../development/tools/rust/cargo-make { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + cargo-make = callPackage ../development/tools/rust/cargo-make { }; cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {