From 94424da4fcf5f9f1b7be9ca529c708c07e5f2161 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Jun 2024 12:09:25 -0400 Subject: [PATCH] netbsd: Remove a bunch of unneeded `rsync` deps Now that we assemble the source code per each package in a separate prep derivation since b6727bbeac10eba4b4b157b51a8521390fc94f3c, we don't need rsync in the package proper derivations. --- pkgs/os-specific/bsd/netbsd/default.nix | 10 ---------- pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/config.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/csu.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/include.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libc.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix | 1 - pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/tic.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix | 2 -- 20 files changed, 47 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 15e93de1f1ef..25deeebec63b 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -53,7 +53,6 @@ makeScopeWithSplicing' { compat = self.callPackage ./pkgs/compat/package.nix { inherit (buildPackages) coreutils; inherit (buildPackages.darwin) cctools-port; - inherit (buildPackages.buildPackages) rsync; inherit (buildPackages.netbsd) makeMinimal; inherit (self) install; }; @@ -65,14 +64,12 @@ makeScopeWithSplicing' { make compatIfNeeded ; - inherit (buildPackages.buildPackages) rsync; inherit (buildPackages.netbsd) makeMinimal; }; # See note in pkgs/stat/package.nix stat = self.callPackage ./pkgs/stat/package.nix { inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; }; # See note in pkgs/stat/hook.nix @@ -80,17 +77,14 @@ makeScopeWithSplicing' { tsort = self.callPackage ./pkgs/tsort.nix { inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; }; lorder = self.callPackage ./pkgs/lorder.nix { inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; }; config = self.callPackage ./pkgs/config.nix { inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; inherit (self) cksum; }; @@ -102,7 +96,6 @@ makeScopeWithSplicing' { rpcgen ; inherit (buildPackages) stdenv; - inherit (buildPackages.buildPackages) rsync; }; sys-headers = self.callPackage ./pkgs/sys/headers.nix { @@ -116,7 +109,6 @@ makeScopeWithSplicing' { config genassym ; - inherit (buildPackages.buildPackages) rsync; }; libutil = self.callPackage ./pkgs/libutil.nix { inherit (self) libc sys; }; @@ -135,7 +127,6 @@ makeScopeWithSplicing' { tsort statHook ; - inherit (buildPackages.buildPackages) rsync; }; @@ -152,7 +143,6 @@ makeScopeWithSplicing' { statHook rpcgen ; - inherit (buildPackages.buildPackages) rsync; }; mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) mknod; }; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 10431eb64048..aed7846e421f 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -10,7 +10,6 @@ bsdSetupHook, netbsdSetupHook, makeMinimal, - rsync, version, }: @@ -48,7 +47,6 @@ mkDerivation ( bsdSetupHook netbsdSetupHook makeMinimal - rsync ]; buildInputs = commonDeps; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix index 272e9065b29b..94a014a189cf 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -7,7 +7,6 @@ mandoc, byacc, flex, - rsync, compatIfNeeded, cksum, }: @@ -22,7 +21,6 @@ mkDerivation { mandoc byacc flex - rsync ]; buildInputs = compatIfNeeded; extraPaths = [ cksum.path ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix index ea78f338c533..c6e0de8edd11 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -14,7 +14,6 @@ lorder, tsort, statHook, - rsync, headers, sys-headers, ld_elf_so, @@ -38,7 +37,6 @@ mkDerivation { lorder tsort statHook - rsync ]; buildInputs = [ headers ]; extraPaths = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix index 57fc0633b088..3201a1c0e082 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -2,7 +2,6 @@ mkDerivation, bsdSetupHook, netbsdSetupHook, - rsync, compatIfNeeded, }: @@ -12,7 +11,6 @@ mkDerivation { nativeBuildInputs = [ bsdSetupHook netbsdSetupHook - rsync ]; propagatedBuildInputs = compatIfNeeded; extraPaths = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix index a43a93847b23..1048016b81e2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -7,7 +7,6 @@ install, mandoc, groff, - rsync, nbperf, rpcgen, defaultMakeFlags, @@ -24,7 +23,6 @@ mkDerivation { install mandoc groff - rsync nbperf rpcgen ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index 2dbec08f15e8..fa8bb690075f 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -8,7 +8,6 @@ makeMinimal, mandoc, groff, - rsync, compatIfNeeded, fts, @@ -36,7 +35,6 @@ mkDerivation { makeMinimal mandoc groff - rsync ]; skipIncludesPhase = true; buildInputs = diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index 8f86691a4413..8d590e5f0790 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -15,7 +15,6 @@ lorder, tsort, statHook, - rsync, rpcgen, csu, headers, @@ -55,7 +54,6 @@ mkDerivation { lorder tsort statHook - rsync rpcgen ]; buildInputs = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix index 6e7b59df2ed5..c02410a52ed2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -10,7 +10,6 @@ statHook, nbperf, tic, - rsync, compatIfNeeded, }: @@ -27,7 +26,6 @@ mkDerivation { statHook nbperf tic - rsync ]; buildInputs = compatIfNeeded; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index cce0a1b997d8..49ecb8e4a36a 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -11,7 +11,6 @@ lorder, mandoc, statHook, - rsync, headers, }: @@ -32,7 +31,6 @@ mkDerivation { lorder mandoc statHook - rsync ]; buildInputs = [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix index 836fa7500e57..b10b8caee2ff 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -6,7 +6,6 @@ install, mandoc, groff, - rsync, }: mkDerivation { @@ -18,6 +17,5 @@ mkDerivation { install mandoc groff - rsync ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix index a1e8d1482c21..e16027b535fc 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix @@ -4,7 +4,6 @@ stdenv, bsdSetupHook, netbsdSetupHook, - rsync, }: mkDerivation { @@ -15,7 +14,6 @@ mkDerivation { nativeBuildInputs = [ bsdSetupHook netbsdSetupHook - rsync ]; dontBuild = true; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix index ad70b6b8cd07..aab6e7f2b0df 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -2,7 +2,6 @@ mkDerivation, bsdSetupHook, netbsdSetupHook, - rsync, make, make-rules, }: @@ -14,7 +13,6 @@ mkDerivation { nativeBuildInputs = [ bsdSetupHook netbsdSetupHook - rsync ]; skipIncludesPhase = true; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index f9b31ee6fed8..b12c92826607 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -59,7 +59,6 @@ lib.makeOverridable ( mandoc groff statHook - rsync ]; buildInputs = compatIfNeeded; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix index 522a7a1837b1..f55bab160bc2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -6,7 +6,6 @@ install, mandoc, groff, - rsync, }: # Don't add this to nativeBuildInputs directly. @@ -21,6 +20,5 @@ mkDerivation { install mandoc groff - rsync ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index 6a6f8a503276..116aa46e7350 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -9,7 +9,6 @@ tsort, lorder, statHook, - rsync, uudecode, config, genassym, @@ -53,7 +52,6 @@ tsort lorder statHook - rsync uudecode config genassym diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix index 65fabedfcb45..d19d9d86cb38 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -9,7 +9,6 @@ tsort, lorder, statHook, - rsync, uudecode, config, genassym, @@ -28,7 +27,6 @@ let tsort lorder statHook - rsync uudecode config genassym diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix index cb691dc87855..0bdd83126bcf 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -9,7 +9,6 @@ tsort, lorder, statHook, - rsync, uudecode, config, genassym, @@ -28,7 +27,6 @@ let tsort lorder statHook - rsync uudecode config genassym diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix index f71df930ce1c..42772d1d7128 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -7,7 +7,6 @@ mandoc, groff, nbperf, - rsync, compatIfNeeded, defaultMakeFlags, libterminfo, @@ -25,7 +24,6 @@ mkDerivation { mandoc groff nbperf - rsync ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix index b1ab320da0c8..c844e48b4412 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -6,7 +6,6 @@ install, mandoc, groff, - rsync, }: mkDerivation { @@ -18,6 +17,5 @@ mkDerivation { install mandoc groff - rsync ]; }