From def384cbfb9c7546ee8f811407f5dd619878f2bd Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:20:27 -0500 Subject: [PATCH 01/11] less: remove unused argument --- pkgs/by-name/le/less/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 7ce41595e4ac..9a9dac3e02b2 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,7 +1,6 @@ { lib, fetchurl, - fetchpatch, ncurses, pcre2, stdenv, From 894bad3127d1958619360621db8590cb119265f6 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:20:45 -0500 Subject: [PATCH 02/11] less: adopt --- pkgs/by-name/le/less/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 9a9dac3e02b2..e3ee393a0306 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -54,8 +54,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "less"; maintainers = with lib.maintainers; [ - # not active + # dtzWill is not active dtzWill + mdaniels5757 ]; platforms = lib.platforms.unix; }; From 63a72682ee627c972810d0b81fb48e85f15a193d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:25:51 -0500 Subject: [PATCH 03/11] gzip: set passthru.updateScript --- pkgs/tools/compression/gzip/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 2f3ce88b99e3..b887294348c3 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -5,6 +5,7 @@ makeShellWrapper, updateAutotoolsGnuConfigScriptsHook, runtimeShellPackage, + directoryListingUpdater, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -60,6 +61,13 @@ stdenv.mkDerivation rec { --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" ''; + passthru = { + updateScript = directoryListingUpdater { + inherit pname version; + url = "https://ftp.gnu.org/gnu/gzip/"; + }; + }; + meta = { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; From 43983f9f0e380aa4b74315d69ae30e696236cb09 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:28:03 -0500 Subject: [PATCH 04/11] gzip: use finalAttrs --- pkgs/tools/compression/gzip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b887294348c3..a9661f71339f 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -13,12 +13,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gzip"; version = "1.14"; src = fetchurl { - url = "mirror://gnu/gzip/${pname}-${version}.tar.xz"; + url = "mirror://gnu/gzip/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-Aae4gb0iC/32Ffl7hxj4C9/T9q3ThbmT3Pbv0U6MCsY="; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://ftp.gnu.org/gnu/gzip/"; }; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { mainProgram = "gzip"; }; -} +}) From dad138e3de5d02c770c47ad6a8ad05e64b515d95 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:29:09 -0500 Subject: [PATCH 05/11] gzip: adopt --- pkgs/tools/compression/gzip/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index a9661f71339f..e424c911dfff 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; - longDescription = '' gzip (GNU zip) is a popular data compression program written by Jean-loup Gailly for the GNU project. Mark Adler wrote the @@ -83,11 +82,9 @@ stdenv.mkDerivation (finalAttrs: { and we needed a replacement. The superior compression ratio of gzip is just a bonus. ''; - platforms = lib.platforms.all; - license = lib.licenses.gpl3Plus; - mainProgram = "gzip"; + maintainers = [ lib.maintainers.mdaniels5757 ]; }; }) From 1c96fc458662d498158909e27ccbaadaa662fb41 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:33:56 -0500 Subject: [PATCH 06/11] gnumake: set passthru.updateScript --- .../tools/build-managers/gnumake/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 15bd19b21e6a..f7c581b90b31 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -9,6 +9,7 @@ inBootstrap ? false, pkg-config, gnumake, + directoryListingUpdater, }: let @@ -52,9 +53,15 @@ stdenv.mkDerivation rec { ]; separateDebugInfo = true; - passthru.tests = { - # make sure that the override doesn't break bootstrapping - gnumakeWithGuile = gnumake.override { guileSupport = true; }; + passthru = { + tests = { + # make sure that the override doesn't break bootstrapping + gnumakeWithGuile = gnumake.override { guileSupport = true; }; + }; + updateScript = directoryListingUpdater { + inherit pname version; + url = "https://ftp.gnu.org/gnu/make/"; + }; }; meta = { From d9f31765f70c17d75b7b625b125f008db86eb5fb Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:34:28 -0500 Subject: [PATCH 07/11] gnumake: use finalAttrs --- pkgs/development/tools/build-managers/gnumake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index f7c581b90b31..a89b5bb22e49 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -16,12 +16,12 @@ let guileEnabled = guileSupport && !inBootstrap; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnumake"; version = "4.4.1"; src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.gz"; + url = "mirror://gnu/make/make-${finalAttrs.version}.tar.gz"; sha256 = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { gnumakeWithGuile = gnumake.override { guileSupport = true; }; }; updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://ftp.gnu.org/gnu/make/"; }; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { mainProgram = "make"; platforms = lib.platforms.all; }; -} +}) From 7c63c1dc3a873aac26a16d6acabe13f2067439fb Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:46:47 -0500 Subject: [PATCH 08/11] gnumake: adopt --- pkgs/development/tools/build-managers/gnumake/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index a89b5bb22e49..277f9be89d16 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -77,9 +77,8 @@ stdenv.mkDerivation (finalAttrs: { to build and install the program. ''; homepage = "https://www.gnu.org/software/make/"; - license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.mdaniels5757 ]; mainProgram = "make"; platforms = lib.platforms.all; }; From 5b3ef25fdc74603f08df8f48bfdbb777dfe308a6 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:48:45 -0500 Subject: [PATCH 09/11] findutils: set passthru.updateScript --- pkgs/tools/misc/findutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index e7d4f5bbd34d..10b2c99391cc 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -4,6 +4,7 @@ fetchurl, updateAutotoolsGnuConfigScriptsHook, coreutils, + directoryListingUpdater, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -75,6 +76,11 @@ stdenv.mkDerivation rec { # or you can check libc/include/sys/cdefs.h in bionic source code hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://ftp.gnu.org/gnu/findutils/"; + }; + meta = { homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; From 2644aeacaac7f07b0bc87c31e971423f16af6557 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:50:37 -0500 Subject: [PATCH 10/11] findutils: adopt --- pkgs/tools/misc/findutils/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 10b2c99391cc..1c87156a1c95 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; - longDescription = '' The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are @@ -102,11 +101,9 @@ stdenv.mkDerivation rec { * locate - list files in databases that match a pattern; * updatedb - update a file name database; ''; - platforms = lib.platforms.all; - license = lib.licenses.gpl3Plus; - mainProgram = "find"; + maintainers = [ lib.maintainers.mdaniels5757 ]; }; } From b1c4b7e167905307abd58f3fb4a17a515c48dbd4 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Dec 2025 17:51:04 -0500 Subject: [PATCH 11/11] findutils: use finalAttrs --- pkgs/tools/misc/findutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 1c87156a1c95..a93cb12a5e16 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -12,12 +12,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "findutils"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnu/findutils/findutils-${version}.tar.xz"; + url = "mirror://gnu/findutils/findutils-${finalAttrs.version}.tar.xz"; sha256 = "sha256-E4fgtn/yR9Kr3pmPkN+/cMFJE5Glnd/suK5ph4nwpPU="; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; passthru.updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://ftp.gnu.org/gnu/findutils/"; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { mainProgram = "find"; maintainers = [ lib.maintainers.mdaniels5757 ]; }; -} +})