Merge pull request #249653 from figsoda/make

cargo-make: 0.36.12 -> 0.36.13
This commit is contained in:
Nick Cao 2023-08-17 14:25:54 +08:00 committed by GitHub
commit 7a3d591326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions

View file

@ -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 ];
};
}

View file

@ -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 {