nongnu: Reference the inherited arguments and inputs values.

Following upstream change in
https://codeberg.org/guix/guix/commit/6b1a15189e9f02f2962c4885092533f817d0375c

These references are found via:
    rg '\(package-(arguments|[a-z]*-?inputs)'

No derivation changes are introduced by this commit.

10 files changed, 49 insertions, 47 deletions

diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm
index b62d3fd..f698ae9 100644
--- a/nongnu/packages/clojure.scm
+++ b/nongnu/packages/clojure.scm
@@ -164,7 +164,7 @@ perform refactors and more.")
        (inherit (package-source clojure-tools))
        (snippet #f)))
     (arguments
-     (substitute-keyword-arguments (package-arguments clojure-tools)
+     (substitute-keyword-arguments arguments
        ((#:install-plan plan)
         #~(cons (list (format #f "clojure-tools-~a.jar"
                               #$(package-version this-package))
diff --git a/nongnu/packages/firmware.scm b/nongnu/packages/firmware.scm
index 830df68..8f94e2c 100644
--- a/nongnu/packages/firmware.scm
+++ b/nongnu/packages/firmware.scm
@@ -26,7 +26,7 @@
     (inherit fwupd)
     (name "fwupd-nonfree")
     (arguments
-     (substitute-keyword-arguments (package-arguments fwupd)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags _
          #~'())
         #~(list "--wrap-mode=nofallback"
diff --git a/nongnu/packages/game-development.scm b/nongnu/packages/game-development.scm
index 2bde6fe..dc36044 100644
--- a/nongnu/packages/game-development.scm
+++ b/nongnu/packages/game-development.scm
@@ -241,7 +241,7 @@ with game files or or put @file{.grp} game files manually in
   (package/inherit eduke32
     (name "fury")
     (arguments
-     (substitute-keyword-arguments (package-arguments eduke32)
+     (substitute-keyword-arguments arguments
        ((#:make-flags flags #~'())
         #~(cons* "FURY=1" #$flags))
        ((#:phases phases #~%standard-phases)
@@ -254,7 +254,8 @@ with game files or or put @file{.grp} game files manually in
               (lambda _
                 (install-file "fury" (string-append #$output "/bin"))))))))
     (inputs
-       (alist-delete "libvpx" (package-inputs eduke32)))
+     (modify-inputs inputs
+       (delete "libvpx")))
     (synopsis "Game engine for the first-person shooter Ion Fury")
     (description
      "This is the @code{eduke32} engine built with support for the Ion Fury
@@ -267,7 +268,7 @@ game.  Game data is not provided.  Run @command{fury} with the option
       (inherit base)
       (name "godot-mono")
       (arguments
-       (substitute-keyword-arguments (package-arguments base)
+       (substitute-keyword-arguments arguments
          ((#:scons-flags flags)
           #~(cons* "module_mono_enabled=yes" #$flags))
          ((#:phases phases)
@@ -314,10 +315,10 @@ game.  Game data is not provided.  Run @command{fury} with the option
                     (wrap-program (string-append lib "/godot")
                       `("PATH" ":" prefix (,(string-append zenity "/bin")))))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (append dotnet)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (append python
                  (origin
                    (method (nuget-restore #:dotnet dotnet
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index 1547736..60b0ffa 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -150,7 +150,7 @@ some freedo package or an output of package-version procedure."
           (inherit freedo)
           (version version)
           (arguments
-           (substitute-keyword-arguments (package-arguments freedo)
+           (substitute-keyword-arguments arguments
              ((#:phases phases '%standard-phases)
               #~(modify-phases #$phases
                   ;; Make sure the resulted package is compatible with
@@ -277,7 +277,7 @@ on hardware which requires nonfree software to function."))))
     (inherit base-kernel)
     (version version)
     (arguments
-     (substitute-keyword-arguments (package-arguments base-kernel)
+     (substitute-keyword-arguments arguments
        ((#:phases phases)
         #~(modify-phases #$phases
             ;; Since `customize-linux' replaces the configure phase, we add
@@ -306,7 +306,7 @@ on hardware which requires nonfree software to function."))))
                  ".config"
                  (string-append "arch/x86/configs/" #$xanmod-defconfig))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs base-kernel)
+     (modify-inputs native-inputs
        ;; cpio is needed for CONFIG_IKHEADERS.
        (prepend cpio zstd)))
     (home-page "https://xanmod.org/")
@@ -425,7 +425,7 @@ if your hardware is supported by one of the smaller firmware packages.")
     (name "amdgpu-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENSE.amdgpu"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -448,7 +448,7 @@ advanced 3D.")
     (name "radeon-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENSE.radeon"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -505,7 +505,7 @@ and modules, userspace libraries, and bootloader/GPU firmware.")
     (name "atheros-firmware")
     (arguments
      (cons* #:license-file-regexp "LICEN[CS]E.*[Aa]th"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -681,7 +681,7 @@ WLAN.TF.2.1-00021-QCARMSWP-1 (ath10k/QCA9377/hw1.0/firmware-6.bin)
     (name "ibt-hw-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENCE.ibt_firmware"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -702,7 +702,7 @@ laptops).")
     (name "iwlwifi-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENCE.iwlwifi_firmware"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -723,7 +723,7 @@ support for 5GHz and 802.11ac, among others.")
     (name "i915-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENCE.i915"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -744,7 +744,7 @@ integrated graphics chipsets, including GuC, HuC and DMC.")
     (arguments
      (cons* #:license-file-regexp "LICENCE\\.(mediatek\
 |ralink_a_mediatek_company_firmware)"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -852,7 +852,7 @@ mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682.tplg)
     (name "realtek-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENCE.rtlwifi_firmware.txt"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -1503,7 +1503,7 @@ your CPU.")
     (name "amd-microcode")
     (arguments
      (cons* #:license-file-regexp "LICENSE.amd-ucode"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
@@ -1552,7 +1552,7 @@ loaded by Linux.")
     (name "mali-csf-firmware")
     (arguments
      (cons* #:license-file-regexp "LICENCE.mali_csffw"
-            (substitute-keyword-arguments (package-arguments linux-firmware)
+            (substitute-keyword-arguments arguments
               ((#:phases phases #~%standard-phases)
                #~(modify-phases #$phases
                    (add-after 'unpack 'select-firmware
diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index 356615f..f8367dc 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -551,17 +551,17 @@ Release (ESR) version.")
        (modules '((guix build utils)))
        (snippet #~(delete-file-recursively "testing/web-platform"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments firefox-esr)
+     (substitute-keyword-arguments arguments
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'set-build-id
               (lambda _
                 (setenv "MOZ_BUILD_DATE" #$%firefox-build-id)))))))
     (inputs
-     (modify-inputs (package-inputs firefox-esr)
+     (modify-inputs inputs
        (replace "icu4c" icu4c-78)))
     (native-inputs
-     (modify-inputs (package-native-inputs firefox-esr)
+     (modify-inputs native-inputs
        (replace "rust" rust-firefox)
        (replace "rust:cargo" `(,rust-firefox "cargo"))
        (replace "rust-cbindgen" rust-cbindgen-0.29)))
diff --git a/nongnu/packages/ncurses.scm b/nongnu/packages/ncurses.scm
index 1a51d2c..2c6030a 100644
--- a/nongnu/packages/ncurses.scm
+++ b/nongnu/packages/ncurses.scm
@@ -224,6 +224,6 @@ ncursesw library provides wide character support.")
   (package/inherit ncurses-5
     (name "ncurses-with-tinfo")
     (arguments
-     (substitute-keyword-arguments (package-arguments ncurses-5)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags cf)
         #~(cons "--with-termlib=tinfo" #$cf))))))
diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm
index d7fabd6..f75602e 100644
--- a/nongnu/packages/nvidia.scm
+++ b/nongnu/packages/nvidia.scm
@@ -483,7 +483,7 @@ driver.")
       (inherit base)
       (name "nvidia-module-open")
       (arguments
-       (substitute-keyword-arguments (package-arguments base)
+       (substitute-keyword-arguments arguments
          ;; NOTE: Kernels compiled with CONFIG_LTO_CLANG_THIN would cause an
          ;; error here.  See also:
          ;; <https://github.com/NVIDIA/open-gpu-kernel-modules/issues/214>
@@ -653,7 +653,7 @@ configuration, application profiles, GPU monitoring and more.")
    (package
      (inherit libglvnd)
      (arguments
-      (substitute-keyword-arguments (package-arguments libglvnd)
+      (substitute-keyword-arguments arguments
         ((#:configure-flags flags #~'())
          #~(cons* "-Dc_link_args=-Wl,-rpath=$ORIGIN" #$flags))
         ((#:phases phases #~%standard-phases)
@@ -665,10 +665,10 @@ configuration, application profiles, GPU monitoring and more.")
    (package
      (inherit mesa)
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs mesa)
+      (modify-inputs propagated-inputs
         (prepend libglvnd-for-nvda)))
      (arguments
-      (substitute-keyword-arguments (package-arguments mesa)
+      (substitute-keyword-arguments arguments
         ((#:configure-flags flags #~'())
          #~(cons* "-Dglvnd=true" #$flags))
         ((#:phases phases #~%standard-phases)
diff --git a/nongnu/packages/printers.scm b/nongnu/packages/printers.scm
index 5ee6f21..e7978ba 100644
--- a/nongnu/packages/printers.scm
+++ b/nongnu/packages/printers.scm
@@ -26,7 +26,9 @@
                          (find-files "." (lambda (file stat)
                                            (elf-file? file))))
                        (origin-snippet (package-source hplip))))))
-    (inputs (alist-delete "python-pyqt" (package-inputs hplip)))
+    (inputs
+     (modify-inputs inputs
+       (delete "python-pyqt")))
     (native-inputs
      (append
       `(("hplip-plugin"
@@ -41,9 +43,9 @@
             (sha256
              (base32
               "1an5s2i6fxzxxk46k39hkhfqq0kgy3b5adhm30p8l6k64pfnng0z")))))
-      (package-native-inputs hplip)))
+      native-inputs))
     (arguments
-     (substitute-keyword-arguments (package-arguments hplip)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags cf)
         #~(delete "--enable-qt5" #$cf))
        ((#:phases ph)
diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm
index 096adb0..f789add 100644
--- a/nongnu/packages/video.scm
+++ b/nongnu/packages/video.scm
@@ -48,11 +48,10 @@
    (package
      (inherit ffmpeg)
      (inputs
-      (modify-inputs
-          (package-inputs ffmpeg)
+      (modify-inputs inputs
         (prepend nv-codec-headers)))
      (arguments
-      (substitute-keyword-arguments (package-arguments ffmpeg)
+      (substitute-keyword-arguments arguments
         ((#:configure-flags flags)
          ;; Currently only interested in NVENC.
          ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
@@ -74,11 +73,10 @@
    (package
      (inherit ffmpeg-6)
      (inputs
-      (modify-inputs
-          (package-inputs ffmpeg-6)
+      (modify-inputs inputs
         (prepend nv-codec-headers)))
      (arguments
-      (substitute-keyword-arguments (package-arguments ffmpeg-6)
+      (substitute-keyword-arguments arguments
         ((#:configure-flags flags)
          ;; Currently only interested in NVENC.
          ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
@@ -161,7 +159,7 @@ graphics hardware.")
     (inherit intel-media-driver)
     (name "intel-media-driver-nonfree")
     (arguments
-     (substitute-keyword-arguments (package-arguments intel-media-driver)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags flags #~'())
         #~(cons "-DENABLE_NONFREE_KERNELS=ON"
                 (delete "-DENABLE_NONFREE_KERNELS=OFF" #$flags)))))
@@ -180,7 +178,7 @@ video decode capabilities of supported Intel GPUs."))))
     (inherit mpv)
     (name "mpv-nvidia")
     (inputs
-     (modify-inputs (package-inputs mpv)
+     (modify-inputs inputs
        (prepend nv-codec-headers)))
     (synopsis
      "Audio and video player (with hardware acceleration for NVIDIA graphics \
@@ -263,11 +261,11 @@ content.")
   (package/inherit obs
     (name "obs-nvidia")
     (arguments
-     (substitute-keyword-arguments (package-arguments obs)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags flags #~'())
         #~(append #$flags '("-DENABLE_NVENC=ON")))))
     (inputs
-     (modify-inputs (package-inputs obs)
+     (modify-inputs inputs
        (prepend nv-codec-headers)))
     (synopsis
      "Live streaming software (with hardware acceleration for NVIDIA graphics
@@ -278,10 +276,10 @@ cards)")))
     (inherit obs)
     (name "obs-with-cef")
     (inputs
-     (append (package-inputs obs)
-             `(("chromium-embedded-framework" ,chromium-embedded-framework))))
+     (modify-inputs inputs
+       (append chromium-embedded-framework)))
     (arguments
-     (substitute-keyword-arguments (package-arguments obs)
+     (substitute-keyword-arguments arguments
        ((#:configure-flags flags)
         #~(append #$flags
                   '("-DBUILD_BROWSER=ON"
diff --git a/nongnu/packages/wasm.scm b/nongnu/packages/wasm.scm
index 09ea711..3451489 100644
--- a/nongnu/packages/wasm.scm
+++ b/nongnu/packages/wasm.scm
@@ -111,13 +111,14 @@ other APIs.")
   (let ((base
          (clang-from-llvm llvm-17 wasm32-wasi-clang-runtime
                           #:patches '("clang-17.0-fix-build-with-gcc-14-on-arm.patch"))))
-    (package (inherit base)
+    (package
+      (inherit base)
       (name "wasm32-wasi-clang")
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (prepend wasi-libc)))
       (arguments
-       (substitute-keyword-arguments (package-arguments base)
+       (substitute-keyword-arguments arguments
          ((#:configure-flags flags)
           #~(list "-DCLANG_INCLUDE_TESTS=True"
                   ;; Use a sane default include directory.