Skip to content

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

Merged
mdaniels5757 merged 11 commits intoNixOS:masterfrom
mdaniels5757:adopt
Dec 28, 2025
Merged

{findutils,gnumake,gzip,less}: adopt, cleanup#474210
mdaniels5757 merged 11 commits intoNixOS:masterfrom
mdaniels5757:adopt

Conversation

@mdaniels5757
Copy link
Member

@mdaniels5757 mdaniels5757 commented Dec 25, 2025

This should help #416200 a bit.

Passthru tests for gzip will fail until #474203 makes its way to master.

Things done


Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot requested a review from dtzWill December 25, 2025 23:02
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 25, 2025
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Dec 27, 2025

On second thought, I don't want to have this merged with the passthru.test failing, and don't want to wait for staging.

So, I will drop the commit with the passthru test, and make a separate PR once the issue is resolved one way or another.

For posterity, the patch I am dropping is:

Details
From c916e1d95f383f18daaf5b0037edf90a18824d67 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 25 Dec 2025 17:28:41 -0500
Subject: [PATCH] gzip: add passthru test

---
 pkgs/tools/compression/gzip/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index a9661f71339f..f83e17bdaaac 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -6,6 +6,10 @@
   updateAutotoolsGnuConfigScriptsHook,
   runtimeShellPackage,
   directoryListingUpdater,
+  # Tests
+  gzip,
+  less,
+  perl,
 }:

 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -45,6 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
     "ZLESS_PROG=zless"
   ];

+  nativeCheckInputs = [
+    less
+    perl
+  ];
+  doCheck = false;
+
   # Many gzip executables are shell scripts that depend upon other gzip
   # executables being in $PATH.  Rather than try to re-write all the
   # internal cross-references, just add $out/bin to PATH at the top of
@@ -62,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';

   passthru = {
+    tests.makecheck = gzip.overrideAttrs { doCheck = true; };
     updateScript = directoryListingUpdater {
       inherit (finalAttrs) pname version;
       url = "https://ftp.gnu.org/gnu/gzip/";
--
2.51.2

@mdaniels5757 mdaniels5757 added this pull request to the merge queue Dec 28, 2025
Merged via the queue into NixOS:master with commit 82367db Dec 28, 2025
29 of 31 checks passed
@mdaniels5757 mdaniels5757 deleted the adopt branch December 28, 2025 15:04
@mdaniels5757 mdaniels5757 added the backport release-25.11 Backport PR automatically label Dec 28, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 28, 2025

Successfully created backport PR for release-25.11:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Dec 28, 2025
@zowoq
Copy link
Contributor

zowoq commented Dec 30, 2025

@mdaniels5757 Please test your changes first. The updateScripts for findutils and gzip don't even evaluate. Please either fix or revert as it is blocking the update bot from ingesting new packages with updateScripts.

@mdaniels5757 mdaniels5757 mentioned this pull request Dec 30, 2025
13 tasks
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Dec 30, 2025

Reverting, apologies. I had thought that the eval workflow would catch issues with the updateScript and the bootstrap process, but clearly not. Will definitely test these manually in the future.

@zowoq
Copy link
Contributor

zowoq commented Dec 31, 2025

Thanks for the quick response, appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. backport release-25.11 Backport PR automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants