gnu: Reference the inherited inputs values.

This commit was made by running this command:

  sed -e's/modify-inputs (package-\([a-z-]*\)inputs [a-zA-Z0-9-]\+)/modify-inputs \1inputs/g' -i gnu/packages/*.scm

… and then reverting individual hunks where the change would trigger unbound
variable warnings or other issues (such as ‘native-inputs’ is bound in the
body of the ‘inputs’ field, but it refers to the ‘native-inputs’ thunk defined
just above).

Change-Id: I6d94819f2809313fa1fbefc61897502ee7d66fab

131 files changed, 513 insertions, 513 deletions

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 79576270d6d..b62a6721f8d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2711,7 +2711,7 @@ command.")
 (define-public wpa-supplicant
   (package (inherit wpa-supplicant-minimal)
     (name "wpa-supplicant")
-    (inputs (modify-inputs (package-inputs wpa-supplicant-minimal)
+    (inputs (modify-inputs inputs
               (prepend dbus)))
     (source (origin
               (inherit (package-source wpa-supplicant-minimal))
@@ -2750,11 +2750,11 @@ command.")
   (package
     (inherit wpa-supplicant)
     (name "wpa-supplicant-gui")
-    (inputs (modify-inputs (package-inputs wpa-supplicant)
+    (inputs (modify-inputs inputs
               (prepend qtbase-5 qtsvg-5 qtwayland-5)))
     (native-inputs
      ;; For icons.
-     (modify-inputs (package-native-inputs wpa-supplicant)
+     (modify-inputs native-inputs
        (prepend imagemagick/stable
                 inkscape/pinned)))
     (build-system qt-build-system)
@@ -4758,7 +4758,7 @@ system distribution, akin to many similar tools.")
                                         #$(this-package-input "libdrm")
                                         "/share/libdrm/amdgpu.ids"))))))
     (inputs
-     (modify-inputs (package-inputs fastfetch-minimal)
+     (modify-inputs inputs
        (append dbus
                glib
                hwdata
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 46f6a24f008..44d33116299 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -176,7 +176,7 @@ integration of this capability into your own programs.")
                   qtbase)
                  ((#:configure-flags flags ''())
                   #~(cons "-DZINT_QT6=ON" #$flags))))
-    (inputs (modify-inputs (package-inputs zint)
+    (inputs (modify-inputs inputs
               ;; The UI library of qttools is linked to; hence it must be used
               ;; as an input rather than a native input.
               (append qtsvg qttools)))
@@ -397,7 +397,7 @@ Python as well as GUI widgets for GTK and Qt.")
        ((#:disallowed-references _ '())
         (list qtbase gtk+))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs zbar)
+     (modify-inputs propagated-inputs
        (delete "gtk+")))))
 
 (define-public qrcodegen-cpp
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 85c277e781f..dff9a486724 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -172,7 +172,7 @@ engine with a Lua scripting interface.")
     (inherit arcan)
     (name "arcan-sdl")
     (inputs
-     (modify-inputs (package-inputs arcan)
+     (modify-inputs inputs
        (delete "libdrm")
        (prepend glu libglvnd mesa sdl2)))
     (arguments
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 0747ecbf209..5ba2d4067f8 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1360,7 +1360,7 @@ dynamic library for the C language implementation of HEALPix.")
                (invoke "aclocal")
                (invoke "automake" "--add-missing")
                (invoke "autoconf"))))))
-    (inputs (modify-inputs (package-inputs healpix)
+    (inputs (modify-inputs inputs
               (prepend libsharp zlib)))
     (description
      (string-replace-substring (package-description healpix)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 67efdedee14..22ea204a8b8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -7560,7 +7560,7 @@ minimum.")
     (arguments
      (list #:configure-flags '(list "-Denable_rsvg=true")))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs ztoolkit)
+     (modify-inputs propagated-inputs
        (prepend (librsvg-for-system))))
     (synopsis "ZToolkit with SVG support")))
 
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 8337f602772..69162149eb8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -792,7 +792,7 @@ included.")
                          (substitute* "gold/Makefile.in"
                            ((" testsuite") " ")))))
                   #~())))))
-    (native-inputs (modify-inputs (package-native-inputs binutils)
+    (native-inputs (modify-inputs native-inputs
                      (append bc)))))
 
 (define-public libbfd
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 31fe955d48e..b8e760d291f 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -22959,7 +22959,7 @@ accessibility data.")
                  ((".*find_overlapping_ccans works.*" m)
                   (string-append m "skip('guix')"))))))))
       (propagated-inputs
-       (modify-inputs (package-propagated-inputs r-cicero)
+       (modify-inputs propagated-inputs
          (delete "r-monocle")
          (prepend r-monocle3))))))
 
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a0b2f6db624..5b2d5194ff3 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2129,7 +2129,7 @@ Format (GFF) with Biopython integration.")
         (sha256
          (base32 "131hiir94jkm9jj2wfpybwndgzn8k0zc1ji1qjn5cz7w48x3ri13"))))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs python-bcbio-gff)
+      (modify-inputs propagated-inputs
         (replace "python-biopython" python-biopython-1.73))))))
 
 (define bed-sample-files
@@ -6703,7 +6703,7 @@ meso, or continuum scale.")
         "-D MLIAP_ENABLE_PYTHON=yes"
         (string-append "-DN2P2_DIR=" #$(this-package-input "n2p2"))))))
     (inputs
-     (modify-inputs (package-inputs lammps)
+     (modify-inputs inputs
        (delete "pnetcdf")
        (replace "hdf5-parallel-openmpi" hdf5)
        (delete "openmpi")))))
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 83f29b0bb58..dc3f0a2ac3e 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -597,7 +597,7 @@ features.")
          ((#:configure-flags configure-flags)
           #~(cons "-DGUI=OFF" #$configure-flags))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (delete "qtsvg"))))))
 
 (define-deprecated-package qbittorrent-nox
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index b98b72a23b1..d2fe7c690f1 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -358,7 +358,7 @@ across a broad spectrum of applications.")
        ((#:make-flags make-flags)
         #~(cons* "--without-python" #$make-flags))))
     (inputs
-     (modify-inputs (package-inputs boost)
+     (modify-inputs inputs
        (delete "python-minimal-wrapper")))
     (properties '((hidden? . #t)))))
 
@@ -367,7 +367,7 @@ across a broad spectrum of applications.")
     (inherit boost-1.83)
     (name "boost-numpy")
     (native-inputs
-     (modify-inputs (package-native-inputs boost)
+     (modify-inputs native-inputs
        (append python-numpy-1)))))
 
 (define-public boost-with-numpy
@@ -375,7 +375,7 @@ across a broad spectrum of applications.")
     (inherit boost)
     (name "boost-with-numpy")
     (native-inputs
-     (modify-inputs (package-native-inputs boost)
+     (modify-inputs native-inputs
        (append python-numpy)))
     (synopsis "Boost C++ libraries with inclusion of Boost.NumPy")))
 
@@ -449,7 +449,7 @@ signals and slots system.")
     (inherit boost)
     (name "boost-mpi")
     (inputs
-     (modify-inputs (package-inputs boost)
+     (modify-inputs inputs
        (append openmpi)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -469,7 +469,7 @@ signals and slots system.")
     (inherit boost-mpi)
     (name "boost-mpi-numpy")
     (inputs
-     (modify-inputs (package-inputs boost-mpi)
+     (modify-inputs inputs
        (append python-numpy)))
     (synopsis "Boost C++ libraries with inclusion of Boost.MPI and Boost.NumPy")))
 
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index ff50626548f..0cca2ece1b8 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -312,10 +312,10 @@ menu to select one of the installed operating systems.")
     (inherit grub-pc)
     (name "grub-minimal")
     (inputs
-     (modify-inputs (package-inputs grub-pc)
+     (modify-inputs inputs
        (delete "lvm2" "mdadm" "fuse" "console-setup")))
     (native-inputs
-     (modify-inputs (package-native-inputs grub)
+     (modify-inputs native-inputs
        (delete "help2man" "texinfo" "parted" "qemu" "qemu-minimal" "xorriso")))
     (arguments
      (substitute-keyword-arguments arguments
@@ -401,7 +401,7 @@ menu to select one of the installed operating systems.")
     (inherit base)
     (synopsis "GRand Unified Boot loader (UEFI version)")
     (inputs
-     (modify-inputs (package-inputs base)
+     (modify-inputs inputs
        (prepend efibootmgr mtools)))
     (native-inputs
      (cond ((or (target-x86-64?)
@@ -409,7 +409,7 @@ menu to select one of the installed operating systems.")
                 (target-aarch64?)
                 (target-arm32?))
             ;; We add the firmware needed to run the tests.
-            (modify-inputs (package-native-inputs base)
+            (modify-inputs native-inputs
               (prepend
                 (cond ((target-x86-64?) ovmf-x86-64)
                       ((target-x86-32?) ovmf-i686)
@@ -419,7 +419,7 @@ menu to select one of the installed operating systems.")
            (else
             ;; The tests are skipped in this package so we remove some
             ;; test dependencies.
-            (modify-inputs (package-native-inputs base)
+            (modify-inputs native-inputs
               (delete "parted" "qemu-minimal" "xorriso")))))
     (arguments
      (substitute-keyword-arguments arguments
@@ -554,10 +554,10 @@ menu to select one of the installed operating systems.")
     (native-inputs
      (cond
        ((target-x86-64?)
-        (modify-inputs (package-native-inputs grub-efi)
+        (modify-inputs native-inputs
           (replace "ovmf-x86-64" ovmf-i686)))
         ((target-aarch64?)
-         (modify-inputs (package-native-inputs grub-efi)
+         (modify-inputs native-inputs
            (prepend
             (cross-gcc "arm-linux-gnueabihf")
             (cross-binutils "arm-linux-gnueabihf"))
@@ -604,7 +604,7 @@ menu to select one of the installed operating systems.")
     (name "grub-hybrid")
     (synopsis "GRand Unified Boot loader (hybrid version)")
     (inputs
-     (modify-inputs (package-inputs grub-efi)
+     (modify-inputs inputs
        (prepend grub)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -930,7 +930,7 @@ also initializes the boards (RAM etc).")
                                   (string-append "infodir=" info-dir)
                                   make-flags))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs u-boot)
+     (modify-inputs native-inputs
        (append fontconfig
                python-sphinx
                python-sphinx-prompt
@@ -948,12 +948,12 @@ Info manual.")))
     (name "u-boot-tools")
     (native-inputs
      (if (string-match "^x86_64-linux" (%current-system))
-         (modify-inputs (package-native-inputs u-boot)
+         (modify-inputs native-inputs
                           (prepend python-filelock
                                    python-pycryptodomex
                                    python-pytest
                                    python-pytest-xdist))
-           (modify-inputs (package-native-inputs u-boot)
+           (modify-inputs native-inputs
                           (prepend python-filelock
                                    python-pycryptodomex))))
     (inputs (list gnutls ncurses/tinfo))
@@ -1283,7 +1283,7 @@ CONFIG_TOOLS_KWBIMAGE=n"))))
               (add-after 'unpack 'set-environment
                 (lambda* (#:key inputs #:allow-other-keys)
                   (setenv "BL31" (search-input-file inputs "/bl31.elf"))))))))
-      (inputs (modify-inputs (package-inputs base)
+      (inputs (modify-inputs inputs
                 (append (match soc
                           ('rk3588 arm-trusted-firmware-rk3588)
                           ('rk3399 arm-trusted-firmware-rk3399)
@@ -1326,10 +1326,10 @@ removed so that it fits within common partitioning schemes.")))
                                  (or native-inputs inputs) "libexec/scp.bin"))
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (append (force scp-firmware))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (append arm-trusted-firmware-sun50i-a64))))))
 
 (define-public u-boot-orangepi-zero2w
@@ -1346,7 +1346,7 @@ removed so that it fits within common partitioning schemes.")))
                   (setenv "SCP" "/dev/null")
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          ;; The Zero 2W uses the slightly revised Allwinner H618.
          (append arm-trusted-firmware-sun50i-h616))))))
 
@@ -1455,7 +1455,7 @@ Documentation} for more information (for example by running @samp{info
                 (symlink (search-input-file outputs "libexec/u-boot")
                          (string-append #$output "/bin/u-boot"))))))))
     ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL.
-    (inputs (modify-inputs (package-inputs base)
+    (inputs (modify-inputs inputs
               (append efitools sdl2)))))
 
 (define-public u-boot-sifive-unleashed
@@ -1471,7 +1471,7 @@ Documentation} for more information (for example by running @samp{info
                   (setenv "OPENSBI" (search-input-file inputs
                                                        "fw_dynamic.bin"))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (append opensbi-generic))))))
 
 (define-public u-boot-sifive-unmatched
@@ -1487,7 +1487,7 @@ Documentation} for more information (for example by running @samp{info
                   (setenv "OPENSBI" (search-input-file inputs
                                                        "fw_dynamic.bin"))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (append opensbi-generic))))))
 
 (define-public u-boot-starfive-visionfive2
@@ -1511,7 +1511,7 @@ Documentation} for more information (for example by running @samp{info
                                 (string-append #$output
                                                "/libexec/spl"))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (append opensbi-for-visionfive2))))))
 
 (define-public u-boot-rock64-rk3328
@@ -1762,7 +1762,7 @@ grub-efi-netboot-removable-bootloader.")
                   (symlink (string-append #$output "/bin/fw_printenv")
                            (string-append #$output "/bin/fw_setenv"))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs u-boot)
+       (modify-inputs native-inputs
          (delete "dtc"))))))            ;otherwise the build fails
 
 ;;; Note: the default cross-build of this package is currently broken on
@@ -2031,10 +2031,10 @@ the features of iPXE without the hassle of reflashing.")
     (native-inputs
      ;; QEMU uses a 64-bit UEFI firmware.
      (if (target-x86-64?)
-         (modify-inputs (package-native-inputs ipxe)
+         (modify-inputs native-inputs
            (prepend edk2-tools))
          (if (target-64bit?)
-           (modify-inputs (package-native-inputs ipxe)
+           (modify-inputs native-inputs
              (prepend edk2-tools
                       (cross-gcc "x86_64-linux-gnu")
                       (cross-binutils "x86_64-linux-gnu")))
@@ -2047,7 +2047,7 @@ the features of iPXE without the hassle of reflashing.")
                        (substitute-keyword-arguments arguments
                         ((#:configure-flags flags ''())
                          #~(cons* "--enable-64-bit-bfd" #$flags)))))))
-             (modify-inputs (package-native-inputs ipxe)
+             (modify-inputs native-inputs
                (prepend edk2-tools
                         (make-ld-wrapper "ld-wrapper-64-bit-bfd"
                                          #:binutils binutils)
diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm
index 991cb5bd053..8d9b45c4a10 100644
--- a/gnu/packages/bqn.scm
+++ b/gnu/packages/bqn.scm
@@ -295,7 +295,7 @@ by APL.")
                   (install-file "libcbqn.so" lib)
                   (install-file "include/bqnffi.h" include))))))))
     (native-inputs (list cbqn-bootstrap libffi))
-    (inputs (modify-inputs (package-inputs cbqn-bootstrap)
+    (inputs (modify-inputs inputs
               (prepend bqn-sources)))
     (license (append (package-license cbqn-bootstrap)
                      (list license:isc   ;Singeli module
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 023a1124195..dcd96b2e051 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -1015,7 +1015,7 @@ electromagnetic properties for molecules and crystals.")
           ;; Tests require python-pyscf.
           ((#:tests? _ #f) #f)))
        (native-inputs
-        (modify-inputs (package-native-inputs base)
+        (modify-inputs native-inputs
           (prepend (package-source base))))
        (supported-systems '("x86_64-linux"))
        (home-page "https://github.com/sunqm/qcint")
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 259b532f17b..d4489135406 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -534,7 +534,7 @@ version of Chez Scheme.")
                                        "zuo"))))))
     (build-system gnu-build-system)
     (inputs
-     (modify-inputs (package-inputs chez-scheme-for-racket)
+     (modify-inputs inputs
        (replace "chez-scheme-for-racket-bootstrap-bootfiles"
          chez-scheme-bootstrap-bootfiles)
        ;; for X11 clipboard support in expeditor:
@@ -832,7 +832,7 @@ User's Guix}, among other documents.")
 
 (define-public stex
   (package/inherit stex-bootstrap
-    (inputs (modify-inputs (package-inputs stex-bootstrap)
+    (inputs (modify-inputs inputs
               (prepend chez-scheme)))
     (outputs '("out" "doc"))
     (properties '())))
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index c4f7c1b79cc..ee8cdbe99de 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -419,14 +419,14 @@ and workspaces that can be used in the compiler environment of your choice.")
                                     (string-append #$output:doc html))
                   (delete-file-recursively (string-append #$output html)))))))))
     (inputs
-     (modify-inputs (package-inputs cmake-minimal)
+     (modify-inputs inputs
        (prepend ncurses)                ;required for ccmake
        ;; Avoid circular dependency with (gnu packages debug).
        (prepend (module-ref (resolve-interface '(gnu packages debug))
                             'cppdap))))
     ;; Extra inputs required to build the documentation.
     (native-inputs
-     (modify-inputs (package-native-inputs cmake-minimal)
+     (modify-inputs native-inputs
        (append python-sphinx
                texinfo)))))
 
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3b9e9d4ea20..a38f933122f 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3428,7 +3428,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (package
       (inherit parent)
       (inputs
-       (modify-inputs (package-inputs parent)
+       (modify-inputs inputs
          (delete "libxcrypt")))
       (arguments
        (substitute-keyword-arguments arguments
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index cbccbf5fc5a..cba9f2a19b8 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2312,7 +2312,7 @@ Google's C++ code base.")
                                       "absl_symbolize_test|absl_log_format_test")))))
                      #~())))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "googletest" googletest))))))
 
 (define-public abseil-cpp-20250127
@@ -3381,7 +3381,7 @@ syntax with variables, conditions, functions and more.")
     (build-system pyproject-build-system)
     (arguments
      (list #:test-flags #~(list "--ignore=case_studies/")))
-    (native-inputs (modify-inputs (package-native-inputs jsonnet)
+    (native-inputs (modify-inputs native-inputs
                      (append python-pyyaml python-pytest python-setuptools)))
     (synopsis "Python bindings for Jsonnet, the data templating language")
     (description "This package provides a Python library named @code{_jsonnet}
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index a550e0c47b1..20b89348c2b 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -457,7 +457,7 @@ target that libc."
                          "x86_64")))))))))))
     (supported-systems %supported-systems)
     (native-inputs
-     (modify-inputs (package-native-inputs gnumach-headers)
+     (modify-inputs native-inputs
        (prepend xgcc xbinutils)))))
 
 (define* (cross-mig target
@@ -490,10 +490,10 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                             '#$%gcc-cross-include-paths))))))))
     (propagated-inputs
      (list xgnumach-headers))
-    (inputs (modify-inputs (package-inputs mig)
+    (inputs (modify-inputs inputs
               (delete "gnumach-headers")))
     (native-inputs
-     (modify-inputs (package-native-inputs mig)
+     (modify-inputs native-inputs
        (prepend xgcc xbinutils)))))
 
 (define* (cross-kernel-headers* target
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 65bb536cefe..543df26de81 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -189,7 +189,7 @@ tunneling, and so on.")
        ((#:configure-flags flags)
         #~(cons "--with-libssh2" #$flags))))
     (inputs
-     (modify-inputs (package-inputs curl)
+     (modify-inputs inputs
        (prepend libssh2)))
     (properties `((hidden? . #t)))))
 
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f84b0ac11c4..9bfb10f15da 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -539,7 +539,7 @@ table-level bloom filters, and updates to the MANIFEST format.")
        ((#:tests? _ #t) #f) ; TODO: Find out why some tests fails to build
        ((#:import-path _) "github.com/cockroachdb/pebble/v2")))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-github-com-cockroachdb-pebble)
+     (modify-inputs propagated-inputs
        (append go-github-com-cockroachdb-crlib
                go-github-com-cockroachdb-swiss
                go-github-com-minio-minlz
@@ -1624,9 +1624,9 @@ pictures, sounds, or video.")
                 "0snbxmlygf7m4cxjpscmz3yjn4lnqsw313y9xgpv7vk9k9gm20s4"))
               (patches (search-patches
                         "postgresql-disable-resolve_symlinks.patch"))))
-    (native-inputs (modify-inputs (package-native-inputs postgresql-16)
+    (native-inputs (modify-inputs native-inputs
                      (delete "pkg-config")))
-    (inputs (modify-inputs (package-inputs postgresql-16)
+    (inputs (modify-inputs inputs
               (delete "icu4c")))))
 
 (define-public postgresql-14
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 6c8b192f6d8..7f0a0fa4af7 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -375,7 +375,7 @@ tool.")
                             (delete-file "tests/qemu-iotests/127")
                             (delete-file "tests/qemu-iotests/267"))))
                       '())))))
-       (inputs (modify-inputs (package-inputs base)
+       (inputs (modify-inputs inputs
                  (delete "dtc")))
        (home-page "https://github.com/AFLplusplus/qemuafl")
        (synopsis "QEMU for AFL++")))))
@@ -717,7 +717,7 @@ the position of the variable and allows you to modify its value.")
                 "11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n"))
               (patches (search-patches "remake-impure-dirs.patch"))))
     (inputs
-     (modify-inputs (package-inputs gnu-make)
+     (modify-inputs inputs
        (prepend readline)))
     (home-page "https://bashdb.sourceforge.net/remake/")
     (description "Remake is an enhanced version of GNU Make that adds improved
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index f43fe114660..68c635a5f91 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -161,9 +161,9 @@ to create smooth, animated user interfaces.")
   (package
     (inherit sddm)
     (name "sddm-qt5")
-    (native-inputs (modify-inputs (package-native-inputs sddm)
+    (native-inputs (modify-inputs native-inputs
                      (replace "qttools" qttools-5)))
-    (inputs (modify-inputs (package-inputs sddm)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase-5)
               (replace "qtsvg" qtsvg-5)
               (replace "qtdeclarative" qtdeclarative-5)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 44f054d1a54..5e79352b62d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1681,7 +1681,7 @@ a single block.")
                  #~(modify-phases %standard-phases
                      (delete 'sanity-check))))
                (propagated-inputs
-                (modify-inputs (package-propagated-inputs pkg)
+                (modify-inputs propagated-inputs
                   (delete "python-django-crispy-forms")))))
            (list python-crispy-bootstrap3 python-crispy-bootstrap4))
       (list python-pytest python-pytest-django python-setuptools)))
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index 608e118c79d..4456bdbe2f3 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -582,7 +582,7 @@ compiler for the D programming language.")
                           (format #f "s,~a,~a,g" in-dmd-bootstrap out)
                           out-bin-dmd))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs dmd-bootstrap)
+     (modify-inputs native-inputs
        (delete "gdmd")
        (append dmd-bootstrap)))
     (properties
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 6cac689282c..a373f8e373c 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -279,7 +279,7 @@ downloading from @var{source}, where @var{version} is a string and
                                "catalog.xml"))
                      (list "rewriteSystem" "rewriteURI")))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs template)
+       (modify-inputs native-inputs
          (prepend libxml2))))))
 
 (define-public docbook-mathml-1.0
@@ -800,7 +800,7 @@ DB2LaTeX.")
 (define-public dblatex/stable
   (hidden-package
    (package/inherit dblatex
-     (inputs (modify-inputs (package-inputs dblatex)
+     (inputs (modify-inputs inputs
                (replace "imagemagick" imagemagick/stable)
                (replace "inkscape" inkscape/pinned))))))
 
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 17d62c891d3..ff38e14a51f 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -248,11 +248,11 @@ management tool.")
     ;; Integration tests need a running Docker daemon.
     (arguments (list #:tests? #f))
     (native-inputs (list python-setuptools))
-    (inputs (modify-inputs (package-inputs python-docker)
+    (inputs (modify-inputs inputs
               (prepend python-six)
               (delete "python-urllib3")))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-docker)
+     (modify-inputs propagated-inputs
        (prepend python-docker-pycreds python-urllib3-1.26)))))
 
 ;; Needed for old v1 of docker-compose; remove once Docker is updated to a
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 209e481ff8c..7b21cfc8d86 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -1767,7 +1767,7 @@ which allows one to install the M8 firmware on any Teensy.")
         #~(cons* "-DUSE_LIBSERIAL=ON"
                  (delete "-DUSE_LIBUSB=ON" #$flags)))))
     (inputs
-     (modify-inputs (package-inputs m8c)
+     (modify-inputs inputs
        (replace "libusb" libserialport)))
     (synopsis "Cross-platform M8 tracker headless client - serial backend")))
 
@@ -2078,7 +2078,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
         #~(modify-phases #$phases
             (delete 'delete-scripts)))))
     (native-inputs
-     (modify-inputs (package-native-inputs libngspice)
+     (modify-inputs native-inputs
        (append perl)))
     (inputs (list libngspice readline libxaw libx11))))
 
@@ -2788,7 +2788,7 @@ Chip toolkit.")
     (arguments (list #:test-flags #~(list ".")))
     (native-inputs (list cmake-minimal python-pytest python-minimal-wrapper
                          python-scikit-build-core))
-    (inputs (modify-inputs (package-inputs gdstk)
+    (inputs (modify-inputs inputs
               (prepend python-numpy)))
     (synopsis "Python module for creation and manipulation of GDSII files")
     (description
@@ -4261,7 +4261,7 @@ unique design feature of Trilinos is its focus on packages.")
                          (delete
                           "-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
     (inputs
-     (modify-inputs (package-inputs trilinos-serial-xyce)
+     (modify-inputs inputs
        (prepend openmpi)))))
 
 (define-public verilator
@@ -4409,7 +4409,7 @@ parallel computing platforms.  It also supports serial execution.")
                          (delete
                           "-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
     (inputs
-     (modify-inputs (package-inputs xyce-serial)
+     (modify-inputs inputs
        (prepend openmpi)
        (replace "trilinos-serial-xyce" trilinos-parallel-xyce)))))
 
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 289a87c268c..20eb68e411f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37427,7 +37427,7 @@ utilities.")
       #:tests? #f                       ;no test suite
       #:lisp-directory "src/extra"))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs emacs-treemacs)
+     (modify-inputs propagated-inputs
        (append emacs-all-the-icons
                emacs-evil
                emacs-magit
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7a2bf97d3bd..220536715b1 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -560,7 +560,7 @@ editor (console only)")
                           (search-auxiliary-file "emacs/comp-integrity.el"))
                        "-f" "ert-run-tests-batch-and-exit")))))))))
     (inputs
-     (modify-inputs (package-inputs emacs-minimal)
+     (modify-inputs inputs
        (prepend gnutls
                 ;; For native compilation
                 libgccjit
@@ -614,7 +614,7 @@ editor (console only)")
                        (pdmp (find-files libexec "\\.pdmp$"))
                        (pdmp-real (find-files libexec "\\.pdmp-real$")))
                   (for-each rename-file pdmp-real pdmp))))))))
-    (inputs (modify-inputs (package-inputs emacs-no-x)
+    (inputs (modify-inputs inputs
               (prepend
                cairo
                dbus
@@ -654,7 +654,7 @@ editor (with xwidgets support)")
        ((#:configure-flags flags #~'())
         #~(cons "--with-xwidgets" #$flags))))
     (inputs
-     (modify-inputs (package-inputs emacs)
+     (modify-inputs inputs
        (prepend webkitgtk-with-libsoup2 libxcomposite)))))
 
 (define-public emacs-pgtk-xwidgets
@@ -667,7 +667,7 @@ editor (with xwidgets support)")
        ((#:configure-flags flags #~'())
         #~(cons "--with-xwidgets" #$flags))))
     (inputs
-     (modify-inputs (package-inputs emacs-pgtk)
+     (modify-inputs inputs
        (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
 
 (define-public emacs-lucid
@@ -708,7 +708,7 @@ toolkit)")
     (synopsis "The extensible, customizable, self-documenting text
 editor (without X toolkit)" )
     ;; Using emacs' inputs as base, since it has all the graphical stuff
-    (inputs (modify-inputs (package-inputs emacs)
+    (inputs (modify-inputs inputs
               (delete "gtk+")
               (prepend inotify-tools)))
     (arguments
@@ -796,10 +796,10 @@ editor (with wide ints)" )
                  (base32
                   "0ry0dn9xrndpz54hs92dnnsw4xa4qn4lz898ldlh2rs47ah1f4wl"))))
       (native-inputs
-       (modify-inputs (package-native-inputs emacs)
+       (modify-inputs native-inputs
          (prepend autoconf automake guile-for-guile-emacs)))
       (inputs
-       (modify-inputs (package-inputs emacs)
+       (modify-inputs inputs
          (prepend imagemagick)))
       (home-page "https://guile-emacs.org")
       (synopsis "Emacs text editor powered by Guile('s elisp implementation)")
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 0d06e7c41e4..c27e31987ff 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -374,7 +374,7 @@ embedded-7-branch/")
                     (search-patches
                      "gcc-7-cross-environment-variables.patch")))))
                (native-inputs
-                (modify-inputs (package-native-inputs xgcc)
+                (modify-inputs native-inputs
                   (delete "isl")
                   (prepend flex isl-0.18)))
                (arguments
@@ -513,7 +513,7 @@ embedded-7-branch/")
                     (search-patches
                      "gcc-10-cross-environment-variables.patch")))))
                (native-inputs
-                (modify-inputs (package-native-inputs xgcc)
+                (modify-inputs native-inputs
                   (delete "isl")
                   (prepend flex isl-0.18)))
                (arguments
@@ -1110,7 +1110,7 @@ with a layered architecture of JTAG interface and TAP support.")
                     (origin-patches (package-source gcc-6))
                     (search-patches "gcc-cross-environment-variables.patch")))))
         (native-inputs
-         (modify-inputs (package-native-inputs xgcc)
+         (modify-inputs native-inputs
            (prepend flex)))
         ;; All headers and cross libraries of the propeller toolchain are
         ;; installed under the "propeller-elf" prefix.
@@ -1156,7 +1156,7 @@ with a layered architecture of JTAG interface and TAP support.")
                 (add-after 'unpack 'chdir
                   (lambda _ (chdir "gcc")))))))
         (native-inputs
-         (modify-inputs (package-native-inputs xgcc)
+         (modify-inputs native-inputs
            (prepend gcc-5)))
         (home-page "https://github.com/parallaxinc/propgcc")
         (supported-systems (delete "aarch64-linux" %supported-systems))))))
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 4a6a9d16325..62c2c58e541 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1160,7 +1160,7 @@ The following systems are supported:
            #~(cons "-DCMAKE_C_FLAGS=-Wno-error=incompatible-pointer-types"
                    #$flags))))
       (inputs
-        (modify-inputs (package-inputs mgba)
+        (modify-inputs inputs
                        (replace "ffmpeg" ffmpeg-6)))))))
 
 (define-public sameboy
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 81bcb034a50..af0fe331e9d 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2836,7 +2836,7 @@ models in the STL and OFF file formats.")
                   (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake")
                    (string-append (assoc-ref inputs "sanitizers-cmake")
                                   "/share/sanitizers-cmake/cmake")))))))))
-    (inputs (modify-inputs (package-inputs openscad)
+    (inputs (modify-inputs inputs
               (append curl libfive)))
     (synopsis "Script-based 3D modeling app with Python support")
     (description
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 2a8157cb149..c271619e441 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -310,7 +310,7 @@ IM module for GTK+3 applications.
             (lambda _
               (chdir ".."))))))
     (inputs
-     (modify-inputs (package-inputs fcitx5-gtk)
+     (modify-inputs inputs
        (delete "gtk+")
        (prepend fcitx5-gtk gtk)))
     (native-search-paths
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 5a9e86aa150..05f8f4b0d31 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -931,7 +931,7 @@ performance and other characteristics.")
                 (apply invoke "make" "install"
                        (string-append "PREFIX=" #$output)
                        #$(bcachefs-tools-make-install-flags))))))))
-    (inputs (modify-inputs (package-inputs bcachefs-tools-minimal)
+    (inputs (modify-inputs inputs
               (prepend `(,eudev "static")
                        `(,keyutils "static")
                        `(,libscrypt "static")
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 14d85248b2c..19d91b46868 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -240,7 +240,7 @@ line client and a client based on Qt.")
        ((#:qtbase original-flags #f)
         qtbase-5)))
     (native-inputs
-     (modify-inputs (package-native-inputs bitcoin-core)
+     (modify-inputs native-inputs
        (delete qttools)
        (append imagemagick
                librsvg
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index da6f84d8939..c088a9de7bc 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -787,7 +787,7 @@ source."
     (native-inputs
      (if (member (%current-system) '("i686-linux" "x86_64-linux"))
          (package-native-inputs seabios)
-         (modify-inputs (package-native-inputs seabios)
+         (modify-inputs native-inputs
            (prepend (cross-gcc "i686-linux-gnu")
                     (cross-binutils "i686-linux-gnu")))))
     (supported-systems %supported-systems)
@@ -1384,7 +1384,7 @@ interface standards, such as:
   (let ((base (make-arm-trusted-firmware "rk3399")))
     (package
       (inherit base)
-      (native-inputs (modify-inputs (package-native-inputs base)
+      (native-inputs (modify-inputs native-inputs
                        (prepend (cross-gcc "arm-none-eabi")
                                 (cross-binutils "arm-none-eabi")))))))
 
@@ -1964,7 +1964,7 @@ or passthrough board.")
     (package
       (inherit base)
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "xgcc" (make-gcc-arm-none-eabi-12.3.rel1)))))))
 
 (define* (make-qmk-firmware-keychron keyboard keymap
@@ -2050,7 +2050,7 @@ or passthrough board.")
                          "0r501hkk0idwfm6qs09g1wb808ga452gz39dw32x13rmg3a901s6")))
                    "lib/printf")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (prepend
           (package
             (inherit (make-qmk-newlib-nano-arm-none-eabi))
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 90c8119ab33..da91608bbe8 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -157,7 +157,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
     (inherit freetype)
     (name "freetype-with-brotli")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs freetype)
+     (modify-inputs propagated-inputs
        (prepend brotli)))))
 
 (define-public opentype-sanitizer
@@ -697,7 +697,7 @@ implementing the pen protocol for manipulating glyphs.")
                    ((".*\\(\\(0, 0), \\(50, 20), \\(100, 40)).*") "")
                    ((".*107\\.70329614269009.*") ""))))))))
      (native-inputs
-      (modify-inputs (package-native-inputs python-fontpens-bootstrap)
+      (modify-inputs native-inputs
         (append python-fontparts-bootstrap
                 python-fontpens-bootstrap
                 python-pytest
@@ -738,7 +738,7 @@ process.  FontParts is the successor of RoboFab.")
   (package/inherit python-fontparts-bootstrap
     (name "python-fontparts")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-fontparts-bootstrap)
+     (modify-inputs propagated-inputs
        (replace "python-defcon-bootstrap" python-defcon)))
     (properties
      (alist-delete 'hidden?
@@ -1488,7 +1488,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
                      (delete-file-recursively source)))
                  '("man3" "man5"))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs fontconfig)
+     (modify-inputs native-inputs
        (append docbook-utils)))
     (properties (alist-delete 'hidden? (package-properties fontconfig)))))
 
@@ -1988,7 +1988,7 @@ UFO3 as described by the UFO font format.")
   (package/inherit python-defcon-bootstrap
     (name "python-defcon")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-defcon-bootstrap)
+     (modify-inputs propagated-inputs
        (replace "python-fontpens-bootstrap" python-fontpens)))
     (properties
      (alist-delete 'hidden?
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 512b034a269..2b7ec9e1c56 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -222,10 +222,10 @@ application-centers for distributions.")
   (package/inherit appstream
     (name "appstream-qt")
     (native-inputs
-     (modify-inputs (package-native-inputs appstream)
+     (modify-inputs native-inputs
        (prepend qttools-5)))
     (inputs
-     (modify-inputs (package-inputs appstream)
+     (modify-inputs inputs
        (prepend qtbase-5)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -236,10 +236,10 @@ application-centers for distributions.")
   (package/inherit appstream
     (name "appstream-qt6")
     (native-inputs
-     (modify-inputs (package-native-inputs appstream)
+     (modify-inputs native-inputs
        (prepend qttools)))
     (inputs
-     (modify-inputs (package-inputs appstream)
+     (modify-inputs inputs
        (prepend qtbase)))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a621467cf72..35581d9b3b0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2126,7 +2126,7 @@ does not include game data.")
     (arguments
      ;; No tests.  See https://github.com/Keriew/augustus/issues/82.
      `(#:tests? #f))
-    (inputs (modify-inputs (package-inputs julius)
+    (inputs (modify-inputs inputs
               (prepend expat)))
     (home-page "https://github.com/Keriew/augustus")
     (synopsis "Re-implementation of Caesar III game engine with gameplay changes")
@@ -3433,7 +3433,7 @@ To run, you must put your official game data, @code{Levels} and @code{Help} in
        (modules '((guix build utils)))
        (patches (search-patches
                  "serious-sam-classic-engine-patch-paths.patch"))))
-    (inputs (modify-inputs (package-inputs serious-sam-classic)
+    (inputs (modify-inputs inputs
               (prepend vulkan-loader vulkan-headers)))
     (synopsis
      "SeriousSam engine and Serious Sam: TFE and TSE with Vulkan renderer")
@@ -3498,7 +3498,7 @@ corruption… You hope luck will be on your side!
                 (rename-file (string-append #$output "/bin/shamogu")
                              (string-append #$output "/bin/shamogu-sdl"))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs shamogu)
+     (modify-inputs native-inputs
        (prepend pkg-config)))))
 
 (define-public solarus
@@ -3576,9 +3576,9 @@ in mind.")
           (add-before 'configure 'chdir
             (lambda _
               (chdir "editor"))))))
-    (native-inputs (modify-inputs (package-inputs solarus)
+    (native-inputs (modify-inputs native-inputs
                      (prepend qttools qlementine)))
-    (inputs (modify-inputs (package-inputs solarus)
+    (inputs (modify-inputs inputs
               (prepend solarus)
               (append qtbase qtsvg qtwayland)))
     (synopsis "Create and modify quests for the Solarus engine")
@@ -3608,7 +3608,7 @@ quests for the Solarus engine.")))
     (native-inputs (modify-inputs (package-inputs solarus)
                      (prepend qlementine qlementine-icons qtappinstancemanager
                               qttools)))
-    (inputs (modify-inputs (package-inputs solarus)
+    (inputs (modify-inputs inputs
               (prepend solarus)
               (append qtbase qtsvg qtwayland)))
     (synopsis "Game launcher and browser for Solarus")
@@ -5811,10 +5811,10 @@ Transport Tycoon Deluxe.")
                     (assoc-ref outputs "out")))
                  (search-path-as-list (list base) (map cdr inputs)))))))))
     (inputs
-     (modify-inputs (package-inputs openttd-engine)
+     (modify-inputs inputs
        (prepend fluidsynth freepats-gm)))
     (native-inputs
-     (modify-inputs (package-native-inputs openttd-engine)
+     (modify-inputs native-inputs
        (prepend openttd-opengfx openttd-openmsx openttd-opensfx)))))
 
 (define-public openttd-jgrpp
@@ -5831,7 +5831,7 @@ Transport Tycoon Deluxe.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
-    (inputs (modify-inputs (package-inputs openttd)
+    (inputs (modify-inputs inputs
               (append zstd harfbuzz)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -8247,10 +8247,10 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
            "GAME=crawl-tiles"
            #$flags))))
     (inputs
-     (modify-inputs (package-inputs crawl)
+     (modify-inputs inputs
        (prepend font-dejavu freetype glu libpng sdl2 sdl2-image sdl2-mixer)))
     (native-inputs
-     (modify-inputs (package-native-inputs crawl)
+     (modify-inputs native-inputs
        (prepend pngcrush which)))
     (synopsis "Graphical roguelike dungeon crawler game")))
 
@@ -8940,7 +8940,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
                         #t))))
        ,@(strip-keyword-arguments '(#:make-flags #:phases)
                                   (package-arguments quakespasm))))
-    (inputs (modify-inputs (package-inputs quakespasm)
+    (inputs (modify-inputs inputs
               (prepend
                glslang
                spirv-tools
@@ -11481,7 +11481,7 @@ player adaptability for character progression.")
                  (string-append #$output "/bin/harmonist")
                  (string-append #$output "/bin/harmonist-sdl"))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs harmonist)
+     (modify-inputs native-inputs
        (prepend pkg-config)))))
 
 (define-public li-ri
diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index a4e9ad61722..72794b025bc 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -110,7 +110,7 @@ including network access, sorting, and large libraries.")
   (package/inherit gawk
     (name "gawk-mpfr")
     (inputs
-     (modify-inputs (package-inputs gawk)
+     (modify-inputs inputs
        (prepend mpfr)))))
 
 ;; Suffixed with -next because, similarly to Emacs, development versions are
@@ -258,7 +258,7 @@ programs can be captured and transferred to systems that have Awk but not
                  (("awk=gawk") (string-append "awk=" (which "egawk")))
                  (("awk '") (string-append (which "egawk") " '")))))))))
     (inputs
-     (modify-inputs (package-inputs cppawk)
+     (modify-inputs inputs
        (delete "gawk-mpfr")
        (prepend egawk-next)))
     (synopsis "Wrapper script that adds C preprocessing to Enhanced GNU Awk")))
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 3b98988c1fd..100c3962c19 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -516,7 +516,7 @@ Go.  It also includes runtime support libraries for these languages.")
     (supported-systems (fold delete %supported-systems
                              '("riscv64-linux" "x86_64-gnu")))
     (inputs
-     (modify-inputs (package-inputs gcc-base)
+     (modify-inputs inputs
        (prepend isl-0.11 cloog)))))
 
 (define-public gcc-4.9
@@ -580,7 +580,7 @@ Go.  It also includes runtime support libraries for these languages.")
     (native-inputs (list perl ;for manpages
                          texinfo))
     (inputs
-     (modify-inputs (package-inputs gcc-base)
+     (modify-inputs inputs
        (prepend isl-0.11 cloog)))
     (supported-systems (fold delete %supported-systems
                              '("riscv64-linux" "x86_64-gnu")))))
@@ -655,7 +655,7 @@ Go.  It also includes runtime support libraries for these languages.")
     (native-inputs (list perl ;for manpages
                          texinfo))
     (inputs
-     (modify-inputs (package-inputs gcc-base)
+     (modify-inputs inputs
        (prepend ;; GCC5 needs <isl/band.h> which is removed in later versions.
                 isl-0.18)))
     (supported-systems (fold delete %supported-systems
@@ -1411,7 +1411,7 @@ as the 'native-search-paths' field."
   (package
     (inherit gdc)
     (arguments
-     (substitute-keyword-arguments (package-arguments gdc)
+     (substitute-keyword-arguments arguments
        ((#:modules modules)
         `(,@modules
           (ice-9 ftw)))
@@ -1484,14 +1484,14 @@ as the 'native-search-paths' field."
                        "^/lib/debug/.*/lib/libgdruntime"
                        "^/lib/debug/.*/lib/libgphobos"))))))))
     (inputs
-     (modify-inputs (package-inputs gdc)
+     (modify-inputs inputs
        ;; This makes flags like -static-libstdc++ work. Required for using this
        ;; compiler as a bootstrap compiler for GDC 12+.
        ;; Additionally, this allows us to support linking with GCC libraries,
        ;; without building or storing them ourselves.
        (append (list gcc "lib"))))
     (native-inputs
-     (let ((orig (package-native-inputs gdc)))
+     (let ((orig native-inputs))
        (if bootstrap-gdc
            (modify-inputs orig
              ;; Since GCC 12, GDC is self-hosted, requiring a version of itself
@@ -1601,7 +1601,7 @@ also includes the druntime and phobos libraries."
      (package
        (inherit base)
        (native-inputs
-        (modify-inputs (package-native-inputs base)
+        (modify-inputs native-inputs
           (prepend flex)))))))
 
 (define-public (make-libgccjit gcc)
@@ -1637,9 +1637,9 @@ also includes the druntime and phobos libraries."
                           (find-files
                            (string-append (assoc-ref outputs "out") "/bin")
                            ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
-    (inputs (modify-inputs (package-inputs gcc)
+    (inputs (modify-inputs inputs
               (delete "libstdc++")))
-    (native-inputs (modify-inputs (package-native-inputs gcc)
+    (native-inputs (modify-inputs native-inputs
                      (prepend gcc)))
     (synopsis "GCC library generating machine code on-the-fly at runtime")
     (description
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 709807888c4..9aa6ffd3ebc 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -374,10 +374,10 @@ AMD's commercially available GPU architectures.")
         (base32
          "1msxz5xnm6fl2p9hzjnkaayd8x3dc0dp34ff60asr8mgxwxlcd9c"))))
     (inputs
-     (modify-inputs (package-inputs gdb)
+     (modify-inputs inputs
        (prepend rocdbgapi)))
     (native-inputs
-     (modify-inputs (package-native-inputs gdb)
+     (modify-inputs native-inputs
        (prepend bison flex perl)))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 43fdcf8a343..a38eb76132e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -409,7 +409,7 @@ hierarchical hexagonal geospatial indexing system")
        (sha256
         (base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
     (inputs
-     (modify-inputs (package-inputs python-h3)
+     (modify-inputs inputs
        (replace "h3" h3-3)))))
 
 (define-public geos
@@ -927,11 +927,11 @@ hydrology and waste deposition.")
   (package
     (inherit ogs-serial)
     (name "ogs-petsc")
-    (inputs (modify-inputs (package-inputs ogs-serial)
+    (inputs (modify-inputs inputs
               (prepend openmpi petsc-openmpi)
               (replace "hdf5" hdf5-parallel-openmpi)
               (replace "netcdf-cxx4" netcdf-cxx4-parallel-openmpi)))
-    (native-inputs (modify-inputs (package-native-inputs ogs-serial)
+    (native-inputs (modify-inputs native-inputs
                      (prepend pkg-config)))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 039f736b0d4..ee4f4c779bf 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -349,7 +349,7 @@ areas where they were not expected like documentation.")
     (native-inputs
      ;; Remove test dependencies, primarily to reduce the size of the
      ;; dependency graph of the ‘guix’ package.
-     (modify-inputs (package-native-inputs po4a)
+     (modify-inputs native-inputs
        (delete "docbook-xml" "perl-test-pod" "texlive-local-tree")))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 0e618768cb7..8ebfee65c61 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -311,13 +311,13 @@ output file formats and printers.")
 (define-public ghostscript/x
   (package/inherit ghostscript
     (name (string-append (package-name ghostscript) "-with-x"))
-    (inputs (modify-inputs (package-inputs ghostscript)
+    (inputs (modify-inputs inputs
               (prepend libxext libxt)))))
 
 (define-public ghostscript/cups
   (package/inherit ghostscript
     (name "ghostscript-with-cups")
-    (inputs (modify-inputs (package-inputs ghostscript)
+    (inputs (modify-inputs inputs
               (prepend cups-minimal)))))
 
 (define-public ijs
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 340b880b8a9..0a559b3c7af 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -410,7 +410,7 @@ that is extensible via a plugin system.")
                     (find-files (string-append #$output "/bin")
                                 (lambda (_ stat)
                                   (eq? 'regular (stat:type stat))))))))))
-    (inputs (modify-inputs (package-inputs gimp-2)
+    (inputs (modify-inputs inputs
               (replace "gtk+" gtk+)
               (prepend bash-minimal
                        libjxl
@@ -421,7 +421,7 @@ that is extensible via a plugin system.")
                        gjs
                        libxslt
                        xdg-utils)))
-    (native-inputs (modify-inputs (package-native-inputs gimp-2)
+    (native-inputs (modify-inputs native-inputs
                      (prepend appstream-glib
                               gi-docgen
                               libarchive
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f8f34599cb8..0898d8229ff 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -1088,7 +1088,7 @@ and surfaces, receiving input and events.")
               (sha256
                (base32
                 "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m"))))
-    (native-inputs (modify-inputs (package-native-inputs glfw)
+    (native-inputs (modify-inputs native-inputs
                      (prepend pkg-config)))
     ;; When building out of source, the install phase fails with:
     ;;  file INSTALL cannot find "/tmp/guix-build-glfw-3.4.drv-0/build/docs/html":
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2319e35bfb7..97420b855d0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -447,7 +447,7 @@ functions for strings and common data structures.")
   (let ((base glib-minimal))
     (package/inherit base
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (prepend gobject-introspection-minimal)))
       (arguments
        (substitute-keyword-arguments arguments
@@ -466,7 +466,7 @@ functions for strings and common data structures.")
       (properties (alist-delete 'hidden? (package-properties base)))
       (outputs (cons "doc" (package-outputs base)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (append gi-docgen python-docutils)))
       (arguments
        (substitute-keyword-arguments arguments
@@ -646,10 +646,10 @@ provide bindings to call into the C library.")
   (let ((base gobject-introspection-minimal))
     (package/inherit base
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "glib" glib)))
       (propagated-inputs
-       (modify-inputs (package-propagated-inputs base)
+       (modify-inputs propagated-inputs
          (replace "glib" glib)
          ;; Note: The label stays the same despite the name change.
          (replace "python-setuptools-bootstrap" python-setuptools))))))
@@ -988,7 +988,7 @@ useful for C++.")
        (sha256
         (base32 "0bqm9vqwhas69q6n89wd2xgxvrlkpxra13dzsx8m67hqk0jp8n2k"))))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs glibmm)
+      (modify-inputs propagated-inputs
         (replace "libsigc++" libsigc++-2)))))
 
 (define-public python-pygobject
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7b0d87ca247..217ceff3836 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1282,7 +1282,7 @@ a debugging tool, @command{gssdp-device-sniffer}.")
     (arguments
      (list #:configure-flags
            #~(list "-Dgtk_doc=true")))
-    (propagated-inputs (modify-inputs (package-propagated-inputs gssdp)
+    (propagated-inputs (modify-inputs propagated-inputs
               (replace "libsoup" libsoup-minimal-2)))))
 
 (define-public gupnp
@@ -4496,7 +4496,7 @@ editors, IDEs, etc.")
     (arguments (substitute-keyword-arguments arguments
                  ((#:configure-flags flags #~'())
                   #~(cons "-Dgtk4=false" (delete "-Dgtk3=false" #$flags)))))
-    (propagated-inputs (modify-inputs (package-propagated-inputs vte)
+    (propagated-inputs (modify-inputs propagated-inputs
                          (replace "gtk" gtk+)))
     (properties
      `((upstream-name . "vte")))))
@@ -4517,7 +4517,7 @@ editors, IDEs, etc.")
     (arguments (substitute-keyword-arguments arguments
                  ((#:configure-flags flags)
                   #~(append (list "-Dsixel=true") #$flags))))
-    (inputs (modify-inputs (package-inputs vte)
+    (inputs (modify-inputs inputs
               (append libsixel)
               (append lz4)))))
 
@@ -4698,9 +4698,9 @@ GLib and GObject, and integrates JSON with GLib data types.")
     (native-inputs
      (if (%current-target-system)
          ;; No docs, but rst2man is used for man pages.
-         (modify-inputs (package-native-inputs json-glib-minimal)
+         (modify-inputs native-inputs
            (prepend python-docutils))
-         (modify-inputs (package-native-inputs json-glib-minimal)
+         (modify-inputs native-inputs
            (prepend gi-docgen gobject-introspection
                     python-docutils))))))
 
@@ -4990,7 +4990,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
                 (substitute* "tests/meson.build"
                   (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs libsoup-minimal)
+     (modify-inputs native-inputs
        (replace "vala" vala-0.52)))))
 
 (define-public libsoup
@@ -5026,7 +5026,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
                 (mkdir-p (string-append #$output:doc "/share"))
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
-    (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
+    (native-inputs (modify-inputs native-inputs
                      (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
@@ -5545,7 +5545,7 @@ output devices.")
                    (string-append "'" #$output
                                   "/etc/bash_completion.d'")))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs colord-minimal)
+     (modify-inputs native-inputs
        (append bash-completion
                docbook-xsl
                gtk-doc/stable
@@ -6022,7 +6022,7 @@ throughout GNOME for API documentation).")
 (define-public devhelp-with-libsoup2
   (hidden-package
    (package/inherit devhelp
-     (inputs (modify-inputs (package-inputs devhelp)
+     (inputs (modify-inputs inputs
                (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))))
 
 (define-public cogl
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e4309f19b48..b0f7289cc4b 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -485,10 +485,10 @@ and every application benefits from this.")
              (chdir "lang/qt"))))))
     (propagated-inputs (list gpgme))    ;required by QGpgmeConfig.cmake
     (native-inputs
-     (modify-inputs (package-native-inputs gpgme)
+     (modify-inputs native-inputs
        (prepend pkg-config)))
     (inputs
-     (modify-inputs (package-inputs gpgme)
+     (modify-inputs inputs
        (prepend qtbase-5)))
     (synopsis "Qt API bindings for gpgme")
     (description "QGpgme provides a very high level Qt API around GpgMEpp.
@@ -514,10 +514,10 @@ gpgpme starting with version 1.7.")
              (chdir "lang/qt"))))))
     (propagated-inputs (list gpgme))    ;required by QGpgmeConfig.cmake
     (native-inputs
-     (modify-inputs (package-native-inputs gpgme)
+     (modify-inputs native-inputs
        (prepend pkg-config)))
     (inputs
-     (modify-inputs (package-inputs gpgme)
+     (modify-inputs inputs
        (prepend qtbase)))
     (synopsis "Qt API bindings for gpgme")
     (description "QGpgme provides a very high level Qt API around GpgMEpp.")
@@ -573,10 +573,10 @@ interface (FFI) of Guile.")
     (inherit guile-gcrypt)
     (name "guile2.2-gcrypt")
     (native-inputs
-     (modify-inputs (package-native-inputs guile-gcrypt)
+     (modify-inputs native-inputs
        (replace "guile" guile-2.2)))
     (inputs
-     (modify-inputs (package-inputs guile-gcrypt)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))))
 
 (define-public python-gpg
@@ -908,7 +908,7 @@ enter a passphrase when required by @code{gpg} or other software.")))
     (arguments
      `(#:configure-flags '("--enable-fallback-curses")))
     (inputs
-     (modify-inputs (package-inputs pinentry-tty)
+     (modify-inputs inputs
        (prepend gtk+-2 glib)))
     (description
      "Pinentry provides a console and a GTK+ GUI that allows users to enter a
@@ -919,7 +919,7 @@ passphrase when @code{gpg} is run and needs it.")))
     (inherit pinentry-tty)
     (name "pinentry-gnome3")
     (inputs
-     (modify-inputs (package-inputs pinentry-tty)
+     (modify-inputs inputs
        (prepend gtk+-2 gcr-3 glib)))
     (arguments
      `(#:configure-flags '("--enable-pinentry-gnome3"
@@ -936,7 +936,7 @@ software.")))
     (arguments
      `(#:configure-flags '("--enable-fallback-curses")))
     (inputs
-     (modify-inputs (package-inputs pinentry-tty)
+     (modify-inputs inputs
        (prepend qtbase qtwayland)))
   (description
    "Pinentry provides a console and a Qt GUI that allows users to enter a
@@ -960,7 +960,7 @@ passphrase when @code{gpg} is run and needs it.")))
        ("gettext" ,gettext-minimal)
        ,@(package-native-inputs pinentry-tty)))
     (inputs
-     (modify-inputs (package-inputs pinentry-tty)
+     (modify-inputs inputs
        (prepend efl)))
     (description
    "Pinentry provides a console and a graphical interface for @acronym{EFL,
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 6659a507403..f7a4078b389 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -4465,7 +4465,7 @@ client in Golang.")
          (package-arguments go-github-com-datadog-datadog-go)
        ((#:import-path _) "github.com/DataDog/datadog-go/v5")))
     (native-inputs
-     (modify-inputs (package-native-inputs go-github-com-datadog-datadog-go)
+     (modify-inputs native-inputs
        (append go-github-com-golang-mock)))))
 
 (define-public go-github-com-davecgh-go-xdr
@@ -12595,7 +12595,7 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.")
       #:tests? #f ;Tests require network access.
       #:import-path "github.com/pion/ice/v4"))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-github-com-pion-ice-v3)
+     (modify-inputs propagated-inputs
        (replace "go-github-com-pion-dtls-v2" go-github-com-pion-dtls-v3)
        (replace "go-github-com-pion-stun-v2" go-github-com-pion-stun-v3)
        (replace "go-github-com-pion-turn-v3" go-github-com-pion-turn-v4)))))
@@ -12851,7 +12851,7 @@ Protocol,SCTP} as specified in
      (list
       #:import-path "github.com/pion/srtp/v3"))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-github-com-pion-srtp-v2)
+     (modify-inputs propagated-inputs
        (replace "go-github-com-pion-transport-v2"
          go-github-com-pion-transport-v4)))))
 
@@ -13000,7 +13000,7 @@ throughout the @url{https://github.com/pion, Pion} modules.")
     (native-inputs
      (list go-github-com-stretchr-testify))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-github-com-pion-transport)
+     (modify-inputs propagated-inputs
        (prepend go-github-com-wlynxg-anet)))))
 
 (define-public go-github-com-pion-transport-v3
@@ -13044,7 +13044,7 @@ throughout the @url{https://github.com/pion, Pion} modules.")
      (list
       #:import-path "github.com/pion/transport/v4"))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-github-com-pion-transport-v3)
+     (modify-inputs propagated-inputs
        (prepend go-golang-org-x-time)))))
 
 (define-public go-github-com-pion-turn-v2
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 536fbb0651f..126dbaad711 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -32112,7 +32112,7 @@ various modes for analyzing and transforming YAML data.")))
                                  (string-append bash "/completions"))))))))))
     (native-inputs
      (append
-      (modify-inputs (package-native-inputs go-github-com-opencontainers-runtime-tools)
+      (modify-inputs native-inputs
         (append go-md2man))
       (package-propagated-inputs go-github-com-opencontainers-runtime-tools)))
     (propagated-inputs '())
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index b49f0d75b40..2865be3e8a2 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -157,7 +157,7 @@ and track podcasts.")
   (package/inherit libmygpo-qt
     (name "libmygpo-qt5")
     (inputs
-     (modify-inputs (package-inputs libmygpo-qt)
+     (modify-inputs inputs
        (replace "qtbase" qtbase-5)))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 2b0b358abae..c49504adea6 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -145,7 +145,7 @@ interfaces for other technical domains.")
 (define-public graphviz-minimal
   (package/inherit graphviz
     (name "graphviz-minimal")
-    (inputs (modify-inputs (package-inputs graphviz)
+    (inputs (modify-inputs inputs
               (delete "libxrender" "libx11" "pango" "libxaw")))
     (synopsis "Graph visualization software (without X11 support)")))
 
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b20a1a0e057..f26cac13310 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -735,7 +735,7 @@ model to base your own plug-in on, here it is.")
     (inherit gst-plugins-good)
     (name "gst-plugins-good-qt")
     (inputs
-     (modify-inputs (package-inputs gst-plugins-good)
+     (modify-inputs inputs
        (prepend qtbase
                 qtdeclarative
                 qtshadertools
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9eea8b4919c..6b26ae2fa72 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -248,7 +248,7 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
     (properties (alist-delete 'hidden? (package-properties cairo)))
     (outputs (cons "doc" (package-outputs cairo)))
     (native-inputs
-     (modify-inputs (package-native-inputs cairo)
+     (modify-inputs native-inputs
        (prepend gtk-doc/stable)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -616,10 +616,10 @@ highlighting and other features typical of a source code editor.")
                (base32
                 "0zd84229bddvp8zpnn86q34i16mhf9x3pzry795gilc3na7x3jby"))))
     (native-inputs
-     (modify-inputs (package-native-inputs gtksourceview)
+     (modify-inputs native-inputs
        (replace "gobject-introspection" gobject-introspection)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs gtksourceview)
+     (modify-inputs propagated-inputs
        (replace "gtk" gtk+)
        (replace "glib" glib)))))
 
@@ -871,7 +871,7 @@ is part of the GNOME accessibility project.")
                    (string-append "docs_dir = '" #$output:doc
                                   "/share/doc'\n")))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs at-spi2-core)
+     (modify-inputs native-inputs
        (append gi-docgen python python-sphinx)
        (replace "python-dbusmock" python-dbusmock)))
     (properties (alist-delete 'hidden?
@@ -1738,7 +1738,7 @@ library.")
        (sha256
         (base32 "1qwdj9xw1w651kqwh82nipbryimm1ir5n3c6q34nphsx576bj9h1"))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs cairomm)
+     (modify-inputs propagated-inputs
        (prepend libsigc++-2)))))
 
 (define-public pangomm
@@ -1868,7 +1868,7 @@ text rendering library.")
        (sha256
         (base32 "1cysiz908phkagwnls44xxa60xls7r3fw540zcg00g7q520jl50a"))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs atkmm)
+     (modify-inputs propagated-inputs
        (replace "glibmm" glibmm-2.66)))))
 
 (define-public gtkmm
@@ -2336,7 +2336,7 @@ with some extra work.")
 (define-public gtk-doc/stable
   (hidden-package
    (package/inherit gtk-doc
-     (inputs (modify-inputs (package-inputs gtk-doc)
+     (inputs (modify-inputs inputs
                (replace "dblatex" dblatex/stable))))))
 
 (define-public gtk-engines
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a66d49e89d9..66b6523e8fc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -997,14 +997,14 @@ variables from them.")
                    (dep-path "GUILE_LOAD_PATH" site)
                    (dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
    (inputs
-     (modify-inputs (package-inputs guile-dotenv)
+     (modify-inputs inputs
        (append bash-minimal)))
    (native-inputs
-    (modify-inputs (package-native-inputs guile-dotenv)
+    (modify-inputs native-inputs
       ;; As opposed to guile-config, here we need to propagate it.
       (delete "guile-config")))
    (propagated-inputs
-    (modify-inputs (package-propagated-inputs guile-dotenv)
+    (modify-inputs propagated-inputs
       (prepend guile-config
                guile-dotenv)))
    (description
@@ -1076,14 +1076,14 @@ tables.")
   (package
     (inherit guile-dsv)
     (name "guile2.2-dsv")
-    (native-inputs (modify-inputs (package-native-inputs guile-dsv)
+    (native-inputs (modify-inputs native-inputs
                      (replace "guile-smc" guile2.2-smc)
                      (replace "guile" guile-2.2)
                      (replace "guile-lib" guile2.2-lib)))
-    (inputs (modify-inputs (package-inputs guile-dsv)
+    (inputs (modify-inputs inputs
               (replace "guile"  guile-2.2)
               (replace "guile-lib" guile2.2-lib)))
-    (propagated-inputs (modify-inputs (package-propagated-inputs guile-dsv)
+    (propagated-inputs (modify-inputs propagated-inputs
                          (replace "guile-lib" guile2.2-lib)
                          (replace "guile-smc" guile2.2-smc)))))
 
@@ -1252,10 +1252,10 @@ is not available for Guile 2.0.")
     (inherit guile-fibers)
     (name "guile2.2-fibers")
     (inputs
-     (modify-inputs (package-inputs guile-fibers)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))
     (native-inputs
-     (modify-inputs (package-native-inputs guile-fibers)
+     (modify-inputs native-inputs
        (replace "guile" guile-2.2)))))
 
 (define-public guile-fibers-next
@@ -1277,10 +1277,10 @@ is not available for Guile 2.0.")
                  (base32
                   "0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))))
       (inputs
-       (modify-inputs (package-inputs guile-fibers)
+       (modify-inputs inputs
          (replace "guile" guile-next)))
       (native-inputs
-       (modify-inputs (package-native-inputs guile-fibers)
+       (modify-inputs native-inputs
          (replace "guile" guile-next))))))
 
 (define-public guile-kracht
@@ -1680,7 +1680,7 @@ using Guile's foreign function interface.")
   (package
     (inherit guile-squee)
     (name "guile2.2-squee")
-    (native-inputs (modify-inputs (package-native-inputs guile-squee)
+    (native-inputs (modify-inputs native-inputs
                      (replace "guile" guile-2.2)))))
 
 (define-public guile-colorized
@@ -2077,7 +2077,7 @@ messaging library.")
   (package
     (inherit guile-simple-zmq)
     (name "guile2.2-simple-zmq")
-    (native-inputs (modify-inputs (package-native-inputs guile-simple-zmq)
+    (native-inputs (modify-inputs native-inputs
                      (replace "guile" guile-2.2)))))
 
 (define-public jupyter-guile-kernel
@@ -2247,7 +2247,7 @@ format.")
   (package
     (inherit guile-email)
     (name "guile2.2-email")
-    (inputs (modify-inputs (package-inputs guile-email)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -2381,7 +2381,7 @@ Scheme by using Guile’s foreign function interface.")
   (package
     (inherit guile-newt)
     (name "guile2.2-newt")
-    (inputs (modify-inputs (package-inputs guile-newt)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)))))
 
 (define-public guile-mastodon
@@ -2447,7 +2447,7 @@ written in pure Scheme by using Guile's foreign function interface.")
   (package
     (inherit guile-parted)
     (name "guile2.2-parted")
-    (inputs (modify-inputs (package-inputs guile-parted)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)))
     (propagated-inputs
      `(("guile-bytestructures" ,guile2.2-bytestructures)))))
@@ -2603,7 +2603,7 @@ It currently supports MySQL, Postgres and SQLite3.")
     (inputs
      (list sqlite zlib))
     (native-inputs
-     (modify-inputs (package-native-inputs guile-dbi)
+     (modify-inputs native-inputs
        (prepend guile-dbi ; only required for headers
                 pkg-config)))
     (synopsis "Guile DBI driver for SQLite")
@@ -2632,7 +2632,7 @@ SQL databases.  This package implements the interface for SQLite.")))
     (inputs
      (list postgresql zlib))
     (native-inputs
-     (modify-inputs (package-native-inputs guile-dbi)
+     (modify-inputs native-inputs
        (prepend guile-dbi ; only required for headers
                 )))
     (synopsis "Guile DBI driver for PostgreSQL")
@@ -2665,7 +2665,7 @@ PostgreSQL.")))
      (list `(,mariadb "dev")
            `(,mariadb "lib") zlib))
     (native-inputs
-     (modify-inputs (package-native-inputs guile-dbi)
+     (modify-inputs native-inputs
        (prepend guile-dbi ; only required for headers
                 )))
     (synopsis "Guile DBI driver for MySQL")
@@ -2754,7 +2754,7 @@ above command-line parameters.")
   (package
     (inherit guile-config)
     (name "guile2.2-config")
-    (inputs (modify-inputs (package-inputs guile-config)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)))))
 
 (define-public guile-hall
@@ -2869,7 +2869,7 @@ The library is shipped with documentation in Info format and usage examples.")
     (inherit guile-ics)
     (name "guile2.2-ics")
     (native-inputs
-     (modify-inputs (package-native-inputs guile-ics)
+     (modify-inputs native-inputs
        (replace "guile" guile-2.2)
        (replace "guile-lib" guile2.2-lib)
        (replace "guile-smc" guile2.2-smc)))
@@ -3133,7 +3133,7 @@ object-oriented programming system, GOOPS.")
     (inherit guile-g-golf)
     (name "guile2.2-g-golf")
     (inputs
-     (modify-inputs (package-inputs guile-g-golf)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)
        (replace "guile-lib" guile2.2-lib)))))
 
@@ -4294,7 +4294,7 @@ store.")
   (package
     (inherit guile-redis)
     (name "guile2.2-redis")
-    (native-inputs (modify-inputs (package-native-inputs guile-redis)
+    (native-inputs (modify-inputs native-inputs
                      (replace "guile" guile-2.2)))))
 
 (define-public guile-commonmark
@@ -4830,7 +4830,7 @@ pre-alpha code.")
     (inherit guile-gi)
     (name "guile2.2-gi")
     (inputs
-     (modify-inputs (package-inputs guile-gi)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))))
 
 (define-public guile-srfi-89
@@ -6453,7 +6453,7 @@ over, or update a value in arbitrary data structures.")
     (inherit guile-lens)
     (name "guile2.2-lens")
     (native-inputs
-     (modify-inputs (package-native-inputs guile-lens)
+     (modify-inputs native-inputs
        (replace "guile" guile-2.2)))))
 
 (define-public guile-xapian
@@ -6493,10 +6493,10 @@ models and also supports a rich set of boolean query operators.")
     (inherit guile-xapian)
     (name "guile2.2-xapian")
     (inputs
-     (modify-inputs (package-inputs guile-xapian)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs guile-xapian)
+     (modify-inputs propagated-inputs
        (replace "guile-lib" guile2.2-lib)))))
 
 (define-public guile-torrent
@@ -7582,10 +7582,10 @@ with a FSM is being built (for example, from a Makefile.)")
   (package
     (inherit guile-smc)
     (name "guile2.2-smc")
-    (native-inputs (modify-inputs (package-native-inputs guile-smc)
+    (native-inputs (modify-inputs native-inputs
                      (replace "guile" guile-2.2)
                      (replace "guile-lib" guile2.2-lib)))
-    (inputs (modify-inputs (package-inputs guile-smc)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)
               (replace "guile-lib" guile2.2-lib)))))
 
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 34ad88de276..b34be7d8f1e 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -7575,7 +7575,7 @@ manipulating monad transformer stacks.")
     (inherit ghc-mockery)
     (name "ghc-mockery-bootstrap")
     (arguments `(#:tests? #f))
-    (inputs (modify-inputs (package-inputs ghc-mockery)
+    (inputs (modify-inputs inputs
               (replace "ghc-logging-facade" ghc-logging-facade-bootstrap)))
     (native-inputs '())
     (properties '((hidden? #t)))))
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 78ade07cb9c..9fab0cf994b 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -264,7 +264,7 @@ may also simplify input method development.")
                          ,(string-append #$output "/lib/girepository-1.0")))))
                   (list (search-input-file outputs "bin/ibus-setup")
                         (search-input-file outputs "bin/ibus-daemon")))))))))
-    (inputs (modify-inputs (package-inputs ibus-minimal)
+    (inputs (modify-inputs inputs
               (prepend gtk
                        pango
                        python
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index c00a287c159..c815e732ab6 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -984,7 +984,7 @@ including 2D color images.")
     (native-inputs
      (list pkg-config qttools-5))
     (inputs
-     (modify-inputs (package-inputs gmic)
+     (modify-inputs inputs
        (prepend gmic qtbase-5)))
     (synopsis "Qt frontend for the G'MIC image processing framework")
     (license license:gpl3+)))
@@ -995,7 +995,7 @@ including 2D color images.")
     (name "gmic-qt-gimp")
     (inputs
      ;; GIMP and its dependencies.
-     (modify-inputs (package-inputs gmic-qt)
+     (modify-inputs inputs
        (prepend gexiv2 gdk-pixbuf gegl gimp pango)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -1620,9 +1620,9 @@ combine the information contained in both.")
          ((#:phases phases #~%standard-phases)
           #~(modify-phases #$phases
               (delete 'python-sanity-check)))))
-     (inputs (modify-inputs (package-inputs insight-toolkit)
+     (inputs (modify-inputs inputs
                (delete "python")))
-     (native-inputs (modify-inputs (package-native-inputs insight-toolkit)
+     (native-inputs (modify-inputs native-inputs
                       (delete "castxml")
                       (delete "python-numpy")
                       (delete "swig"))))))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index b82e2b33e9a..311507755fa 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -377,7 +377,7 @@ APNG patch provides APNG support to libpng.")
         (base32
          "01r34c31gq136jwshdfira44wbl6nb8qfgj4a4vam9r0hr8rdwsd"))))
     (inputs
-     (modify-inputs (package-inputs libpng-apng)
+     (modify-inputs inputs
        (replace "apng"
          (origin
            (method url-fetch)
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 5a9b7760905..c492d79fa01 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -951,7 +951,7 @@ building block for other projects.")
                  (find-files
                   #$(this-package-native-input "python-irc-parser-tests") "\\.yaml$"))))))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs go-gopkg-in-irc-v3)
+     (modify-inputs propagated-inputs
        (append go-golang-org-x-time)))))
 
 (define-public chathistorysync
diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm
index 426df8bcf24..c023a0320fb 100644
--- a/gnu/packages/java-bootstrap.scm
+++ b/gnu/packages/java-bootstrap.scm
@@ -733,7 +733,7 @@ supports sufficient parts of Java 7 to build Icedtea 2.x.")
   (package
     (inherit jamvm)
     (inputs
-     (modify-inputs (package-inputs jamvm)
+     (modify-inputs inputs
        (replace "ecj-javac-wrapper" ecj4-javac-wrapper)))
     (properties
      (alist-delete 'hidden? (package-properties jamvm)))))
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 73badacf631..c5190121e6a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1609,7 +1609,7 @@ new Date();"))))
                             (release-tag-suffix . "-ga")
                             (release-tag-version-delimiter . ".")))
                          (native-inputs
-                          (modify-inputs (package-native-inputs bootstrap)
+                          (modify-inputs native-inputs
                             (replace "openjdk" bootstrap)))
                          (home-page (string-append
                                      "https://openjdk.java.net/projects/jdk/"
@@ -1715,7 +1715,7 @@ blacklisted.certs.pem"
               (search-patches "openjdk-15-jtask-reproducibility.patch"
                               "openjdk-15-xcursor-no-dynamic.patch"))))
    (inputs
-    (modify-inputs (package-inputs base)
+    (modify-inputs inputs
       (append libxcursor)))             ;for our patch to work
    (arguments
     (substitute-keyword-arguments (package-arguments base)
@@ -1728,7 +1728,7 @@ blacklisted.certs.pem"
        #~(cons "--without-gtest"        ;this replaces...
                (delete "--disable-hotspot-gtest" #$flags))))) ;... this
    (native-inputs
-    (append (modify-inputs (package-native-inputs base)
+    (append (modify-inputs native-inputs
               (delete "make"            ;remove old gnu-make-4.2
                       "openjdk")        ;to remove non-jdk output
               (append `(,openjdk14 "jdk")))
@@ -5078,7 +5078,7 @@ every feature for every plugin.")))
      (list java-modello-core java-modello-plugins-java
            java-modello-plugins-xml))
     (native-inputs
-     (modify-inputs (package-native-inputs java-modello-core)
+     (modify-inputs native-inputs
        (prepend java-xmlunit java-modello-test)))
     (synopsis "Modello XPP3 Plugin")
     (description "The modello XPP3 plugin generates XML readers and writers based
@@ -5734,7 +5734,7 @@ The jMock library
                                          (not (string-suffix? "-sources.jar" name)))))))
                    #t)))))))
     (inputs
-     (modify-inputs (package-inputs java-hamcrest-core)
+     (modify-inputs inputs
        (prepend java-junit
                 java-jmock-1
                 ;; This is necessary because of what seems to be a race condition.
@@ -6802,7 +6802,7 @@ This package provides the blocking I/O model library.")
          (add-after 'unpack 'chdir
            (lambda _ (chdir "httpcore-nio") #t)))))
     (inputs
-     (modify-inputs (package-inputs java-httpcomponents-httpcore)
+     (modify-inputs inputs
        (prepend java-httpcomponents-httpcore java-hamcrest-core)))
     (description "HttpCore is a set of low level HTTP transport components
 that can be used to build custom client and server side HTTP services with a
@@ -6823,7 +6823,7 @@ NIO.")))
          (add-after 'unpack 'chdir
            (lambda _ (chdir "httpcore-ab") #t)))))
     (inputs
-     (modify-inputs (package-inputs java-httpcomponents-httpcore)
+     (modify-inputs inputs
        (prepend java-httpcomponents-httpcore java-commons-cli
                 java-hamcrest-core)))
     (synopsis "Apache HttpCore benchmarking tool")
@@ -6840,7 +6840,7 @@ an Apache AB clone based on HttpCore.")))
          (add-after 'unpack 'chdir
            (lambda _ (chdir "httpcore-osgi"))))))
     (inputs
-     (modify-inputs (package-inputs java-httpcomponents-httpcore)
+     (modify-inputs inputs
                     (prepend java-httpcomponents-httpcore
                              java-httpcomponents-httpcore-nio
                              java-hamcrest-core)))
@@ -6914,7 +6914,7 @@ standards and recommendations.")
          (add-after 'unpack 'chdir
            (lambda _ (chdir "httpclient-cache"))))))
     (inputs
-     (modify-inputs (package-inputs java-httpcomponents-httpclient)
+     (modify-inputs inputs
                     (prepend java-httpcomponents-httpclient
                              java-httpcomponents-httpmime
                              java-hamcrest-core)))
@@ -6932,7 +6932,7 @@ resources.")))
          (add-after 'unpack 'chdir
            (lambda _ (chdir "httpclient-osgi") #t)))))
     (inputs
-     (modify-inputs (package-inputs java-httpcomponents-httpclient)
+     (modify-inputs inputs
                     (prepend java-httpcomponents-httpclient
                              java-httpcomponents-httpclient-cache
                              java-osgi-framework
@@ -13964,7 +13964,7 @@ This module lays the groundwork for the other two modules.")
              (invoke "ant" "jar")
              #t)))))
     (inputs
-     (modify-inputs (package-inputs java-logback-core)
+     (modify-inputs inputs
        (prepend java-logback-core java-slf4j-api)))
     (native-inputs
      (list groovy))
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 0f800d14bb3..400b3c6705f 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -259,7 +259,7 @@ simulation, statistical modeling, machine learning and much more.")
                                       (delete 'sanity-check))))
         (native-inputs (list python-hatchling))
         (propagated-inputs
-         (modify-inputs (package-propagated-inputs parent)
+         (modify-inputs propagated-inputs
            (replace "python-jupyter-client" python-jupyter-client-bootstrap)))))))
 
 (define-public python-jupytext
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 484fd84215f..ea77da73af6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -330,7 +330,7 @@ accessibility clients such as screen readers.")
   (package
     (inherit libqaccessibilityclient)
     (name "libqaccessibilityclient-qt5")
-    (inputs (modify-inputs (package-inputs libqaccessibilityclient)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase-5)))))
 
 (define-public qca
@@ -1024,7 +1024,7 @@ as well as an API to create KDED modules.")
     (source (origin
               (inherit (package-source kdbusaddons-5))
               (patches '())))
-    (inputs (modify-inputs (package-inputs kdbusaddons-5) (delete "kinit")))
+    (inputs (modify-inputs inputs (delete "kinit")))
     (arguments
      (substitute-keyword-arguments arguments
        ((#:phases phases)
diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm
index 786ae63c4e5..7c40d5d9471 100644
--- a/gnu/packages/kde-graphics.scm
+++ b/gnu/packages/kde-graphics.scm
@@ -733,7 +733,7 @@ decode RAW picture files.")
   (package
     (inherit libkdcraw)
     (name "libkdcraw-qt5")
-    (inputs (modify-inputs (package-inputs libkdcraw)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase-5)))))
 
 (define-public libksane
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 7860cff9e12..e4f5cdc1341 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -514,7 +514,7 @@ plug-in system.")
         `(cons "-DCORE_PLATFORM_NAME=wayland"
                (delete "-DCORE_PLATFORM_NAME=x11" ,flags)))))
     (inputs
-     (modify-inputs (package-inputs kodi)
+     (modify-inputs inputs
        (prepend libinput
                 libxkbcommon
                 waylandpp
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index be9086d7cef..83db8c7c2fd 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -80,7 +80,7 @@ loop.")
 (define-public libevent-with-openssl
   (package/inherit libevent
     (name "libevent-with-openssl")
-    (inputs (modify-inputs (package-inputs libevent)
+    (inputs (modify-inputs inputs
               (prepend openssl)))
     (arguments
      ;; This skips some of the tests which fail on armhf and aarch64.
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 73d1ce13d1e..4717a39157f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3681,7 +3681,7 @@ block devices, UUIDs, TTYs, and many other tools.")
    util-linux
    (name "util-linux-with-udev")
    (inputs
-    (modify-inputs (package-inputs util-linux)
+    (modify-inputs inputs
       (prepend eudev)))))
 
 (define-public chimerautils
@@ -10569,7 +10569,7 @@ libraries, which are often integrated directly into libfabric.")
        (sha256
         (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
     (inputs
-     (modify-inputs (package-inputs libfabric)
+     (modify-inputs inputs
        (append cxi-driver-for-libfabric-1)))))
 
 (define-public psm
@@ -11106,7 +11106,7 @@ file systems.")
         `(cons "--enable-gettext=no"
                ,configure-flags))))
     (native-inputs
-     (modify-inputs (package-native-inputs xfsprogs)
+     (modify-inputs native-inputs
        (delete "gettext-minimal")))))
 
 (define-public xfsprogs/static
@@ -11622,7 +11622,7 @@ tools for managing PipeWire.")
          ((#:configure-flags flags ''())
           #~(cons "-Delogind=disabled" #$flags))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (delete "elogind"))))))
 
 (define-public ell
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 8f71775d12c..492e1ea35cc 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -4714,7 +4714,7 @@ to cl-async.")
                  (search-input-file inputs
                                     "/lib/async-process/libasyncprocess.so"))))))))
     (inputs
-     (modify-inputs (package-inputs libasyncprocess)
+     (modify-inputs inputs
        (prepend libasyncprocess sbcl-cffi)))
     (home-page "https://github.com/lem-project/async-process")
     (synopsis "Asynchronous process execution for Common Lisp")
@@ -10348,7 +10348,7 @@ Development into CL+SSL was done by David Lichteblau.")
     (package
       (inherit pkg)
       (native-inputs
-       (modify-inputs (package-native-inputs pkg)
+       (modify-inputs native-inputs
          (delete "sbcl-trivial-sockets")))
       (arguments
        (substitute-keyword-arguments arguments
@@ -19872,7 +19872,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
       (inherit parent)
       (propagated-inputs
        ;; Need header to compile.
-       (modify-inputs (package-propagated-inputs parent)
+       (modify-inputs propagated-inputs
          (prepend libfixposix))))))
 
 (define-public ecl-iolib
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index a0447fcc8fe..c4de0f282c6 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -891,7 +891,7 @@ Library.")
                 (install-file "LICENSE.TXT"
                               (string-append #$output "/share/doc"))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-14)
        (replace "llvm" llvm-14)))))
 
@@ -965,7 +965,7 @@ Library.")
         #~(modify-phases #$phases
             (delete 'chdir-to-source-and-install-license)))))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-14)
+     (modify-inputs native-inputs
        (replace "clang" clang-13)
        (replace "llvm" llvm-13)))))
 
@@ -1046,7 +1046,7 @@ Library.")
        ((#:configure-flags flags)
         #~`(,@(delete "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" #$flags)))))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-13)
+     (modify-inputs native-inputs
        (replace "clang" clang-12)
        (replace "llvm" llvm-12)))))
 
@@ -1077,7 +1077,7 @@ Library.")
     (version (package-version llvm-16))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-16)
        (replace "llvm" llvm-16)))))
 
@@ -1109,7 +1109,7 @@ Library.")
     (version (package-version llvm-17))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-17)
        (replace "llvm" llvm-17)))))
 
@@ -1180,7 +1180,7 @@ Library.")
     (version (package-version llvm-18))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-18)
        (replace "llvm" llvm-18)))))
 
@@ -1211,7 +1211,7 @@ Library.")
     (version (package-version llvm-19))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-19)
        (replace "llvm" llvm-19)))))
 
@@ -1242,7 +1242,7 @@ Library.")
     (version (package-version llvm-20))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-20)
        (replace "llvm" llvm-20)))))
 
@@ -1273,7 +1273,7 @@ Library.")
     (version (package-version llvm-21))
     (source (llvm-monorepo version))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-15)
+     (modify-inputs native-inputs
        (replace "clang" clang-21)
        (replace "llvm" llvm-21)))))
 
@@ -1432,7 +1432,7 @@ This AMD fork includes AMD-specific additions."))))
     (name "clang-runtime-rocm")
     (version (package-version llvm-rocm))
     (source (package-source llvm-rocm))
-    (inputs (modify-inputs (package-inputs clang-runtime-base)
+    (inputs (modify-inputs inputs
               (replace "llvm" llvm-rocm)))))
 
 (define-public clang-runtime-rocm (make-clang-runtime-rocm clang-runtime-20))
@@ -1444,10 +1444,10 @@ This AMD fork includes AMD-specific additions."))))
     (name "clang-rocm")
     (version (package-version llvm-rocm))
     (source (package-source llvm-rocm))
-    (inputs (modify-inputs (package-inputs clang-base)
+    (inputs (modify-inputs inputs
               (delete "clang-tools-extra")))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs clang-base)
+     (modify-inputs propagated-inputs
        (replace "llvm" llvm-rocm)
        (replace "clang-runtime" clang-runtime-rocm)
        (append python-lit)))
@@ -1744,7 +1744,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
               (sha256
                (base32
                 "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"))))
-    (inputs (modify-inputs (package-inputs lld)
+    (inputs (modify-inputs inputs
               (replace "llvm" llvm-12)))))
 
 (define-public lld-16
@@ -2146,7 +2146,7 @@ generator targetting AMD hardware.")
                     "config.environment['CPLUS_INCLUDE_PATH']"
                     " = os.environ['CPLUS_INCLUDE_PATH']\n")))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs libomp-20)
+     (modify-inputs native-inputs
        (replace "clang" clang-rocm)
        (replace "llvm" llvm-rocm)))))
 
@@ -2204,7 +2204,7 @@ the host.")
     (inherit clang-rocm-toolchain)
     (name "rocm-toolchain")
     (inputs
-     (modify-inputs (package-inputs clang-rocm-toolchain)
+     (modify-inputs inputs
        (append lld-wrapper-rocm
                offload-rocm
                rocr-runtime
@@ -2518,7 +2518,7 @@ LLVM bitcode files.")
                 ;; This reduces the size from 22 MiB to 4 MiB.
                 (lambda _
                   (for-each delete-file (find-files #$output "\\.a$"))))))))
-      (inputs (modify-inputs (package-inputs base)
+      (inputs (modify-inputs inputs
                 (replace "llvm" llvm-cling))))))
 
 (define clang-cling
@@ -2528,7 +2528,7 @@ LLVM bitcode files.")
       (version (package-version llvm-cling))
       (source (package-source llvm-cling))
       (propagated-inputs
-       (modify-inputs (package-propagated-inputs base)
+       (modify-inputs propagated-inputs
          (replace "llvm" llvm-cling)
          (replace "clang-runtime" clang-cling-runtime))))))
 
diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm
index d0f0463baff..bf5d96ece62 100644
--- a/gnu/packages/luanti.scm
+++ b/gnu/packages/luanti.scm
@@ -172,7 +172,7 @@ sources.")
                           (string-append (getcwd) "/../source/games"))
                   (invoke "../source/bin/luantiserver" "--run-unittests"))))))))
     (inputs
-     (modify-inputs (package-inputs luanti)
+     (modify-inputs inputs
        (delete "libjpeg-turbo"
                "libpng"
                "libogg"
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index bb0f35828d4..e3273b7e14e 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5392,7 +5392,7 @@ in the audio domain.")
   (package/inherit python-pytorch
     (name "python-pytorch-avx")
     (inputs
-     (modify-inputs (package-inputs python-pytorch)
+     (modify-inputs inputs
        (append fbgemm nnpack)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -5432,7 +5432,7 @@ in the audio domain.")
     (source %python-pytorch-for-r-torch-src)
     (build-system python-build-system)
     (inputs
-     (modify-inputs (package-inputs python-pytorch)
+     (modify-inputs inputs
        (replace "gloo" gloo-for-r-torch)))
     (arguments
      (substitute-keyword-arguments arguments
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 61a087323ef..0b412f4e9ff 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -588,7 +588,7 @@ Python}.")
     (inherit mailutils)
     (name "guile2.2-mailutils")
     (inputs
-     (modify-inputs (package-inputs mailutils)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))))
 
 (define-public nullmailer
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 5368a092c70..de1dd6ebd22 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -617,11 +617,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
       (outputs (delete "debug" (package-outputs guile)))
 
       (inputs
-       (modify-inputs (package-inputs guile)
+       (modify-inputs inputs
          (prepend `(,libunistring "static"))))
 
       (propagated-inputs
-       (modify-inputs (package-propagated-inputs guile)
+       (modify-inputs propagated-inputs
          (replace "libgc" libgc/static-libs)))
 
       (arguments
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6b2d51f4851..c56cbcf5f30 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1223,7 +1223,7 @@ large scale eigenvalue problems.")
   (package (inherit arpack-ng)
     (name "arpack-ng-openmpi")
     (inputs
-     (modify-inputs (package-inputs arpack-ng)
+     (modify-inputs inputs
        (prepend openmpi)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -2150,7 +2150,7 @@ Interface to wrap the HDF5 library, which is implemented in C.")
 (define-public hdf5-parallel-openmpi
   (package/inherit hdf5
     (name "hdf5-parallel-openmpi")
-    (inputs (modify-inputs (package-inputs hdf5)
+    (inputs (modify-inputs inputs
               (prepend openmpi)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -2454,7 +2454,7 @@ sharing of scientific data.")
 (define-public netcdf-parallel-openmpi
   (package/inherit netcdf
     (name "netcdf-parallel-openmpi")
-    (inputs (modify-inputs (package-inputs netcdf)
+    (inputs (modify-inputs inputs
               (append openmpi pnetcdf)
               (replace "hdf5" hdf5-parallel-openmpi)))
     ;; TODO: Replace pkg-config references in nc-config with absolute references
@@ -2563,10 +2563,10 @@ scientific data storage.")
     (inherit netcdf-cxx4)
     (name "netcdf-cxx4-parallel-openmpi")
     (synopsis "NetCDF C++ interface (with MPI support)")
-    (inputs (modify-inputs (package-inputs netcdf-cxx4)
+    (inputs (modify-inputs inputs
               (prepend openmpi)
               (replace "hdf5" hdf5-parallel-openmpi)))
-    (propagated-inputs (modify-inputs (package-propagated-inputs netcdf-cxx4)
+    (propagated-inputs (modify-inputs propagated-inputs
               (replace "netcdf" netcdf-parallel-openmpi)))))
 
 (define-public n2p2
@@ -3383,7 +3383,7 @@ can solve two kinds of problems:
                             ((compile-file "../..") "autodiff_benchmarks"))))))
                   (delete 'check)
                   (delete 'install))))
-    (inputs (modify-inputs (package-inputs ceres)
+    (inputs (modify-inputs inputs
               (prepend googlebenchmark ceres)))
     (synopsis "Benchmarks of the Ceres optimization problem solver")))
 
@@ -4107,7 +4107,7 @@ scientific applications modeled by partial differential equations.")
     (inherit petsc)
     (name "petsc-openmpi")
     (inputs
-     (modify-inputs (package-inputs petsc)
+     (modify-inputs inputs
        (prepend hdf5-parallel-openmpi
                 hypre-openmpi
                 metis
@@ -4154,7 +4154,7 @@ scientific applications modeled by partial differential equations.")
     (inherit petsc-complex)
     (name "petsc-complex-openmpi")
     (inputs
-     (modify-inputs (package-inputs petsc-complex)
+     (modify-inputs inputs
        (prepend openmpi)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -5200,7 +5200,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
   (package
     (inherit mumps)
     (name "mumps-metis")
-    (inputs (modify-inputs (package-inputs mumps)
+    (inputs (modify-inputs inputs
               (delete "scotch")))))
 
 (define-public mumps-openmpi
@@ -5208,7 +5208,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
     (inherit mumps)
     (name "mumps-openmpi")
     (inputs
-     (modify-inputs (package-inputs mumps)
+     (modify-inputs inputs
        (delete "scotch")
        (prepend openmpi scalapack pt-scotch)))
     (arguments
@@ -5227,7 +5227,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
   (package
     (inherit mumps-openmpi)
     (name "mumps-metis-openmpi")
-    (inputs (modify-inputs (package-inputs mumps-openmpi)
+    (inputs (modify-inputs inputs
               (delete "pt-scotch")))))
 
 (define-public ruby-asciimath
@@ -5779,7 +5779,7 @@ point numbers.")
     (name "maxima-ecl")
     (properties '((hidden? . #t)))
     (inputs
-      (modify-inputs (package-inputs maxima)
+      (modify-inputs inputs
         (delete "sbcl")
         (prepend ecl)))
     (arguments
@@ -7873,7 +7873,7 @@ problems.")
   (package
     (inherit hypre)
     (name "hypre-openmpi")
-    (inputs (modify-inputs (package-inputs hypre)
+    (inputs (modify-inputs inputs
               (prepend openmpi)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -8526,7 +8526,7 @@ symmetric matrices.")
   (package/inherit elpa
     (name "elpa-openmpi")
     (inputs
-     (modify-inputs (package-inputs elpa)
+     (modify-inputs inputs
        (prepend openmpi scalapack zlib)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -8820,7 +8820,7 @@ easily be incorporated into existing simulation codes.")
         (base32
          "0nx4sqhmi126m14myzm7syv2053harav9snl0a247wnkcgs5rxrv"))))
     (inputs
-     (modify-inputs (package-inputs sundials)
+     (modify-inputs inputs
        (prepend gfortran openblas)))
     (arguments
      '(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon"
@@ -9415,7 +9415,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
         (if (dune-package? p)
             (package (inherit p)
               (name (string-append (package-name p) "-openmpi"))
-              (inputs (modify-inputs (package-inputs p)
+              (inputs (modify-inputs inputs
                         (append openmpi)))
               (arguments
                (substitute-keyword-arguments arguments
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index ecd0433b088..72a16edac4d 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -2294,7 +2294,7 @@ reporting or the build process.")))
                (base32
                 "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37"))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-parent-pom)
+     (modify-inputs propagated-inputs
        (replace "maven-parent-pom" maven-parent-pom-34)))))
 
 (define-public maven-resolver-1.6-api
@@ -2303,7 +2303,7 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-api)
+     (modify-inputs propagated-inputs
        (replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom)))))
 
 (define-public maven-resolver-1.6-spi
@@ -2312,7 +2312,7 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-spi)
+     (modify-inputs propagated-inputs
        (replace "maven-resolver-api" maven-resolver-1.6-api)))))
 
 (define-public maven-resolver-1.6-test-util
@@ -2321,7 +2321,7 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (inputs
-     (modify-inputs (package-inputs maven-resolver-test-util)
+     (modify-inputs inputs
        (replace "maven-resolver-api" maven-resolver-1.6-api)
        (replace "maven-resolver-spi" maven-resolver-1.6-spi)))))
 
@@ -2331,10 +2331,10 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-util)
+     (modify-inputs propagated-inputs
        (replace "maven-resolver-api" maven-resolver-1.6-api)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-resolver-util)
+     (modify-inputs native-inputs
        (replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
 
 (define-public maven-resolver-1.6-connector-basic
@@ -2343,12 +2343,12 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-connector-basic)
+     (modify-inputs propagated-inputs
        (replace "maven-resolver-api" maven-resolver-1.6-api)
        (replace "maven-resolver-spi" maven-resolver-1.6-spi)
        (replace "maven-resolver-util" maven-resolver-1.6-util)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-resolver-connector-basic)
+     (modify-inputs native-inputs
        (replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
 
 (define-public maven-resolver-1.6-impl
@@ -2397,14 +2397,14 @@ reporting or the build process.")))
          (replace 'install
            (install-from-pom "maven-resolver-impl/pom.xml")))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-impl)
+     (modify-inputs propagated-inputs
        (delete "maven-resolver-named-locks")
        (replace "maven-resolver-api" maven-resolver-1.6-api)
        (replace "maven-resolver-spi" maven-resolver-1.6-spi)
        (replace "maven-resolver-util" maven-resolver-1.6-util)
        (replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-resolver-impl)
+     (modify-inputs native-inputs
        (delete "java-hamcrest-all")
        (delete "java-mockito-1")
        (replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
@@ -2415,13 +2415,13 @@ reporting or the build process.")))
     (version (package-version maven-resolver-1.6-parent-pom))
     (source (package-source maven-resolver-1.6-parent-pom))
     (inputs
-     (modify-inputs (package-inputs maven-resolver-transport-file)
+     (modify-inputs inputs
        (delete "maven-wagon-provider-api")
        (replace "maven-resolver-api" maven-resolver-1.6-api)
        (replace "maven-resolver-spi" maven-resolver-1.6-spi)
        (replace "maven-resolver-util" maven-resolver-1.6-util)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-resolver-transport-file)
+     (modify-inputs native-inputs
        (replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
 
 (define-public maven-resolver-1.6-transport-http
@@ -2445,13 +2445,13 @@ reporting or the build process.")))
                (lambda _
                  (display "org.eclipse.aether.transport.http.HttpTransporterFactory\n"))))))))
     (inputs
-     (modify-inputs (package-inputs maven-resolver-transport-http)
+     (modify-inputs inputs
        (delete "maven-wagon-provider-api")
        (replace "maven-resolver-api" maven-resolver-1.6-api)
        (replace "maven-resolver-spi" maven-resolver-1.6-spi)
        (replace "maven-resolver-util" maven-resolver-1.6-util)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-resolver-transport-http)
+     (modify-inputs native-inputs
        (replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
 
 (define maven-3.8-pom
@@ -2465,7 +2465,7 @@ reporting or the build process.")))
                                   "apache-maven-" version "-src.tar.gz"))
               (sha256 (base32 "01q2g8sklxsys46i4dxqr89klcxfzz40f2kz4lxbdl1phyibqk92"))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-pom)
+     (modify-inputs propagated-inputs
        (replace "maven-parent-pom" maven-parent-pom-35)))))
 
 (define-public maven-3.8-artifact
@@ -2474,7 +2474,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-artifact)
+     (modify-inputs propagated-inputs
        (replace "maven-pom" maven-3.8-pom)))))
 
 (define-public maven-3.8-model
@@ -2483,7 +2483,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-model)
+     (modify-inputs propagated-inputs
        (replace "maven-pom" maven-3.8-pom)))))
 
 (define-public maven-3.8-builder-support
@@ -2492,7 +2492,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-builder-support)
+     (modify-inputs propagated-inputs
        (replace "maven-pom" maven-3.8-pom)))))
 
 (define-public maven-3.8-settings
@@ -2501,7 +2501,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-settings)
+     (modify-inputs propagated-inputs
        (replace "maven-pom" maven-3.8-pom)))))
 
 (define-public maven-3.8-settings-builder
@@ -2510,7 +2510,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-settings-builder)
+     (modify-inputs propagated-inputs
        (replace "maven-builder-support" maven-3.8-builder-support)
        (replace "maven-settings" maven-3.8-settings)
        (replace "maven-pom" maven-3.8-pom)))))
@@ -2521,7 +2521,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-model-builder)
+     (modify-inputs propagated-inputs
        (replace "maven-artifact" maven-3.8-artifact)
        (replace "maven-builder-support" maven-3.8-builder-support)
        (replace "maven-model" maven-3.8-model)
@@ -2533,7 +2533,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-repository-metadata)
+     (modify-inputs propagated-inputs
        (replace "maven-pom" maven-3.8-pom)))))
 
 (define-public maven-3.8-resolver-provider
@@ -2542,7 +2542,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-resolver-provider)
+     (modify-inputs propagated-inputs
        (replace "maven-model" maven-3.8-model)
        (replace "maven-model-builder" maven-3.8-model-builder)
        (replace "maven-builder-support" maven-3.8-builder-support)
@@ -2558,7 +2558,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-plugin-api)
+     (modify-inputs propagated-inputs
        (replace "maven-artifact" maven-3.8-artifact)
        (replace "maven-model" maven-3.8-model)))))
 
@@ -2568,7 +2568,7 @@ reporting or the build process.")))
     (version (package-version maven-3.8-pom))
     (source (package-source maven-3.8-pom))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-core)
+     (modify-inputs propagated-inputs
        (replace "maven-artifact" maven-3.8-artifact)
        (replace "maven-resolver-provider" maven-3.8-resolver-provider)
        (replace "maven-model" maven-3.8-model)
@@ -2774,7 +2774,7 @@ reporting or the build process.")))
             (_ input)))
         (package-propagated-inputs maven-model-builder)))
     (native-inputs
-     (modify-inputs (package-native-inputs maven-plugin-api)
+     (modify-inputs native-inputs
        (prepend java-plexus-container-default)))))
 
 (define-public maven-3.0-repository-metadata
@@ -2974,7 +2974,7 @@ reporting or the build process.")))
                (base32
                 "0qm8y85kip2hyhnhlkqgj0rhmf83z07s7l7gzsfl5dzl3kvp8nal"))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs maven-shared-utils)
+     (modify-inputs propagated-inputs
        (prepend maven-3.0-core maven-components-parent-pom-21)))))
 
 (define-public maven-shared-utils-3.1
diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm
index c4d2be640d9..22ed6add455 100644
--- a/gnu/packages/medical.scm
+++ b/gnu/packages/medical.scm
@@ -390,9 +390,9 @@ Medicine} server instead of SQLite.")
                             "-e" "CREATE DATABASE orthanctest;")
                     (invoke "./UnitTests" socket username password
                             database)))))))))
-    (native-inputs (modify-inputs (package-native-inputs orthanc-mysql)
+    (native-inputs (modify-inputs native-inputs
                      (prepend mariadb))) ;for tests
-    (inputs (modify-inputs (package-inputs orthanc-mysql)
+    (inputs (modify-inputs inputs
               (delete "mysql")
               (prepend `(,mariadb "dev")
                        `(,mariadb "lib"))))
@@ -443,6 +443,6 @@ GUI application (@code{xmedcon}).")
      (substitute-keyword-arguments arguments
        ((#:configure-flags flags #~'())
         #~(append (list "--disable-glib" "--disable-gui") #$flags))))
-    (inputs (modify-inputs (package-inputs xmedcon)
+    (inputs (modify-inputs inputs
               (delete "glib" "gtk+")))
     (synopsis "Medical image conversion utility (variant with CLI only)")))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d26e04dfa66..e1977a28b93 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -692,7 +692,7 @@ identi.ca and status.net).")
   (package/inherit bitlbee
     (name "bitlbee-purple")
     (synopsis "IRC to instant messaging gateway (using Pidgin's libpurple)")
-    (inputs (modify-inputs (package-inputs bitlbee)
+    (inputs (modify-inputs inputs
               (prepend pidgin)))
     (native-search-paths
      (list (search-path-specification
@@ -2698,7 +2698,7 @@ validating international phone numbers.")
                (base32
                 "1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
     (inputs
-     (modify-inputs (package-inputs libphonenumber)
+     (modify-inputs inputs
        (delete "abseil-cpp" "icedtea")))))
 
 (define-public chatty
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 657ce22d21e..ee2d270ce9b 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -666,7 +666,7 @@ solution (client-side agent)")
                                        (assoc-ref %build-inputs "zlib")))
                   (delete "--enable-agent" #$flags)))))
     (inputs
-     (modify-inputs (package-inputs zabbix-agentd)
+     (modify-inputs inputs
        (prepend curl
                 libevent
                 net-snmp
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index b6e76ceac6f..8b99395c403 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -179,13 +179,13 @@ bind processes, and much more.")
               ;; XXX: Remove after updating package from 2.13.0.
               (patches (search-patches "hwloc-add-with-opencl.patch"))))
 
-    (native-inputs (modify-inputs (package-native-inputs hwloc-1)
+    (native-inputs (modify-inputs native-inputs
                      (append autoconf)
                      (append automake)
                      (append libtool)
                      (append opencl-headers)
                      (append bash)))              ;for completion tests
-    (inputs (modify-inputs (package-inputs hwloc-1)
+    (inputs (modify-inputs inputs
               (append level-zero)
               ;; XXX: rocm-smi requires libdrm/drm.h but doesn't propagate a
               ;; package providing these. For now, libdrm is used to provide
@@ -404,7 +404,7 @@ software vendors, application developers and computer science researchers.")
        (sha256
         (base32 "02yqfwv2fn9n0glprkk7dzrkrcnpfwfz5874ydx88w0iadi2gdyz"))))
 
-    (inputs (modify-inputs (package-inputs openmpi)
+    (inputs (modify-inputs inputs
               ;; As of Open MPI 5.0.X, PMIx is used to communicate
               ;; with SLURM, so SLURM'S PMI is no longer needed.
               (delete "slurm")
@@ -412,7 +412,7 @@ software vendors, application developers and computer science researchers.")
               (replace "libfabric" libfabric)
               (append openpmix)        ;for PMI support (launching via "srun")
               (append prrte)))         ;for PMI support (launching via "srun")
-    (native-inputs (modify-inputs (package-native-inputs openmpi)
+    (native-inputs (modify-inputs native-inputs
                      (append python)))
 
     (outputs '("out" "debug"))
@@ -741,7 +741,7 @@ modular framework for other derived implementations.")
 (define-public mpich-ofi
   (package/inherit mpich
     (name "mpich-ofi")
-    (inputs (modify-inputs (package-inputs mpich)
+    (inputs (modify-inputs inputs
               (delete ucx)
               (append libfabric)
               (append rdma-core)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index daab1de4917..c05cd8059e8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5144,7 +5144,7 @@ writing to these structures, and they are accessed via the Bigarray module.")
        ;; TODO doesn't find test deps for some reason?
        ;; I have no clue why.
        #:tests? #f))
-    (propagated-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct)
+    (propagated-inputs (modify-inputs propagated-inputs
                          (append ocaml-cstruct ocaml-ppxlib ocaml-sexplib)))
     (native-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct)
                      (append ocaml-cstruct-sexp ocaml-findlib
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index f062e7e1c63..ae2d06e52c2 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -100,7 +100,7 @@ formatters, and other extensions.")
      (native-inputs
       (list python-setuptools python-wheel))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs python-cliff)
+      (modify-inputs propagated-inputs
         (replace "python-stevedore" python-stevedore-bootstrap))))))
 
 (define-public python-debtcollector
@@ -746,7 +746,7 @@ handlers and support for context specific logging (like resource id’s etc).")
          #~(modify-phases #$phases
              (delete 'sanity-check)))))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs python-oslo-log)
+      (modify-inputs propagated-inputs
         (delete "python-oslo-config"))))))
 
 (define-public python-oslo-serialization
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 5f173d9979c..6cb28d30d3c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -589,10 +589,10 @@ the Nix package manager.")
 
     ;; Use a minimum set of dependencies.
     (native-inputs
-     (modify-inputs (package-native-inputs guix)
+     (modify-inputs native-inputs
        (delete "po4a" "graphviz" "font-ghostscript" "help2man")))
     (inputs
-     (modify-inputs (package-inputs guix)
+     (modify-inputs inputs
        (delete (basename (bootstrap-guile-url-path (%current-system)))
                (basename (bootstrap-guile-url-path "i686-linux"))
                "util-linux")
@@ -633,10 +633,10 @@ the Nix package manager.")
      (inherit guix)
      (name "guix-minimal")
      (native-inputs
-      (modify-inputs (package-native-inputs guix)
+      (modify-inputs native-inputs
         (delete "guile-ssh")))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs guix)
+      (modify-inputs propagated-inputs
         (delete "guile-ssh"))))))
 
 (define-public (guix-for-channels channels)
@@ -1921,7 +1921,7 @@ resolution compared to the classic solver.")
                 ;; directory, which would cause non-reproducible builds.
                 (setenv "CONDA_PKGS_DIRS" "/tmp/conda-pkgs")))))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs conda-bootstrap)
+     (modify-inputs propagated-inputs
        (prepend python-conda-libmamba-solver)))))
 
 (define-public conan
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 50baa27293f..aeb42f172dc 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -344,7 +344,7 @@ minimal slurm package BASE-SLURM."
                  #$flags))))
     ;; FIXME: More optional inputs could be added.
     (inputs
-     (modify-inputs (package-inputs base-slurm)
+     (modify-inputs inputs
        ;; Add dependencies required by the slurm REST API.
        (prepend dbus freeipmi http-parser
                 libjwt librdkafka libyaml (list mariadb "dev"))))))
@@ -371,7 +371,7 @@ minimal slurm package BASE-SLURM."
               (sha256
                (base32
                 "130pjygqk794dchknjqdsinciv2b7c7r5agqsgca7m804xp09wnl"))))
-    (inputs (modify-inputs (package-inputs slurm-minimal)
+    (inputs (modify-inputs inputs
               (replace "openpmix" openpmix)))))   ;use version 6.0.0
 
 (define-public slurm-25.05 (make-slurm slurm-minimal-25.05))
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ebd44d0ca34..27db504797b 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1307,7 +1307,7 @@ using password-store through rofi interface:
                               '("pass" "pwgen" "rofi" "wl-copy" "wtype")))))
                    (list "addpass" "rofi-pass")))))))))
     (inputs
-     (modify-inputs (package-inputs rofi-pass)
+     (modify-inputs inputs
        (replace "xclip" wl-clipboard)
        (replace "xdotool" wtype)
        (delete "xset")))
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 101724b790c..b3eacbf4c86 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -511,7 +511,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
 (define-public poppler-qt6
   (package/inherit poppler
     (name "poppler-qt6")
-    (inputs (modify-inputs (package-inputs poppler)
+    (inputs (modify-inputs inputs
               (append qtbase)))
     (synopsis "Qt6 frontend for the Poppler PDF rendering library")))
 
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 6293cabfd8b..9fb6a6815c8 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -231,7 +231,7 @@ easily with PolicyKit.")
   (package
     (inherit polkit-qt)
     (name "polkit-qt6")
-    (inputs (modify-inputs (package-inputs polkit-qt)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase)))))
 
 (define-public polkit-gnome
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 9cae7f1d4af..a4611e51c6a 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -462,7 +462,7 @@ Lua code.")))
                          (format port "Version: ~a~%" #$version)))))))))))
     (inputs (list clingo python-wrapper))
     (propagated-inputs (list python-cffi))
-    (native-inputs (modify-inputs (package-native-inputs clingo)
+    (native-inputs (modify-inputs native-inputs
                      (prepend python-scikit-build)))
     (synopsis "Python bindings for clingo")
     (description "This package provides Python bindings to the clingo package,
@@ -499,10 +499,10 @@ Python code.")))
                       (format port "Metadata-Version: 1.1~%")
                       (format port "Name: clingodl~%")
                       (format port "Version: ~a~%" #$version))))))))))
-    (inputs (modify-inputs (package-inputs clingo-dl)
+    (inputs (modify-inputs inputs
               (prepend python-wrapper)))
     (propagated-inputs (list python-clingo python-cffi))
-    (native-inputs (modify-inputs (package-native-inputs clingo-dl)
+    (native-inputs (modify-inputs native-inputs
                      (prepend python-scikit-build)))
     (synopsis "Python bindings for clingo-dl")
     (description "This package allows users to add the clingo-dl propagator
@@ -539,10 +539,10 @@ directly from the python command line.")))
                          (format port "Metadata-Version: 1.1~%")
                          (format port "Name: clingcon~%")
                          (format port "Version: ~a~%" #$version))))))))))))
-    (inputs (modify-inputs (package-inputs clingcon)
+    (inputs (modify-inputs inputs
               (prepend python-wrapper)))
     (propagated-inputs (list python-clingo python-cffi))
-    (native-inputs (modify-inputs (package-native-inputs clingcon)
+    (native-inputs (modify-inputs native-inputs
                      (prepend python-scikit-build)))
     (synopsis "Python bindings for clingcon")
     (description "This package allows users to add the clingcon propagator
diff --git a/gnu/packages/power.scm b/gnu/packages/power.scm
index 87186a71331..5071cdf50b1 100644
--- a/gnu/packages/power.scm
+++ b/gnu/packages/power.scm
@@ -273,5 +273,5 @@ or higher power saving modes to adapt to the current usage.")
     (inherit tuned-minimal)
     (name "tuned")
     (inputs
-     (modify-inputs (package-inputs tuned-minimal)
+     (modify-inputs inputs
        (prepend dmidecode perf wireless-tools)))))
diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index 55b20ae0556..296a5601b9d 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -428,7 +428,7 @@ sampling profiler for games and other applications.")
         #~(append #$flags
                   ;; The LEGACY flag indicate we want to build tracy with glfw.
                   (list "LEGACY=1")))))
-    (inputs (modify-inputs (package-inputs tracy-wayland)
+    (inputs (modify-inputs inputs
               (delete "libxkbcommon" "wayland")
               (prepend glfw)))
     (synopsis "Frame profiler (X11 version)")))
diff --git a/gnu/packages/pypy.scm b/gnu/packages/pypy.scm
index 87e8acc7644..1a56c58f175 100644
--- a/gnu/packages/pypy.scm
+++ b/gnu/packages/pypy.scm
@@ -402,10 +402,10 @@ Python code natively, including C extensions.")
                         ((shebang-match-python) shebang-pypy3))))
                   (copy-recursively dist-dir #$output))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs pypy2)
+     (modify-inputs native-inputs
        (replace "python2" pypy2)))
     (inputs
-     (modify-inputs (package-inputs pypy2)
+     (modify-inputs inputs
        (append xz)))))
 
 (define-deprecated-package pypy3
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 31b21bb57c4..97251de89ab 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -1187,7 +1187,7 @@ specified by PEP 517, @code{flit_core.buildapi}.")
   (package/inherit python-flit-core-bootstrap
     (name "python-flit-core")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-flit-core-bootstrap)
+     (modify-inputs propagated-inputs
        (delete "python-toml")
        (prepend python-tomli)))))
 
@@ -1402,7 +1402,7 @@ has features such as:
   (package/inherit python-hatchling
     (name "python-hatchling-bootstrap")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-hatchling)
+     (modify-inputs propagated-inputs
        (replace "python-packaging" python-packaging-bootstrap)))))
 
 (define-public python-hatchling-for-hatch
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0f1b8fb0fad..9f25c9540e0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6644,7 +6644,7 @@ WebSocket usage in Python programs.")
        (sha256
         (base32 "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk"))))
     (native-inputs
-     (modify-inputs (package-native-inputs python-websocket-client)
+     (modify-inputs native-inputs
        (append python-six)))))
 
 (define-public python-purl
@@ -10145,7 +10145,7 @@ Plus all the standard features of requests:
       (list python-hatchling
             python-hatch-fancy-pypi-readme))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs python-httpx)
+      (modify-inputs propagated-inputs
         (replace "python-httpcore"  python-httpcore-bootstrap))))))
 
 (define-public python-httpx-sse
@@ -13573,7 +13573,7 @@ return paginated responses to your clients.")
                       `(modify-phases ,phases
                          (delete 'sanity-check)))))
                   (propagated-inputs
-                   (modify-inputs (package-propagated-inputs python-tortoise-orm)
+                   (modify-inputs propagated-inputs
                      (replace "python-aiosqlite" python-aiosqlite)))))))
     (native-inputs
      (list python-aiosqlite
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b1afbd051fd..5a02bad4865 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14531,14 +14531,14 @@ following CLI scripts:
     (arguments
      (list #:test-flags #~(list "--pyargs" "ipyparallel")))
     (native-inputs
-     (modify-inputs (package-native-inputs python-ipyparallel-bootstrap)
+     (modify-inputs native-inputs
        (append python-ipython
                python-pytest
                python-pytest-asyncio
                python-pytest-tornado
                python-testpath)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-ipyparallel-bootstrap)
+     (modify-inputs propagated-inputs
        (replace "python-jupyter-client-bootstrap" python-jupyter-client)
        (append python-ipykernel)))
     (properties (alist-delete 'hidden? (package-properties
@@ -16787,7 +16787,7 @@ from an XML-based format.")
                                       "MtiTest")
                                     " and not "))))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (append python-pytest)))
       (propagated-inputs
        (list python-brotli
@@ -23681,7 +23681,7 @@ protocols written in pure Python.")
         (base32 "0n3p8jyxl4zwc63la10v8llc58fc5pcnfqdq9f1vn0hgy5jdi7z1"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (modify-inputs (package-native-inputs python-dulwich)
+     (modify-inputs native-inputs
        (prepend python-setuptools-rust)))
     (arguments
      (list
@@ -33080,7 +33080,7 @@ key-value pairs from a @code{.env} file and set them as environment variables.")
                (delete-file "tests/test_ipython.py")
                (invoke "python" "-m" "pytest")))))))
     (native-inputs
-     (modify-inputs (package-native-inputs python-dotenv)
+     (modify-inputs native-inputs
        (append python-mock)
        (replace "python-sh" python-sh-1)))))
 
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 687e2857924..e56ef99bde2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -661,7 +661,7 @@ def contents() -> str:
      (modify-inputs (package-inputs python-2.7)
        (replace "openssl" openssl)))
     (native-inputs
-     (let ((inputs (modify-inputs (package-native-inputs python-2)
+     (let ((inputs (modify-inputs native-inputs
                      (prepend tzdata-for-tests
                               unzip
                               (@ (gnu packages compression) zip)))))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f31537676fb..e53616cdca4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -214,7 +214,7 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.")
     (inherit qcoro-qt5)
     (name "qcoro-qt6")
     (synopsis "C++ Coroutine Library for Qt6")
-    (inputs (modify-inputs (package-inputs qcoro-qt5)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase)
               (replace "qtdeclarative" qtdeclarative)
               (replace "qtwebsockets" qtwebsockets)
@@ -1279,17 +1279,17 @@ tst_qt_cmake_create.cpp"
                 (substitute* "cmake_install.cmake"
                   (("include.*tests/cmake_install") "#"))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs qtbase-5)
+     (modify-inputs native-inputs
        (prepend ninja                   ;CMake Generator, also used for tests
                 tzdata-for-tests
                 wayland-protocols
                 xvfb-run-for-tests)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs qtbase-5)
+     (modify-inputs propagated-inputs
        ;; Required by Qt6GuiDependencies.cmake.
        (prepend libxkbcommon vulkan-headers)))
     (inputs
-     (modify-inputs (package-inputs qtbase-5)
+     (modify-inputs inputs
        (delete "libxkbcommon")
        (prepend at-spi2-core
                 bash-minimal
@@ -4617,7 +4617,7 @@ Python.")
                    (string-append #$output "/lib/qt"
                                   #$(version-major (package-version qtbase-5))
                                   "/qml")))))))))
-    (inputs (modify-inputs (package-inputs pyotherside)
+    (inputs (modify-inputs inputs
               (replace "qtdeclarative" qtdeclarative-5)
               (replace "qtquickcontrols2" qtquickcontrols-5)
               (replace "qtsvg" qtsvg-5)))))
@@ -5314,10 +5314,10 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
     (inherit qtkeychain)
     (name "qtkeychain-qt6")
     (native-inputs
-     (modify-inputs (package-native-inputs qtkeychain)
+     (modify-inputs native-inputs
        (replace "qttools" qttools)))
     (inputs
-     (modify-inputs (package-inputs qtkeychain)
+     (modify-inputs inputs
        (replace "qtbase" qtbase)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -5864,7 +5864,7 @@ color-related widgets.")
   (package/inherit qcustomplot
     (name "qcustomplot-qt5")
     (inputs
-     (modify-inputs (package-inputs qcustomplot)
+     (modify-inputs inputs
        (replace "qtbase" qtbase-5)))))
 
 ;; TODO: Split shiboken2 binding generator into a dedicated output.
@@ -5956,7 +5956,7 @@ color-related widgets.")
                 "0b92b4zi5rqg5acgbb6yan349idvzmc0x8wjwkdwkga2ad38gh4y"))))
     (build-system cmake-build-system)
     (inputs
-     (modify-inputs (package-inputs python-shiboken-2)
+     (modify-inputs inputs
        (replace "qtbase" qtbase)
        (delete "qtxmlpatterns")))
     (arguments
@@ -6574,7 +6574,7 @@ a secure way.")
     (arguments (substitute-keyword-arguments arguments
                  ((#:configure-flags flags #~'())
                   #~(cons "-DBUILD_WITH_QT6=ON" #$flags))))
-    (inputs (modify-inputs (package-inputs packagekit-qt5)
+    (inputs (modify-inputs inputs
               (replace "qtbase" qtbase)))
     (synopsis "Qt6 bindings for PackageKit")
     (description "Provides Qt6 bindings to PackageKit which is a DBUS
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 58ad66caa42..4905199c660 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -403,7 +403,7 @@ code to use the 3M garbage collector.")
     (native-inputs
      (if (%current-target-system)
          (package-native-inputs racket-vm-cgc)
-         (modify-inputs (package-native-inputs racket-vm-cgc)
+         (modify-inputs native-inputs
            (prepend racket-vm-cgc))))
     (arguments
      (substitute-keyword-arguments arguments
@@ -441,7 +441,7 @@ collector, 3M (``Moving Memory Manager'').")
     (inherit racket-vm-bc)
     (name "racket-vm-cs")
     (inputs
-     (let ((inputs (modify-inputs (package-inputs racket-vm-cgc)
+     (let ((inputs (modify-inputs inputs
                      (prepend zlib lz4))))
        (if (nix-system->native-chez-machine-type)
            (modify-inputs inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 929b31d9d93..325934f63dc 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1762,7 +1762,7 @@ users.")
        (sha256
         (base32 "0m9i5k1n6j0nvmsqcy12x2ngqzjvxxlc3jg29igh93hb7lprlkjv"))))
     (native-inputs
-     (modify-inputs (package-native-inputs hamlib)
+     (modify-inputs native-inputs
        (prepend autoconf automake libtool texinfo)))
     (arguments
      `(#:configure-flags '("--disable-shared"
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index e3a883e60df..6d6a76e1fcf 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -895,7 +895,7 @@ Rails generators.  An existing user is @code{rspec-rails}, which uses
     ;; yet.
     (arguments (list #:tests? #f))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs ruby-ammeter-bootstrap)
+     (modify-inputs propagated-inputs
        (append ruby-rspec-rails)))
     (properties
      (alist-delete 'hidden? (package-properties ruby-ammeter-bootstrap)))))
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index d282119b371..6dd3a9ee7e1 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -189,7 +189,7 @@ of parts of the Windows API.")
        (sha256
         (base32 "1fknj2ysm3nj7kz5k8wvxpny0a7bjbi290z9cs7fwrk3yqv454w4"))))
     (inputs
-     (modify-inputs (package-inputs freerdp)
+     (modify-inputs inputs
        (replace "ffmpeg" ffmpeg)
        (prepend fuse icu4c mit-krb5 sdl3 sdl3-gfx sdl3-ttf)))
     (arguments
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index a89a09de057..341b6ba6def 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -4936,5 +4936,5 @@ $(which espanso)}.  On a Guix system, you can define the following in your
       #:install-source? #f
       #:cargo-install-paths ''("espanso")
       #:features '(list "modulo" "vendored-tls" "wayland")))
-    (inputs (modify-inputs (package-inputs espanso-x11)
+    (inputs (modify-inputs inputs
               (append wl-clipboard)))))
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 420142aef68..9dcd82a9c0c 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -128,7 +128,7 @@
        ((#:disallowed-references _ '())
         (list (this-package-native-input "rustc-bootstrap")))))
     (native-inputs
-     (modify-inputs (package-native-inputs base-rust)
+     (modify-inputs native-inputs
        (replace "rustc-bootstrap" base-rust)
        (replace "cargo-bootstrap" (list base-rust "cargo"))))))
 
@@ -907,7 +907,7 @@ safety and thread safety guarantees.")
              ;; Also remove the bundled (mostly Windows) libraries.
              (for-each delete-file
                        (find-files "vendor" "\\.(a|dll|exe|lib)$"))))))
-      (inputs (modify-inputs (package-inputs base-rust)
+      (inputs (modify-inputs inputs
                              (replace "llvm" llvm-15))))))
 
 (define-public rust-1.68
@@ -1153,11 +1153,11 @@ safety and thread safety guarantees.")
            (package-arguments base-rust)))
       (native-inputs
        (if (supported-package? rust-bootstrap-1.74)
-           (modify-inputs (package-native-inputs base-rust)
+           (modify-inputs native-inputs
              (replace "cargo-bootstrap" (list rust-bootstrap-1.74 "cargo"))
              (replace "rustc-bootstrap" rust-bootstrap-1.74))
            (package-native-inputs base-rust)))
-      (inputs (modify-inputs (package-inputs base-rust)
+      (inputs (modify-inputs inputs
                 (replace "llvm" llvm-17))))))
 
 (define-public rust-1.76
@@ -1337,7 +1337,7 @@ safety and thread safety guarantees.")
                    (("\\[llvm\\]") "[llvm]\ndownload-ci-llvm = false")
                    (("\\[rust\\]") "[rust]\ndownload-rustc = false"))))))))
       ;; Need llvm >= 18.0
-      (inputs (modify-inputs (package-inputs base-rust)
+      (inputs (modify-inputs inputs
                              (replace "llvm" llvm-19))))))
 
 (define-public rust-1.84
@@ -1554,7 +1554,7 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
                (("features = \\[\"fs\"" all)
                 (string-append all ", \"use-libc\"")))))))
       (inputs
-       (modify-inputs (package-inputs base-rust)
+       (modify-inputs inputs
          (prepend curl `(,nghttp2 "lib") libffi))))))
 
 (define-public rust-1.90
@@ -1614,7 +1614,7 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
                (("features = \\[\"fs\"" all)
                 (string-append all ", \"use-libc\"")))))))
       (inputs
-       (modify-inputs (package-inputs base-rust)
+       (modify-inputs inputs
          (replace "llvm" llvm-21))))))
 
 (define-public rust-1.91
@@ -2313,18 +2313,18 @@ ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target targe
               (delete 'wrap-rust-analyzer)
               (delete 'wrap-rustc)))))
       (inputs
-       (modify-inputs (package-inputs base-rust)
+       (modify-inputs inputs
          (prepend xz)))                 ; for lzma-sys
       (propagated-inputs
        (if (target-mingw? target)
-           (modify-inputs (package-propagated-inputs base-rust)
+           (modify-inputs propagated-inputs
              (prepend
               (make-mingw-w64
                 (string-take target (string-index target #\-))
                 #:with-winpthreads? #t)))
            (package-propagated-inputs base-rust)))
       (native-inputs
-       (modify-inputs (package-native-inputs base-rust)
+       (modify-inputs native-inputs
          (prepend (cross-gcc target
                              #:libc (cross-libc target)))
          (prepend (if (target-mingw? target)
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index a36d240d70c..695f618f587 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -442,10 +442,10 @@ decompression.")
         #~(modify-phases #$phases
             (delete 'patchelf)))))
     (inputs
-     (modify-inputs (package-inputs recoll)
+     (modify-inputs inputs
        (delete "qtbase")))
     (native-inputs
-     (modify-inputs (package-native-inputs recoll)
+     (modify-inputs native-inputs
        (delete "patchelf" "qttools")))))
 
 (define-public hyperestraier
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index b35470352a2..d0e433b7721 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -696,7 +696,7 @@ functions in virtual scenarios.")
     (build-system pyproject-build-system)
     (arguments '())
     (native-inputs
-     (modify-inputs (package-native-inputs open-simulation-interface)
+     (modify-inputs native-inputs
        (append python-pytest python-setuptools)))
     (propagated-inputs
      (list python-pyyaml
@@ -1218,11 +1218,11 @@ demos = [d for d in demos if d[0].stem not in excludeList]~%"
                                   (install-file file tgt-dir))))
                             (find-files "." ".*\\.(py|gz|xdmf)$")))))))))
     (inputs
-     (modify-inputs (package-inputs fenics-dolfin)
+     (modify-inputs inputs
        (delete "python")
        (prepend pybind11-2 python-matplotlib)))
     (native-inputs
-     (modify-inputs (package-native-inputs fenics-dolfin)
+     (modify-inputs native-inputs
        (prepend cmake-minimal
                 python-decorator
                 python-numpy-1
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 6a505f47141..14dad4fda49 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -354,7 +354,7 @@ Additionally, various channel-specific options can be negotiated.")
   (package
     (inherit openssh)
     (name "openssh-sans-x")
-    (inputs (modify-inputs (package-inputs openssh)
+    (inputs (modify-inputs inputs
               (delete "xauth")))
     (synopsis "OpenSSH client and server without X11 support")))
 
@@ -427,7 +427,7 @@ Additionally, various channel-specific options can be negotiated.")
                                 (string-replace-substring file "/hpn" "/"))))
                    (find-files mandir)))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs openssh)
+     (modify-inputs native-inputs
        (append autoconf automake)))
     (synopsis "High performance SSH/SCP client, and server")
     (description "HPN-SSH is a series of modifications to OpenSSH, the predominant implementation
@@ -439,7 +439,7 @@ of the ssh protocol.  It was originally developed to address performance issues
     (inherit hpn-ssh)
     (name "hpn-ssh-sans-x")
     (inputs
-     (modify-inputs (package-inputs hpn-ssh)
+     (modify-inputs inputs
        (delete "xauth")))
     (synopsis "High performance SSH/SCP client, and server without X11 support")))
 
@@ -525,11 +525,11 @@ libssh library.")
     (inherit guile-ssh)
     (name "guile2.2-ssh")
     (native-inputs
-     (modify-inputs (package-native-inputs guile-ssh)
+     (modify-inputs native-inputs
        (delete "guile")
        (prepend guile-2.2 ;needed when cross-compiling.
                 )))
-    (inputs (modify-inputs (package-inputs guile-ssh)
+    (inputs (modify-inputs inputs
               (replace "guile" guile-2.2)))))
 
 (define-public corkscrew
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 8c47907fdab..b1fba7e64a3 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -518,7 +518,7 @@ drawing.")
                   (substitute* "Makefile"
                     (("git submodule init") "")
                     (("git submodule update") ""))))))))
-      (inputs (modify-inputs (package-inputs st)
+      (inputs (modify-inputs inputs
                 (prepend libxext harfbuzz)))
       (home-page "https://github.com/LukeSmithxyz/st")
       (synopsis "Luke Smith's fork of st")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6763f1ff7bc..01faa63bbc2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -49390,7 +49390,7 @@ distributed as package @code{pTeX-manual}.")
                                "ptekf"))))))))))
     (native-inputs (list pkg-config))
     (inputs
-     (modify-inputs (package-inputs texlive-bin)
+     (modify-inputs inputs
        (append cairo gmp mpfi mpfr texlive-libptexenc texlive-uptex-bin)))
     (home-page (package-home-page texlive-ptex))
     (synopsis "Binaries for @code{texlive-ptex}")
@@ -50680,7 +50680,7 @@ also process original LaTeX with @code{\\inputenc@{utf8@}} and Babel
                                 '("r-upmpost" "updvitomp")))))))))))
     (native-inputs (list pkg-config))
     (inputs
-     (modify-inputs (package-inputs texlive-bin)
+     (modify-inputs inputs
        (append cairo gmp mpfi mpfr texlive-libptexenc)))
     (home-page (package-home-page texlive-uptex))
     (synopsis "Binaries for @code{texlive-uptex}")
@@ -52971,7 +52971,7 @@ MFLua without any modification to produce exactly the same result.")
                     (install-file ".libs/mflua" bin)
                     (install-file ".libs/mflua-nowin" bin)))))))))
     (native-inputs (list pkg-config))
-    (inputs (modify-inputs (package-inputs texlive-bin)
+    (inputs (modify-inputs inputs
               (append potrace)))
     (home-page (package-home-page texlive-mflua))
     (synopsis "Binaries for @code{texlive-mflua}")
@@ -76910,7 +76910,7 @@ than the bitmaps Metafont creates.")
                     (for-each (lambda (link) (symlink "mpost" link))
                               '("dvitomp" "mfplain" "r-mpost"))))))))))
     (native-inputs (list pkg-config))
-    (inputs (modify-inputs (package-inputs texlive-bin)
+    (inputs (modify-inputs inputs
               (append cairo mpfi mpfr)))
     (home-page (package-home-page texlive-metapost))
     (synopsis "Binary for @code{texlive-metapost}")
@@ -97642,7 +97642,7 @@ which is ordinarily processed by a tightly bound processor (called
                     (symlink "xetex" "xelatex")))))))))
     (native-inputs (list pkg-config))
     (inputs
-     (modify-inputs (package-inputs texlive-bin)
+     (modify-inputs inputs
        (append freetype teckit texlive-dvipdfmx-bin)))
     (home-page (package-home-page texlive-xetex))
     (synopsis "Binary for @code{texlive-xetex}")
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 18971ea6a7c..eef029a0d00 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -139,7 +139,7 @@ is on expressing the content semantically, avoiding physical markup commands.")
                          perl
                          perl-text-unidecode
                          perl-unicode-eastasianwidth))
-    (inputs (modify-inputs (package-inputs texinfo)
+    (inputs (modify-inputs inputs
               (append perl-archive-zip  ;needed for 'tex2any --epub3'
                       perl-unicode-eastasianwidth perl-text-unidecode
                       perl-libintl-perl)))
@@ -269,7 +269,7 @@ is on expressing the content semantically, avoiding physical markup commands.")
       (list
        #:disallowed-references (list (this-package-input "perl")))))
     (synopsis "Standalone Info documentation reader")
-    (inputs (modify-inputs (package-inputs texinfo-7)
+    (inputs (modify-inputs inputs
               (prepend gzip)))))
 
 (define-public texi2html
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index b1bad513385..79e6cc622a5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -1412,7 +1412,7 @@ more.")
         (search-patches "texmacs-wayland-hidpi.patch"))))
     (build-system qt-build-system)
     (inputs
-     (modify-inputs (package-inputs texmacs)
+     (modify-inputs inputs
        ;; Replaced by S7 scheme
        ;; TODO: Maybe unbundle S7
        (delete "guile")
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index ec45a42f7e8..acfed15119b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -305,7 +305,7 @@ required structures.")
   ;; to have the choice between GnuTLS with Dane and without Dane.
   (package/inherit gnutls
     (name "gnutls-dane")
-    (inputs (modify-inputs (package-inputs gnutls)
+    (inputs (modify-inputs inputs
               (prepend unbound)))))
 
 (define-public guile-gnutls
@@ -361,10 +361,10 @@ bindings that were formerly provided as part of GnuTLS.")
   (package/inherit guile-gnutls
     (name "guile2.2-gnutls")
     (native-inputs
-     (modify-inputs (package-native-inputs guile-gnutls)
+     (modify-inputs native-inputs
        (replace "guile" guile-2.2)))
     (inputs
-     (modify-inputs (package-inputs guile-gnutls)
+     (modify-inputs inputs
        (replace "guile" guile-2.2)))))
 
 (define (target->openssl-target pkg target)
diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm
index 3b730e4df97..1d0179803ee 100644
--- a/gnu/packages/toolkits.scm
+++ b/gnu/packages/toolkits.scm
@@ -185,7 +185,7 @@ standard operating system features.")
         #~(filter (negate (lambda (x) (string-prefix? "-D" x)))
                   #$flags))))
     (inputs
-     (modify-inputs (package-inputs imgui)
+     (modify-inputs inputs
        (delete "freetype")))))
 
 (define-public nuklear
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 30aa4b23a3b..baf283c7b02 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -920,10 +920,10 @@ Mullvad Browser.")
             (delete 'deploy-tor-assets)
             (delete 'autoconfig-tor)))))
     (inputs
-     (modify-inputs (package-inputs torbrowser)
+     (modify-inputs inputs
        (delete lyrebird)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs torbrowser)
+     (modify-inputs propagated-inputs
        (append ublock-origin/icecat)))
     (home-page "https://mullvad.net/en/browser")
     (synopsis "Privacy-focused web browser")
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index f93c2b8ed58..3893ef0dedf 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -412,14 +412,14 @@ OnionShare.")
                   (apply invoke "xvfb-run" "pytest" "-vv"
                          (find-files "tests" "^test_gui.*\\.py$")))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs onionshare-cli)
+     (modify-inputs native-inputs
        (prepend xvfb-run)))
     (inputs
      ;; The desktop client uses onionshare-cli like a python module.  But
      ;; propagating onionshare-cli's inputs is not great, since a user would
      ;; not expect to have those installed when using onionshare-cli as a
      ;; standalone utility.  So add onionshare-cli's inputs here.
-     (modify-inputs (package-inputs onionshare-cli)
+     (modify-inputs inputs
        (prepend onionshare-cli          ;TODO: package obfs4proxy
                 python-gnupg
                 python-pyside-6
diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 74d578a6073..18064a449b2 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -5262,7 +5262,7 @@ mechanisms and introduces the concepts of order point.")
        #~(modify-phases %standard-phases
            (delete 'sanity-check))))
      (propagated-inputs
-      (modify-inputs (package-propagated-inputs trytond-stock-supply)
+      (modify-inputs propagated-inputs
         (delete "trytond-purchase-request"))))))
 
 (define-public trytond-stock-supply-day
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ff18e396437..9182768cdb6 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -780,7 +780,7 @@ everything from small to very large projects with speed and efficiency.")
                                             package-transitive-propagated-inputs
                                             perl-inputs)))))))))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs git-minimal)
+     (modify-inputs native-inputs
        ;; For documentation.
        (append asciidoc
                docbook2x
@@ -791,7 +791,7 @@ everything from small to very large projects with speed and efficiency.")
                texinfo
                xmlto)))
     (inputs
-     (modify-inputs (package-inputs git-minimal)
+     (modify-inputs inputs
        (append bash-minimal             ;for wrap-program
                python                   ;for git-p4
 
@@ -1888,7 +1888,7 @@ a built-in cache to decrease server I/O pressure.")
                 (invoke "tar" "--strip-components=1" "-C" "git" "-xf"
                         #$(this-package-input "git-source.tar.xz"))))))))
     (inputs
-     (modify-inputs (package-inputs cgit)
+     (modify-inputs inputs
        (replace "git-source.tar.xz"
          ;; cgit-pink is tightly bound to git. Use GIT_VER from the Makefile,
          ;; which may not match the current (package-version git).
@@ -1899,7 +1899,7 @@ a built-in cache to decrease server I/O pressure.")
             (base32
              "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"))))))
     (native-inputs
-     (modify-inputs (package-native-inputs cgit)
+     (modify-inputs native-inputs
        (append gnu-gettext perl)))
     (home-page "https://git.causal.agency/cgit-pink/about/")
     (description "cgit-pink is a fast web interface for the Git SCM, using a
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e2bcdd7bbf9..7e85f0d416f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2032,7 +2032,7 @@ audio/video codec library.")
             phases))
        ((#:configure-flags flags ''())
         #~(fold delete #$flags '("--enable-libplacebo")))))
-    (inputs (modify-inputs (package-inputs ffmpeg-6)
+    (inputs (modify-inputs inputs
               (delete "libplacebo")))))
 
 (define-public ffmpeg-4
@@ -2318,7 +2318,7 @@ audio/video codec library.")
                            "--enable-encoder=mjpeg_vaapi"
                            "--enable-encoder=hevc_vaapi")
                          '())))))
-      (inputs (modify-inputs (package-inputs ffmpeg)
+      (inputs (modify-inputs inputs
                 (append pipewire))))))
 
 (define-public ffmpegthumbnailer
@@ -4213,7 +4213,7 @@ be used for realtime video capture via Linux-specific APIs.")
        ((#:disallowed-references _ '())
         (list qtbase qtbase-5))))                 ;FIXME: most likely useless
     (outputs '("out"))
-    (inputs (modify-inputs (package-inputs v4l-utils)
+    (inputs (modify-inputs inputs
               (delete "qtbase")))))
 
 (define-public obs
@@ -5260,7 +5260,7 @@ Content System specification.")
            (base32
             "1fj3y70cfzh9z33l62zxdb8a2kdvynncn1y09w0ix83r2pqs538c"))
           (patches (search-patches "ffmpeg-svt-av1-v3.patch"))))
-       (inputs (modify-inputs (package-inputs ffmpeg)
+       (inputs (modify-inputs inputs
                  (append zimg)
                  (replace "svt-av1" svt-av1-3)))
        (arguments
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 047a0bcb69e..8e38b84c4d4 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -259,7 +259,7 @@ with the editor vim.")))
                      (zero? (system (string-append xorg-server "/bin/Xvfb "
                                                     display " &")))))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs vim)
+     (modify-inputs native-inputs
        (prepend pkg-config xorg-server-for-tests)))
     (inputs
      `(("acl" ,acl)
@@ -539,7 +539,7 @@ similar to CoqIDE or ProofGeneral.")
     (description "Coqtail enables interactive Coq proof development in Neovim
 similar to CoqIDE or ProofGeneral.")
     (native-inputs
-     (modify-inputs (package-native-inputs vim-coqtail)
+     (modify-inputs native-inputs
        (replace "vim-vader" neovim-vader)
        (append python-minimal)))))
 
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c47fe8348bd..a9e3b2989a4 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -690,11 +690,11 @@ server and embedded PowerPC, and S390 guests.")
                                ((label package output)
                                 (not (string=? "static" output)))
                                (_ input)))
-                           (modify-inputs (package-native-inputs qemu)
+                           (modify-inputs native-inputs
                              (delete "gettext-minimal"
                                      "python-sphinx"
                                      "python-sphinx-rtd-theme"))))
-    (inputs (modify-inputs (package-inputs qemu)
+    (inputs (modify-inputs inputs
               (delete "libusb"
                       "mesa"
                       "sdl2"
@@ -2070,7 +2070,7 @@ client desktops.
   (package/inherit vmware-open-vm-tools
     (name "vmware-open-vm-tools-gtk")
     (inputs
-     (modify-inputs (package-inputs vmware-open-vm-tools)
+     (modify-inputs inputs
        (prepend gdk-pixbuf-xlib
                 gtk+
                 gtkmm-3
@@ -3840,7 +3840,7 @@ disks, resizing disks, and much more.")
 $LDFLAGS += \" -Wl,-rpath=" #$output "/lib \"
 create_header"))))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs libguestfs-minimal)
+     (modify-inputs native-inputs
        (prepend bash-completion
                 gobject-introspection
                 python
@@ -3849,7 +3849,7 @@ create_header"))))))))))
                 vala
                 xorriso)))
     (inputs
-     (modify-inputs (package-inputs libguestfs-minimal)
+     (modify-inputs inputs
        (prepend acl
                 bdb
                 fuse
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b43fd05c67b..8a0714839a0 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8724,7 +8724,7 @@ container.")))
     (inputs
      (list java-eclipse-jetty-util))
     (native-inputs
-     (modify-inputs (package-native-inputs java-eclipse-jetty-util)
+     (modify-inputs native-inputs
        (prepend java-eclipse-jetty-io)))))
 
 (define-public java-eclipse-jetty-xml-9.2
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 2455bf89681..630dd384365 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -308,10 +308,10 @@ propagated by default) such as @code{gst-plugins-good} and
         #~(cons* "-DUSE_GTK4=OFF"
                  (delete "-DUSE_GTK4=ON" #$flags)))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs webkitgtk)
+     (modify-inputs propagated-inputs
        (replace "gtk" gtk+)))
     (inputs
-     (modify-inputs (package-inputs webkitgtk)
+     (modify-inputs inputs
        (prepend libnotify)))))
 
 ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
@@ -324,7 +324,7 @@ propagated by default) such as @code{gst-plugins-good} and
                  ((#:configure-flags flags)
                   #~(cons "-DUSE_SOUP2=ON" #$flags))))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3)
+     (modify-inputs propagated-inputs
        (replace "libsoup" libsoup-minimal-2)))))
 
 (define-public wpewebkit
@@ -343,7 +343,7 @@ propagated by default) such as @code{gst-plugins-good} and
        ((#:configure-flags flags)
         #~(cons "-DPORT=WPE"
                 (delete "-DPORT=GTK" #$flags)))))
-    (inputs (modify-inputs (package-inputs webkitgtk)
+    (inputs (modify-inputs inputs
               (prepend libinput)))
     (synopsis "WebKit port optimized for embedded devices")
     (description "WPE WebKit allows embedders to create simple and performant
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 44d6065b6fb..52eb61e0986 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -164,7 +164,7 @@ integrate Windows applications into your desktop.")
     (inherit wine-minimal)
     (name "wine")
     (native-inputs
-     (modify-inputs (package-native-inputs wine-minimal)
+     (modify-inputs native-inputs
        (prepend gettext-minimal perl pkg-config)))
     (inputs
      ;; Some libraries like libjpeg are now compiled into native PE objects.
@@ -217,7 +217,7 @@ integrate Windows applications into your desktop.")
   (package
     (inherit wine)
     (name "wine64")
-    (inputs (modify-inputs (package-inputs wine)
+    (inputs (modify-inputs inputs
               (prepend wine)))
     (arguments
      (substitute-keyword-arguments
@@ -299,7 +299,7 @@ integrate Windows applications into your desktop.")
          (file-name (string-append name "-" wine-version ".tar.xz"))
          (sha256
           (base32 "0087dr25h0wxvclacnnvx70q296976gxfj2lzw6wc7rwjdbnhyn0")))))
-    (inputs (modify-inputs (package-inputs wine)
+    (inputs (modify-inputs inputs
               (prepend autoconf ; for autoreconf
                        ffmpeg
                        gtk+
@@ -309,7 +309,7 @@ integrate Windows applications into your desktop.")
                        util-linux ; for hexdump
                        wine-staging-patchset-data)))
     (native-inputs
-     (modify-inputs (package-native-inputs wine)
+     (modify-inputs native-inputs
        (prepend python-3)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -347,7 +347,7 @@ integrated into the main branch.")
   (package
     (inherit wine-staging)
     (name "wine64-staging")
-    (inputs (modify-inputs (package-inputs wine-staging)
+    (inputs (modify-inputs inputs
               (prepend wine-staging)))
     (arguments
      (substitute-keyword-arguments (package-arguments wine64)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 99b75f608e3..e40753424e6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -344,7 +344,7 @@ the @code{.../share/quickshell} path in the package.")
     (inherit dank-material-shell-minimal)
     (name "dank-material-shell")
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs dank-material-shell-minimal)
+     (modify-inputs propagated-inputs
        (append dbus
                brightnessctl
                cava
@@ -2814,7 +2814,7 @@ modules for building a Wayland compositor.")
        (file-name (git-file-name "wlroots" version))
        (sha256
         (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))
-    (propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
+    (propagated-inputs (modify-inputs propagated-inputs
                          (delete libdisplay-info)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -4192,7 +4192,7 @@ wasting your precious memory.")
                  (base32
                   "0588g37h18lv50h7w8vfbwhvc3iajh7sdr53848spaif99nh3mh4"))))
       (inputs
-       (modify-inputs (package-inputs lemonbar)
+       (modify-inputs inputs
          (prepend freetype libxft libx11)))
       (arguments
        (substitute-keyword-arguments arguments
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 3563e26385c..ac8c3723801 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -179,7 +179,7 @@ and many other languages.")
 (define-public wxwidgets-gtk2
   (package/inherit wxwidgets
     (name "wxwidgets-gtk2")
-    (inputs (modify-inputs (package-inputs wxwidgets)
+    (inputs (modify-inputs inputs
               (delete "gtk+")
               (prepend gtk+-2)))
     (arguments
@@ -265,7 +265,7 @@ and many other languages.")
          (sha256
           (base32
            "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv"))))
-      (native-inputs (modify-inputs (package-native-inputs wxwidgets-sans-egl)
+      (native-inputs (modify-inputs native-inputs
                        (prepend nanosvg)))
       (arguments
        (substitute-keyword-arguments arguments
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 55d26850f09..d9db315e049 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -4467,7 +4467,7 @@ on the screen and which then writes out the necessary C code for it.")
 (define-public xforms-gl
   (package/inherit xforms
     (name "xforms-gl")
-    (propagated-inputs (modify-inputs (package-propagated-inputs xforms)
+    (propagated-inputs (modify-inputs propagated-inputs
                          (append mesa)))
     (synopsis
      "GUI toolkit for X based on the X11 Xlib library, with OpenGL support")))
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 776a06f3725..ed2fe1a4e6b 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1284,7 +1284,7 @@ Libxml2).")
   (package/inherit xmlsec
     (name "xmlsec-nss")
     (native-inputs
-     (modify-inputs (package-native-inputs xmlsec)
+     (modify-inputs native-inputs
        (prepend `(,nss "bin"))))        ;certutil, for tests
     (inputs
      (list nss libltdl))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 608a24f9fbc..f045add4d84 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5569,7 +5569,7 @@ used to connect to VNC servers such as the tigervnc-server package.")
                 xauth
                 xinit)))
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs xorg-server)
+     (modify-inputs propagated-inputs
        (prepend xauth)))
     (synopsis "High-performance VNC remote desktop server based on Xorg")
     (description "TigerVNC implements a @acronym{VNC, Virtual Network Computing}
@@ -6735,7 +6735,7 @@ and embedded platforms.")
   (package/inherit uim
     (name "uim-gtk")
     (inputs
-     (modify-inputs (package-inputs uim)
+     (modify-inputs inputs
        (prepend gtk+)))
     (arguments
      (substitute-keyword-arguments arguments
@@ -7121,7 +7121,7 @@ the server and cleaning up before returning the exit status of the command.")
         (sha256
          (base32 "1073m4gzn8yv9kn70fbyq8a2xckgz0wljjr2w7i2bsrg767h29gd"))))
      (inputs
-      (modify-inputs (package-inputs xvfb-run)
+      (modify-inputs inputs
         (replace "xorg-server" xorg-server-for-tests))))))
 
 (define-public xwayland-run
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 11d17e527ad..6668c0fd90a 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -636,7 +636,7 @@ Language Server Protocol} for the Zig programming language.")
                   "1dbg06v136yjcs9grc6xwsmv0cm39c0sdkh5vzn7h1qxxka6ixlp"))))
       (build-system zig-build-system)
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" zig-0.13))))))
 
 (define-public zig-zls-0.14
@@ -665,10 +665,10 @@ Language Server Protocol} for the Zig programming language.")
              #:zig-release-type "safe"
              #:zig-build-flags ''("-Dpie")))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" zig-0.14)))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (prepend zig-lsp-codegen)
          (replace "zig-diffz" zig-diffz-for-zig-zls-0.14)
          (replace "zig-known-folders" zig-known-folders-for-zig-0.14))))))
@@ -694,10 +694,10 @@ Language Server Protocol} for the Zig programming language.")
                     ("known_folders" . "zig-known-folders")
                     ("lsp_kit" . "zig-lsp-kit"))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" zig-0.15)))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (prepend zig-lsp-kit-for-zls-0.15)
          (delete "zig-lsp-codegen")
          (replace "zig-diffz" zig-diffz-for-zls-0.15)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 089305ef8a5..60f8eb3998c 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -418,7 +418,7 @@ toolchain.  Among other features it provides
                                 (string-append #$output:zig1 "/bin"))))
               (delete 'install-glibc-abilists)))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (prepend binaryen)
          (delete "glibc-abi-tool")))
       (outputs '("out" "zig1")))))
@@ -472,7 +472,7 @@ toolchain.  Among other features it provides
               (delete 'backup-source)
               (delete 'restore-source)))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (prepend `(,base "zig1")))))))
 
 ;; Supply zig1.wasm.zst, build zig2 + zig1.wasm, install zig2 + zig1.wasm.
@@ -503,7 +503,7 @@ toolchain.  Among other features it provides
                   (install-file "stage1/zig1.wasm"
                                 (string-append #$output:zig1 "/bin"))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (prepend zstd)
          (replace "zig" `(,base "zig1")))))))
 
@@ -537,7 +537,7 @@ toolchain.  Among other features it provides
               (delete 'build)
               (delete 'install)))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out"))
          (delete "zstd"))))))
 
@@ -566,7 +566,7 @@ toolchain.  Among other features it provides
                                 "stage1")
                   (make-file-writable "stage1/zig1.wasm")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 ;; Supply zig1.wasm, build zig2, install zig2.
@@ -588,7 +588,7 @@ toolchain.  Among other features it provides
               (delete 'build-zig1)
               (delete 'install-zig1)))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-853
@@ -611,7 +611,7 @@ toolchain.  Among other features it provides
                 (lambda _
                   (invoke "zig2" "build" "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-961
@@ -628,7 +628,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-962
@@ -645,7 +645,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-1027
@@ -662,7 +662,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 ;; Supply zig2, build zig1.wasm + zig2, install zig2.
@@ -687,7 +687,7 @@ toolchain.  Among other features it provides
                           "update-zig1" "--verbose")))
               (delete 'prepare-source)))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-1497
@@ -704,7 +704,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-1505-source
@@ -741,7 +741,7 @@ toolchain.  Among other features it provides
                   (invoke "./zig2" "build" "--zig-lib-dir" "lib"
                           "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-1637-source
@@ -781,7 +781,7 @@ toolchain.  Among other features it provides
                   (invoke "./zig2" "build" "--zig-lib-dir" "lib"
                           "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-1657
@@ -798,7 +798,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-1681
@@ -815,7 +815,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-1712
@@ -832,7 +832,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-1713
@@ -849,7 +849,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-1888
@@ -866,7 +866,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-1891
@@ -883,7 +883,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-2558
@@ -900,11 +900,11 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (replace "clang" clang-16)
          (replace "lld" lld-16)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "llvm" llvm-16)
          (replace "zig" `(,base "zig1"))))
       (properties `((max-silent-time . 9600)
@@ -939,7 +939,7 @@ toolchain.  Among other features it provides
                     (copy-file (in-vicinity #+zig-0.10.0-2565-source path)
                                path))))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-2571
@@ -956,7 +956,7 @@ toolchain.  Among other features it provides
       ;; zig2+zig1
       (arguments (package-arguments zig-0.10.0-748))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-2796-source
@@ -989,7 +989,7 @@ toolchain.  Among other features it provides
                    (string-append #+zig-0.10.0-2796-source "/lib")
                    "lib")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-2824-source
@@ -1029,7 +1029,7 @@ toolchain.  Among other features it provides
                   (delete-file-recursively "lib")
                   (copy-recursively "../lib-backup" "lib")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-3660
@@ -1046,7 +1046,7 @@ toolchain.  Among other features it provides
       ;; zig2+zig1
       (arguments (package-arguments zig-0.10.0-748))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-3726
@@ -1063,7 +1063,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-3728
@@ -1080,7 +1080,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-3807
@@ -1097,7 +1097,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.10.0-3813
@@ -1114,7 +1114,7 @@ toolchain.  Among other features it provides
       ;; zig2+zig1
       (arguments (package-arguments zig-0.10.0-748))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-3980
@@ -1131,7 +1131,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.10.0-3985
@@ -1148,7 +1148,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11-glibc-abi-tool
@@ -1260,7 +1260,7 @@ toolchain.  Among other features it provides
                   (invoke "zig" "build" "--zig-lib-dir" "lib"
                           "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-384
@@ -1277,7 +1277,7 @@ toolchain.  Among other features it provides
       ;; zig2+zig1
       (arguments (package-arguments zig-0.10.0-748))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-494
@@ -1294,11 +1294,11 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (replace "clang" clang-17)
          (replace "lld" lld-17)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "llvm" llvm-17)
          (replace "zig" `(,base "zig1"))))
       (properties `((max-silent-time . 9600)
@@ -1318,7 +1318,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-631
@@ -1335,7 +1335,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-638
@@ -1352,7 +1352,7 @@ toolchain.  Among other features it provides
       ;; zig1+zig2
       (arguments (package-arguments zig-0.10.0-1073))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-702
@@ -1375,7 +1375,7 @@ toolchain.  Among other features it provides
                 (lambda _
                   (invoke "zig2" "build" "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-761
@@ -1392,7 +1392,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-1967
@@ -1409,7 +1409,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-3245
@@ -1426,7 +1426,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-3344
@@ -1449,7 +1449,7 @@ toolchain.  Among other features it provides
                 (lambda _
                   (invoke "zig2" "build" "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-3501
@@ -1466,7 +1466,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-3503
@@ -1483,7 +1483,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.11.0-3506
@@ -1500,7 +1500,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.11.0-3604
@@ -1517,7 +1517,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.12-glibc-abi-tool
@@ -1599,7 +1599,7 @@ toolchain.  Among other features it provides
                   (invoke "zig" "build" "--zig-lib-dir" "lib"
                           "update-zig1" "--verbose")))))))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13-glibc-abi-tool
@@ -1659,7 +1659,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.13.0-503
@@ -1676,7 +1676,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13.0-1323
@@ -1693,7 +1693,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.13.0-1528
@@ -1710,7 +1710,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13.0-1951
@@ -1736,11 +1736,11 @@ toolchain.  Among other features it provides
                   (substitute* "src/zig_llvm.cpp"
                     ((".*LastEnvironmentType.*") ""))))))))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (replace "clang" clang-19)
          (replace "lld" lld-19)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "llvm" llvm-19)
          (replace "zig" `(,base "zig1"))))
       (properties `((max-silent-time . 9600)
@@ -1760,7 +1760,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13.0-2795
@@ -1777,7 +1777,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.13.0-2899
@@ -1794,7 +1794,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13.0-2924
@@ -1811,7 +1811,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.13.0-2925
@@ -1828,7 +1828,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.13.0-3252
@@ -1845,7 +1845,7 @@ toolchain.  Among other features it provides
       ;; zig2+zig1
       (arguments (package-arguments zig-0.10.0-748))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.14-glibc-abi-tool
@@ -1910,11 +1910,11 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (inputs
-       (modify-inputs (package-inputs base)
+       (modify-inputs inputs
          (replace "clang" clang-20)
          (replace "lld" lld-20)))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "llvm" llvm-20)
          (replace "zig" `(,base "zig1"))))
       (properties `((max-silent-time . 9600)
@@ -1934,7 +1934,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.14.0-930
@@ -1951,7 +1951,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.14.0-934
@@ -1968,7 +1968,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.14.0-1091
@@ -1985,7 +1985,7 @@ toolchain.  Among other features it provides
       ;; zig2
       (arguments (package-arguments zig-0.10.0-851))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "zig1")))))))
 
 (define zig-0.14.0-1197
@@ -2002,7 +2002,7 @@ toolchain.  Among other features it provides
       ;; zig1
       (arguments (package-arguments zig-0.10.0-747))
       (native-inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs native-inputs
          (replace "zig" `(,base "out")))))))
 
 (define zig-0.15-libc-abi-tools
diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index b5cf260ee75..ce6cdce0cf5 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -124,7 +124,7 @@ default Emacs configuration, but it carries a much lighter feature set.")
                   "0wlli8hqal9ikmbl3a49kyhzyf164jk6mdbir3bclq2gxszs532d"))
                 (file-name (string-append name "-" version "-checkout"))))
       (inputs
-       (modify-inputs (package-inputs zile)
+       (modify-inputs inputs
          (prepend guile-2.0)))
       (native-inputs
        `(("m4" ,m4)                               ;for 'bootstrap'