vendorCargoDeps: handle unused patch dependencies (#581)

ipetkov · Apr 7, 2024 · b47c407 · b47c407
1 parent 1e44708
commit b47c407
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 * `inheritCargoArtifactsHook` and `installCargoArtifactsHook` now correctly
   handle the case when `CARGO_TARGET_DIR` is set to a nested directory
+* Dependency vendoring now correctly takes unused patch dependencies into
+  account
 
 ## [0.16.3] - 2024-03-19
 

diff --git a/checks/simple-git/Cargo.lock b/checks/simple-git/Cargo.lock
diff --git a/checks/simple-git/Cargo.toml b/checks/simple-git/Cargo.toml
@@ -21,3 +21,8 @@ tag = "v1.13.1"
 version = "*"
 git = "https://github.com/dtolnay/rustversion.git"
 rev = "2abd4d0e00db08bb91145cb88e5dcbad2f45bbcb"
+
+# Intentionally unused patch dependency
+# https://github.com/ipetkov/crane/issues/576
+[patch.crates-io]
+unicode-ident = { git = "https://github.com/dtolnay/unicode-ident.git", rev = "a8736e7e62be959d87970d2d137a098ba533d78b" }
diff --git a/lib/vendorMultipleCargoDeps.nix b/lib/vendorMultipleCargoDeps.nix
@@ -49,7 +49,7 @@ let
   allPackagesTrimmed = map
     (l: map
       (filterAttrs (k: _: allowedAttrs.${k} or false))
-      (l.package or [ ])
+      ((l.package or [ ]) ++ (l.patch.unused or [ ]))
     )
     cargoLocksParsed;