From 203044d91420ba842c73cc035c76c837592a6402 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 9 Sep 2025 19:04:43 +0200
Subject: [PATCH] cargo-generate: 0.22.1 -> 0.23.5

---
 pkgs/by-name/ca/cargo-generate/package.nix | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 990ae21beb87..74055bd7015d 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -1,35 +1,32 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   libgit2,
   openssl,
-  stdenv,
+  coreutils,
   gitMinimal,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-generate";
-  version = "0.22.1";
+  version = "0.23.5";
 
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
-    rev = "v${version}";
-    sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-h6WsTXPlJYoMZ6QDR99LQr5uV0ij8NC02ZEVhg/U+qc=";
   };
 
-  cargoPatches = [
-    (fetchpatch {
-      name = "git2-version.patch";
-      url = "https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01.patch";
-      hash = "sha256-F/o1EeDBfRhIB8atpOHoc6ZnUFCyD1QkCERv4m/YeWE=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace src/hooks/system_mod.rs \
+      --replace-fail "/bin/cat" "${lib.getExe' coreutils "cat"}"
+  '';
 
-  cargoHash = "sha256-5cfROJQWIhQNMbDhaCs2bfv4I3KDWcXBsmbbbDQ331s=";
+  cargoHash = "sha256-pZm7bsMIOQF/wSwFH5kFXN5mG/H1cKz5hyM2DeNmUQ8=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -59,6 +56,9 @@ rustPlatform.buildRustPackage rec {
     "--skip=git_over_ssh::it_should_retrieve_the_private_key_from_ssh_agent"
     "--skip=git_over_ssh::it_should_support_a_public_repo"
     "--skip=git_over_ssh::it_should_use_a_ssh_key_provided_by_identity_argument"
+    # stderr doesn't quite match what is expected, slightly malformed test
+    # source
+    "--skip=hooks_and_rhai::it_fails_when_a_system_command_returns_non_zero_exit_code"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--skip=git::utils::should_canonicalize"
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tool to generate a new Rust project by leveraging a pre-existing git repository as a template";
     mainProgram = "cargo-generate";
     homepage = "https://github.com/cargo-generate/cargo-generate";
-    changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -83,4 +83,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})