From f5d87c57fc7909487b40632d7c23a46850ff5c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 13 Dec 2025 12:35:10 +0700 Subject: [PATCH 1/2] nix-prefetch-scripts: drop gnused as a hard dependency --- .../nix-prefetch-scripts/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 579814a3bacf..1dade613d9a5 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -35,15 +35,7 @@ let installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${ - lib.makeBinPath ( - deps - ++ [ - coreutils - gnused - ] - ) - } \ + --prefix PATH : ${lib.makeBinPath ( deps ++ [ coreutils ])} \ --set HOME /homeless-shelter ''; @@ -63,6 +55,7 @@ rec { # we expect people to have a Nix implementation available ambiently. nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy + gnused ]; nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; nix-prefetch-darcs = mkPrefetchScript "darcs" ../../../build-support/fetchdarcs/nix-prefetch-darcs [ @@ -76,11 +69,13 @@ rec { gawk gitMinimal git-lfs + gnused ]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ + gnused subversion ]; nix-prefetch-pijul = mkPrefetchScript "pijul" ../../../build-support/fetchpijul/nix-prefetch-pijul [ From 9338b5aa3e78919906889d720eb8c3c4c10259f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 13 Dec 2025 12:36:20 +0700 Subject: [PATCH 2/2] nix-prefetch-svn: add missing gnugrep input --- .../tools/package-management/nix-prefetch-scripts/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 1dade613d9a5..8982dbc7539c 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -13,6 +13,7 @@ gawk, gitMinimal, git-lfs, + gnugrep, gnused, jq, mercurial, @@ -35,7 +36,7 @@ let installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${lib.makeBinPath ( deps ++ [ coreutils ])} \ + --prefix PATH : ${lib.makeBinPath (deps ++ [ coreutils ])} \ --set HOME /homeless-shelter ''; @@ -75,6 +76,7 @@ rec { mercurial ]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ + gnugrep gnused subversion ];