gnupatch: 2.7.6 -> 2.7.6-unstable-2024-08-25

pkgs/build-support/setup-hooks/gnulib-bootstrap.sh

@@ -0,0 +1,20 @@
+preConfigurePhases+=(gnulibBootstrapPhase)
+
+gnulibBootstrapPhase() {
+    runHook preGnulibBootstrap
+
+    local -a flagsArray=()
+    concatTo flagsArray gnulibBootstrapFlags
+
+    # For Gnulib’s build-aux/git-version-gen.
+    if [[ -z ${gnulibBootstrapDontWriteTarballVersion-} && -n ${version-} ]]; then
+        printf %s "$version" >.tarball-version
+    fi
+
+    cp @gnulib@/build-aux/bootstrap .
+    GNULIB_SRCDIR=@gnulib@ sh bootstrap \
+        --bootstrap-sync --no-git --gen \
+        "${flagsArray[@]}"
+
+    runHook postGnulibBootstrap
+}

pkgs/by-name/gn/gnupatch/package.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  testers,
+  fetchFromSavannah,
+  unstableGitUpdater,
+  gnulibBootstrapHook,
+  bison,
+  ed,
+}:
+let
+  canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "patch";
+  version = "2.7.6-unstable-2024-08-25";
+
+  # This used to be fetchurl from GNU mirror, but mirrors don’t have Git
+  # snapshots and GNU patch had no releases in almost a decade.
+  # fetchurl { url = "mirror://gnu/patch/patch-${version}.tar.xz"; hash = ""; };
+  src = fetchFromSavannah {
+    repo = "patch";
+    rev = "abf6fb176bcd95e72ffb3ff85e6132d18cd77e75";
+    hash = "sha256-eqYTvBjjFsxe2WOeFgFMKpVWFYDiyigzc4gTdhFQrfg=";
+  };
+
+  nativeBuildInputs = [
+    gnulibBootstrapHook
+    bison
+  ];
+
+  nativeCheckInputs = [ ed ];
+
+  doCheck = canExecute;
+
+  passthru.tests = lib.optionalAttrs canExecute {
+    version = testers.testVersion { package = finalAttrs.finalPackage; };
+  };
+
+  # nix develop --file maintainers/scripts/update.nix --argstr package gnupatch2
+  passthru.updateScript = unstableGitUpdater {
+    url = "https://git.savannah.gnu.org/git/patch.git";
+    tagPrefix = "v";
+  };
+
+  meta = {
+    description = "GNU Patch, a program to apply differences to files";
+    mainProgram = "patch";
+
+    longDescription = ''
+      GNU Patch takes a patch file containing a difference listing
+      produced by the diff program and applies those differences to one or
+      more original files, producing patched versions.
+    '';
+
+    homepage = "https://savannah.gnu.org/projects/patch";
+
+    license = lib.licenses.gpl3Plus;
+
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/development/libraries/openssl/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, buildPackages, perl, coreutils, writeShellScript
-, makeWrapper
+, makeBinaryWrapper
 , withCryptodev ? false, cryptodev
 , withZlib ? false, zlib
 , enableSSL2 ? false
@@ -70,7 +70,7 @@ let
       stdenv.cc.isGNU;
 
     nativeBuildInputs =
-         lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper
+         lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper
       ++ [ perl ]
       ++ lib.optionals static [ removeReferencesTo ];
     buildInputs = lib.optional withCryptodev cryptodev

pkgs/development/tools/gnulib/default.nix

@@ -1,13 +1,13 @@
-{ lib, stdenv, fetchFromSavannah, python3, perl }:
+{ lib, stdenv, fetchFromSavannah, python3Minimal, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gnulib";
-  version = "20231109";
+  version = "1.0";
 
   src = fetchFromSavannah {
     repo = "gnulib";
-    rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634";
-    hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE=";
+    rev = "v${version}";
+    hash = "sha256-8c/qz58w93PU4EiEKRLeSBLQ6eA6o1BdIOtiM9fs5g4=";
   };
 
   postPatch = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     --replace-fail 'exec perl' 'exec ${lib.getExe perl}'
   '';
 
-  buildInputs = [ python3 ];
+  buildInputs = [ python3Minimal ];
 
   installPhase = ''
     mkdir -p $out/bin

pkgs/stdenv/linux/default.nix

@@ -146,8 +146,11 @@ let
     isFromBootstrapFiles = true;
   };
 
-  getLibc = stage: stage.${localSystem.libc};
+  fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
+    inherit system;
+  };
 
+  getLibc = stage: stage.${localSystem.libc};
 
   # This function builds the various standard environments used during
   # the bootstrap.  In all stages, we build an stdenv and the package
@@ -173,9 +176,7 @@ let
         shell = "${bootstrapTools}/bin/bash";
         initialPath = [bootstrapTools];
 
-        fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
-          inherit system;
-        };
+        inherit fetchurlBoot;
 
         cc = if prevStage.gcc-unwrapped == null
              then null
@@ -202,7 +203,7 @@ let
           '';
         });
 
-        overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
+        inherit overrides;
       };
 
     in {
@@ -268,6 +269,7 @@ in
       };
       coreutils = bootstrapTools;
       gnugrep = bootstrapTools;
+      fetchurl = fetchurlBoot;
     };
   })
 
@@ -309,6 +311,8 @@ in
       # won't be included in the final stdenv and won't be exported to
       # top-level pkgs as an override either.
       perl = super.perl.override { enableThreading = false; enableCrypt = false; };
+
+      fetchurl = fetchurlBoot;
     };
 
     # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
@@ -397,6 +401,8 @@ in
               find $lib/lib/ -name \*.so\* -exec patchelf --shrink-rpath {} \; || true
             '';
           });
+
+        fetchurl = fetchurlBoot;
       };
 
       # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
@@ -481,6 +487,7 @@ in
           NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or "") + " -static-libstdc++";
         });
 
+      fetchurl = fetchurlBoot;
     };
 
     # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
@@ -522,6 +529,7 @@ in
         # so we can add them to allowedRequisites below
         passthru = a.passthru // { inherit (self) gmp mpfr libmpc isl; };
       });
+      fetchurl = fetchurlBoot;
     };
     extraNativeBuildInputs = [
       prevStage.patchelf
@@ -601,6 +609,7 @@ in
     assert isBuiltByNixpkgsCompiler prevStage.patchelf;
     {
     inherit config overlays;
+
     stdenv = import ../generic rec {
       name = "stdenv-linux";
 
@@ -624,7 +633,7 @@ in
 
       shell = cc.shell;
 
-      inherit (prevStage.stdenv) fetchurlBoot;
+      inherit fetchurlBoot;
 
       extraAttrs = {
         inherit bootstrapTools;