From 650580885a9f6adbd4986735380e06b14de8ea8c Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Feb 2023 20:01:00 -0500
Subject: [PATCH] cargo-generate: 0.17.6 -> 0.18.0

Diff: https://github.com/cargo-generate/cargo-generate/compare/v0.17.6...v0.18.0

Changelog: https://github.com/cargo-generate/cargo-generate/blob/v0.18.0/CHANGELOG.md
---
 .../tools/rust/cargo-generate/default.nix            | 12 ++++++------
 .../tools/rust/cargo-generate/no-vendor.patch        | 11 -----------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/cargo-generate/no-vendor.patch

diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index da90015752a0..84d768e5f720 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -11,19 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
-  version = "0.17.6";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
     rev = "v${version}";
-    sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM=";
+    sha256 = "sha256-OPbDxUNqHGyTMokDayyJjS1GAekGP7LLJDUwQFjyVUM=";
   };
 
-  # patch Cargo.toml to not vendor libgit2 and openssl
-  cargoPatches = [ ./no-vendor.patch ];
-
-  cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU=";
+  cargoSha256 = "sha256-skgSFVxHa6DBm6qLbk6MUK4jaVdC8GQBGl1HgHRnxX0=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -33,6 +30,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [ git ];
 
+  # disable vendored libgit2 and openssl
+  buildNoDefaultFeatures = true;
+
   preCheck = ''
     export HOME=$(mktemp -d) USER=nixbld
     git config --global user.name Nixbld
diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch
deleted file mode 100644
index c8233cd5dd3d..000000000000
--- a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"]
- 
- [dependencies]
- clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false }
--git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
-+git2 = { version = "0.16", features = ["ssh", "https"], default-features = false }
- console = "0.15"
- dialoguer = "0.10"
- dirs = "4.0"