{findutils,gnumake,gzip,less}: adopt, cleanup

pkgs/by-name/le/less/package.nix

@@ -1,7 +1,6 @@
 {
   lib,
   fetchurl,
-  fetchpatch,
   ncurses,
   pcre2,
   stdenv,
@@ -55,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;
   };

pkgs/development/tools/build-managers/gnumake/default.nix

@@ -9,18 +9,19 @@
   inBootstrap ? false,
   pkg-config,
   gnumake,
+  directoryListingUpdater,
 }:
 
 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=";
   };
 
@@ -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 (finalAttrs) pname version;
+      url = "https://ftp.gnu.org/gnu/make/";
+    };
   };
 
   meta = {
@@ -70,10 +77,9 @@ stdenv.mkDerivation rec {
       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;
   };
-}
+})

pkgs/tools/compression/gzip/default.nix

@@ -5,19 +5,20 @@
   makeShellWrapper,
   updateAutotoolsGnuConfigScriptsHook,
   runtimeShellPackage,
+  directoryListingUpdater,
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # 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=";
   };
 
@@ -60,10 +61,16 @@ stdenv.mkDerivation rec {
       --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}"
   '';
 
+  passthru = {
+    updateScript = directoryListingUpdater {
+      inherit (finalAttrs) pname version;
+      url = "https://ftp.gnu.org/gnu/gzip/";
+    };
+  };
+
   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
@@ -75,11 +82,9 @@ stdenv.mkDerivation rec {
       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 ];
   };
-}
+})

pkgs/tools/misc/findutils/default.nix

@@ -4,19 +4,20 @@
   fetchurl,
   updateAutotoolsGnuConfigScriptsHook,
   coreutils,
+  directoryListingUpdater,
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # 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=";
   };
 
@@ -75,10 +76,14 @@ 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 (finalAttrs) 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";
-
     longDescription = ''
       The GNU Find Utilities are the basic directory searching
       utilities of the GNU operating system.  These programs are
@@ -96,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 ];
   };
-}
+})