From 2a50c9598bb7fe4175c4f29df07656a7f0a07801 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 7 Mar 2026 11:19:10 +0100
Subject: gnu: Reference the inherited ‘arguments’ value.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit was made by running this command:

  sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm

… and then:

  1. reverting changes from ‘gnu/packages/rust.scm’ and
     ‘gnu/packages/java.scm’ since they would incur derivation changes and/or
     breakage;
  2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
  3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
     which use ‘substitute-keyword-arguments’ for arguments that are not
     inherited (and thus ‘arguments’ would be unbound);
  4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
     which make bogus assumptions about inherited arguments.

Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
---
 gnu/packages/make-bootstrap.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/make-bootstrap.scm')

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 16a20271421..5368a092c70 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -79,7 +79,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                                           (_ "glibc-bootstrap-system.patch")))
                                    (origin-patches (package-source base))))))
       (arguments
-       (substitute-keyword-arguments (package-arguments base)
+       (substitute-keyword-arguments arguments
          ((#:configure-flags flags)
           ;; Arrange so that getaddrinfo & co. do not contact the nscd,
           ;; and can use statically-linked NSS modules.
@@ -187,7 +187,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
         (bzip2 (package
                  (inherit bzip2)
                  (arguments
-                  (substitute-keyword-arguments (package-arguments bzip2)
+                  (substitute-keyword-arguments arguments
                     ((#:phases phases)
                      #~(modify-phases #$phases
                          (add-before 'build 'dash-static
@@ -222,7 +222,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                                          (origin-patches
                                           (package-source gawk))))))
                 (arguments
-                 (substitute-keyword-arguments (package-arguments gawk)
+                 (substitute-keyword-arguments arguments
                    ((#:configure-flags _ #~'())
                     ;; Starting from gawk 4.1.0, some of the tests for the
                     ;; plug-in mechanism just fail on static builds:
@@ -245,7 +245,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
 	(tar (package
                (inherit tar)
 	       (arguments
-                (substitute-keyword-arguments (package-arguments tar)
+                (substitute-keyword-arguments arguments
                   ((#:configure-flags flags #~'())
                    ;; Work around a cross-compilation bug whereby libgnu.a
                    ;; would provide '__mktime_internal', which conflicts
@@ -268,7 +268,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                 (inherit grep)
                 (inputs '())                   ;remove PCRE, which is optional
                 (arguments
-                 (substitute-keyword-arguments (package-arguments grep)
+                 (substitute-keyword-arguments arguments
                    ((#:configure-flags flags #~'())
                     #~(cons "--disable-perl-regexp"
                             (delete "--enable-perl-regexp" #$flags)))
@@ -481,7 +481,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
      (name "gcc-static")
      (outputs '("out"))                           ; all in one
      (arguments
-      (substitute-keyword-arguments (package-arguments gcc-14)
+      (substitute-keyword-arguments arguments
         ((#:modules modules %default-gnu-modules)
          `((srfi srfi-1)
            (srfi srfi-26)
@@ -625,7 +625,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
          (replace "libgc" libgc/static-libs)))
 
       (arguments
-       (substitute-keyword-arguments (package-arguments guile)
+       (substitute-keyword-arguments arguments
          ((#:configure-flags flags #~'())
           ;; When `configure' checks for ltdl availability, it
           ;; doesn't try to link using libtool, and thus fails
-- 
cgit v1.3