From 45dc03c164ae8e38450c91c73b6030294be090ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Feb 2026 15:03:51 +0100 Subject: [PATCH 1/2] rustPlatform.fetchCargoVendor: use gitMinimal --- pkgs/build-support/rust/fetch-cargo-vendor.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 15b6214a4ae3..070db7575e4a 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -5,6 +5,7 @@ writers, python3Packages, cargo, + gitMinimal, nix-prefetch-git, cacert, }: @@ -61,9 +62,12 @@ let nativeBuildInputs = [ fetchCargoVendorUtil cacert - # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git - # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692 - (nix-prefetch-git.override { git-lfs = null; }) + (nix-prefetch-git.override { + git = gitMinimal; + # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git + # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692 + git-lfs = null; + }) ] ++ nativeBuildInputs; From 90d0658590e44d57e6b8b9b057d091e290f1cf15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Feb 2026 15:04:15 +0100 Subject: [PATCH 2/2] nix-prefetch-git: use normal git --- .../tools/package-management/nix-prefetch-scripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 498f7d3b7970..75b8f76e956f 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -12,7 +12,7 @@ findutils, fossil, gawk, - gitMinimal, + git, git-lfs, gnugrep, gnused, @@ -77,7 +77,7 @@ rec { nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ findutils gawk - gitMinimal + git git-lfs gnused ];