diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-03-07 11:19:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-03-20 13:27:15 +0100 |
| commit | 2a50c9598bb7fe4175c4f29df07656a7f0a07801 (patch) | |
| tree | 90e02e712b28397979c06d3fe1cf9ca6be201871 /gnu/packages/linux.scm | |
| parent | a7c8e68dc51144a6d3981b770aca9c4897fc7c0c (diff) | |
gnu: Reference the inherited ‘arguments’ value.
This commit was made by running this command:
sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm
… and then:
1. reverting changes from ‘gnu/packages/rust.scm’ and
‘gnu/packages/java.scm’ since they would incur derivation changes and/or
breakage;
2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
which use ‘substitute-keyword-arguments’ for arguments that are not
inherited (and thus ‘arguments’ would be unbound);
4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
which make bogus assumptions about inherited arguments.
Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5310d1bd9b1..73d1ce13d1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm | |||
| @@ -2099,7 +2099,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) | |||
| 2099 | (description (string-append (package-description base) | 2099 | (description (string-append (package-description base) |
| 2100 | " Configuration options and patches have been applied for use with MNT/Reform systems.")) | 2100 | " Configuration options and patches have been applied for use with MNT/Reform systems.")) |
| 2101 | (arguments | 2101 | (arguments |
| 2102 | (substitute-keyword-arguments (package-arguments base) | 2102 | (substitute-keyword-arguments arguments |
| 2103 | ((#:phases phases) | 2103 | ((#:phases phases) |
| 2104 | #~(modify-phases #$phases | 2104 | #~(modify-phases #$phases |
| 2105 | (add-after 'unpack 'apply-reform-patches | 2105 | (add-after 'unpack 'apply-reform-patches |
| @@ -2434,7 +2434,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) | |||
| 2434 | (description (string-append (package-description base) | 2434 | (description (string-append (package-description base) |
| 2435 | " Configuration options and patches have been applied for use with MNT/Reform systems.")) | 2435 | " Configuration options and patches have been applied for use with MNT/Reform systems.")) |
| 2436 | (arguments | 2436 | (arguments |
| 2437 | (substitute-keyword-arguments (package-arguments base) | 2437 | (substitute-keyword-arguments arguments |
| 2438 | ((#:phases phases) | 2438 | ((#:phases phases) |
| 2439 | #~(modify-phases #$phases | 2439 | #~(modify-phases #$phases |
| 2440 | (add-after 'unpack 'apply-reform-patches | 2440 | (add-after 'unpack 'apply-reform-patches |
| @@ -4124,7 +4124,7 @@ module.") | |||
| 4124 | (package (inherit e2fsprogs) | 4124 | (package (inherit e2fsprogs) |
| 4125 | (arguments | 4125 | (arguments |
| 4126 | ;; Do not build shared libraries. | 4126 | ;; Do not build shared libraries. |
| 4127 | (substitute-keyword-arguments (package-arguments e2fsprogs) | 4127 | (substitute-keyword-arguments arguments |
| 4128 | ((#:configure-flags _) | 4128 | ((#:configure-flags _) |
| 4129 | '(list "--disable-blkid" "--disable-fuse2fs")) | 4129 | '(list "--disable-blkid" "--disable-fuse2fs")) |
| 4130 | ((#:make-flags _) | 4130 | ((#:make-flags _) |
| @@ -5368,7 +5368,7 @@ user-space processes.") | |||
| 5368 | (sha256 | 5368 | (sha256 |
| 5369 | (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp")))) | 5369 | (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp")))) |
| 5370 | (arguments | 5370 | (arguments |
| 5371 | (substitute-keyword-arguments (package-arguments fuse) | 5371 | (substitute-keyword-arguments arguments |
| 5372 | ((#:configure-flags original-flags #~(list)) | 5372 | ((#:configure-flags original-flags #~(list)) |
| 5373 | #~(append #$original-flags '("--default-library=static"))))))) | 5373 | #~(append #$original-flags '("--default-library=static"))))))) |
| 5374 | 5374 | ||
| @@ -5430,7 +5430,7 @@ UnionFS-FUSE additionally supports copy-on-write.") | |||
| 5430 | (("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)") "0") | 5430 | (("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)") "0") |
| 5431 | (("/bin/") "")))))) | 5431 | (("/bin/") "")))))) |
| 5432 | (arguments | 5432 | (arguments |
| 5433 | (substitute-keyword-arguments (package-arguments fuse) | 5433 | (substitute-keyword-arguments arguments |
| 5434 | ((#:configure-flags flags '()) | 5434 | ((#:configure-flags flags '()) |
| 5435 | #~(cons "-Ddefault_library=static" | 5435 | #~(cons "-Ddefault_library=static" |
| 5436 | #$flags)))))) | 5436 | #$flags)))))) |
| @@ -5451,7 +5451,7 @@ UnionFS-FUSE additionally supports copy-on-write.") | |||
| 5451 | (string-append "target_link_libraries" | 5451 | (string-append "target_link_libraries" |
| 5452 | libs " dl)"))))))) | 5452 | libs " dl)"))))))) |
| 5453 | (arguments | 5453 | (arguments |
| 5454 | (substitute-keyword-arguments (package-arguments unionfs-fuse) | 5454 | (substitute-keyword-arguments arguments |
| 5455 | ((#:configure-flags flags #~'()) | 5455 | ((#:configure-flags flags #~'()) |
| 5456 | #~(cons "-DCMAKE_EXE_LINKER_FLAGS=-static" #$flags)) | 5456 | #~(cons "-DCMAKE_EXE_LINKER_FLAGS=-static" #$flags)) |
| 5457 | ((#:phases phases #~%standard-phases) | 5457 | ((#:phases phases #~%standard-phases) |
| @@ -5663,7 +5663,7 @@ for systems using the Linux kernel. This includes commands such as | |||
| 5663 | (inherit kbd) | 5663 | (inherit kbd) |
| 5664 | (name "loadkeys-static") | 5664 | (name "loadkeys-static") |
| 5665 | (arguments | 5665 | (arguments |
| 5666 | (substitute-keyword-arguments (package-arguments kbd) | 5666 | (substitute-keyword-arguments arguments |
| 5667 | ((#:configure-flags flags ''()) | 5667 | ((#:configure-flags flags ''()) |
| 5668 | `(append '("LDFLAGS=-static" "--disable-shared" "--disable-nls" | 5668 | `(append '("LDFLAGS=-static" "--disable-shared" "--disable-nls" |
| 5669 | "--disable-vlock" ;so we don't need libpam | 5669 | "--disable-vlock" ;so we don't need libpam |
| @@ -6154,7 +6154,7 @@ mapper. Kernel components are part of Linux-libre.") | |||
| 6154 | ("udev:static" ,eudev "static"))) | 6154 | ("udev:static" ,eudev "static"))) |
| 6155 | 6155 | ||
| 6156 | (arguments | 6156 | (arguments |
| 6157 | (substitute-keyword-arguments (package-arguments lvm2) | 6157 | (substitute-keyword-arguments arguments |
| 6158 | ((#:configure-flags flags '()) | 6158 | ((#:configure-flags flags '()) |
| 6159 | ;; LVM2 doesn't use Libtool, hence the custom option. | 6159 | ;; LVM2 doesn't use Libtool, hence the custom option. |
| 6160 | `(append '("--enable-static_link") | 6160 | `(append '("--enable-static_link") |
| @@ -6573,7 +6573,7 @@ SMBus access.") | |||
| 6573 | (sha256 | 6573 | (sha256 |
| 6574 | (base32 "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv")))) | 6574 | (base32 "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv")))) |
| 6575 | (arguments | 6575 | (arguments |
| 6576 | (substitute-keyword-arguments (package-arguments i2c-tools) | 6576 | (substitute-keyword-arguments arguments |
| 6577 | ((#:make-flags _) | 6577 | ((#:make-flags _) |
| 6578 | #~(list (string-append "prefix=" #$output) | 6578 | #~(list (string-append "prefix=" #$output) |
| 6579 | (string-append "CC=" #$(cc-for-target)))))))) | 6579 | (string-append "CC=" #$(cc-for-target)))))))) |
| @@ -7255,7 +7255,7 @@ arrays when needed.") | |||
| 7255 | (inherit mdadm) | 7255 | (inherit mdadm) |
| 7256 | (name "mdadm-static") | 7256 | (name "mdadm-static") |
| 7257 | (arguments | 7257 | (arguments |
| 7258 | (substitute-keyword-arguments (package-arguments mdadm) | 7258 | (substitute-keyword-arguments arguments |
| 7259 | ((#:make-flags flags) | 7259 | ((#:make-flags flags) |
| 7260 | #~(cons* "LDFLAGS = -static" | 7260 | #~(cons* "LDFLAGS = -static" |
| 7261 | "CXFLAGS = -DNO_LIBUDEV" | 7261 | "CXFLAGS = -DNO_LIBUDEV" |
| @@ -8385,7 +8385,7 @@ The package provides additional NTFS tools.") | |||
| 8385 | (inherit ntfs-3g) | 8385 | (inherit ntfs-3g) |
| 8386 | (name "ntfs-3g-static") | 8386 | (name "ntfs-3g-static") |
| 8387 | (arguments | 8387 | (arguments |
| 8388 | (substitute-keyword-arguments (package-arguments ntfs-3g) | 8388 | (substitute-keyword-arguments arguments |
| 8389 | ((#:configure-flags flags) | 8389 | ((#:configure-flags flags) |
| 8390 | `(append ,flags | 8390 | `(append ,flags |
| 8391 | (list "--enable-really-static" | 8391 | (list "--enable-really-static" |
| @@ -10256,7 +10256,7 @@ available in the kernel Linux.") | |||
| 10256 | "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)") | 10256 | "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)") |
| 10257 | (inputs `(("talloc" ,talloc/static))) | 10257 | (inputs `(("talloc" ,talloc/static))) |
| 10258 | (arguments | 10258 | (arguments |
| 10259 | (substitute-keyword-arguments (package-arguments proot) | 10259 | (substitute-keyword-arguments arguments |
| 10260 | ((#:make-flags flags) | 10260 | ((#:make-flags flags) |
| 10261 | `(cons "LDFLAGS = -ltalloc -static -static-libgcc" ,flags)) | 10261 | `(cons "LDFLAGS = -ltalloc -static -static-libgcc" ,flags)) |
| 10262 | ((#:phases phases) | 10262 | ((#:phases phases) |
| @@ -11101,7 +11101,7 @@ file systems.") | |||
| 11101 | (base32 | 11101 | (base32 |
| 11102 | "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l")))) | 11102 | "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l")))) |
| 11103 | (arguments | 11103 | (arguments |
| 11104 | (substitute-keyword-arguments (package-arguments xfsprogs) | 11104 | (substitute-keyword-arguments arguments |
| 11105 | ((#:configure-flags configure-flags '()) | 11105 | ((#:configure-flags configure-flags '()) |
| 11106 | `(cons "--enable-gettext=no" | 11106 | `(cons "--enable-gettext=no" |
| 11107 | ,configure-flags)))) | 11107 | ,configure-flags)))) |
| @@ -11115,7 +11115,7 @@ file systems.") | |||
| 11115 | (name "xfsprogs-static") | 11115 | (name "xfsprogs-static") |
| 11116 | (outputs (list "out")) | 11116 | (outputs (list "out")) |
| 11117 | (arguments | 11117 | (arguments |
| 11118 | (substitute-keyword-arguments (package-arguments xfsprogs) | 11118 | (substitute-keyword-arguments arguments |
| 11119 | ((#:configure-flags configure-flags '()) | 11119 | ((#:configure-flags configure-flags '()) |
| 11120 | `(append ,configure-flags | 11120 | `(append ,configure-flags |
| 11121 | (list "--enable-static"))) | 11121 | (list "--enable-static"))) |
| @@ -11618,7 +11618,7 @@ tools for managing PipeWire.") | |||
| 11618 | (inherit base) | 11618 | (inherit base) |
| 11619 | (name "wireplumber-minimal") | 11619 | (name "wireplumber-minimal") |
| 11620 | (arguments | 11620 | (arguments |
| 11621 | (substitute-keyword-arguments (package-arguments base) | 11621 | (substitute-keyword-arguments arguments |
| 11622 | ((#:configure-flags flags ''()) | 11622 | ((#:configure-flags flags ''()) |
| 11623 | #~(cons "-Delogind=disabled" #$flags)))) | 11623 | #~(cons "-Delogind=disabled" #$flags)))) |
| 11624 | (inputs | 11624 | (inputs |
| @@ -12648,7 +12648,7 @@ work properly.") | |||
| 12648 | firejail | 12648 | firejail |
| 12649 | (name "firejail-disable-sandbox-check") | 12649 | (name "firejail-disable-sandbox-check") |
| 12650 | (arguments | 12650 | (arguments |
| 12651 | (substitute-keyword-arguments (package-arguments firejail) | 12651 | (substitute-keyword-arguments arguments |
| 12652 | ((#:configure-flags flags #~'()) | 12652 | ((#:configure-flags flags #~'()) |
| 12653 | #~(append #$flags | 12653 | #~(append #$flags |
| 12654 | (list "--disable-sandbox-check"))))) | 12654 | (list "--disable-sandbox-check"))))) |
