From f4e90e518149e07c2749c1ab9450f837f53c68dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 10:09:35 -0400 Subject: [PATCH 1/2] cargo-make: 0.36.13 -> 0.37.0 Diff: https://github.com/sagiegurari/cargo-make/compare/0.36.13...0.37.0 Changelog: https://github.com/sagiegurari/cargo-make/blob/0.37.0/CHANGELOG.md --- pkgs/development/tools/rust/cargo-make/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2677eff21a1..ca56a30d814 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , bzip2 , openssl @@ -10,14 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.13"; + version = "0.37.0"; - src = fetchCrate { - inherit pname version; - hash = "sha256-9EnVO2CJY5y01mxSWphbuTVnckgUr6L8GrFy1nQcqT8="; + src = fetchFromGitHub { + owner = "sagiegurari"; + repo = "cargo-make"; + rev = version; + hash = "sha256-gc/0mlhQdE9tnCpDQ2vSWX4WcqnPxRjmL6YPtYGEn5E="; }; - cargoHash = "sha256-K6D5e9inuB1y3VcEW73ikrkTcewnZyW7kdHSDkWxC3w="; + cargoHash = "sha256-ut9s+kMATtmOfyIp+TwmdQtlObiZexWbh1p1tcCpYGo="; nativeBuildInputs = [ pkg-config ]; From 619059929d669c6d1ccd156fe83e411c195e7852 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 10:17:17 -0400 Subject: [PATCH 2/2] cargo-make: set meta.mainProgram --- pkgs/development/tools/rust/cargo-make/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index ca56a30d814..dc58914a278 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda xrelkd ]; + mainProgram = "cargo-make"; }; }