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/embedded.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/embedded.scm')
| -rw-r--r-- | gnu/packages/embedded.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index b69a54b1332..0d06e7c41e4 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm | |||
| @@ -168,7 +168,7 @@ embedded-4_9-branch/") | |||
| 168 | ("gcc@5" ,gcc-5) | 168 | ("gcc@5" ,gcc-5) |
| 169 | ,@(package-native-inputs xgcc))) | 169 | ,@(package-native-inputs xgcc))) |
| 170 | (arguments | 170 | (arguments |
| 171 | (substitute-keyword-arguments (package-arguments xgcc) | 171 | (substitute-keyword-arguments arguments |
| 172 | ((#:phases phases) | 172 | ((#:phases phases) |
| 173 | #~(modify-phases #$phases | 173 | #~(modify-phases #$phases |
| 174 | (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH | 174 | (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH |
| @@ -285,7 +285,7 @@ usable on embedded products.") | |||
| 285 | (inherit base) | 285 | (inherit base) |
| 286 | (name "newlib-nano") | 286 | (name "newlib-nano") |
| 287 | (arguments | 287 | (arguments |
| 288 | (substitute-keyword-arguments (package-arguments base) | 288 | (substitute-keyword-arguments arguments |
| 289 | ;; The configure flags are identical to the flags used by the "GCC | 289 | ;; The configure flags are identical to the flags used by the "GCC |
| 290 | ;; ARM embedded" project. They optimize newlib for use on small | 290 | ;; ARM embedded" project. They optimize newlib for use on small |
| 291 | ;; embedded systems with limited memory. | 291 | ;; embedded systems with limited memory. |
| @@ -378,7 +378,7 @@ embedded-7-branch/") | |||
| 378 | (delete "isl") | 378 | (delete "isl") |
| 379 | (prepend flex isl-0.18))) | 379 | (prepend flex isl-0.18))) |
| 380 | (arguments | 380 | (arguments |
| 381 | (substitute-keyword-arguments (package-arguments xgcc) | 381 | (substitute-keyword-arguments arguments |
| 382 | ((#:phases phases) | 382 | ((#:phases phases) |
| 383 | #~(modify-phases #$phases | 383 | #~(modify-phases #$phases |
| 384 | (add-after 'unpack 'expand-version-string | 384 | (add-after 'unpack 'expand-version-string |
| @@ -463,7 +463,7 @@ embedded-7-branch/") | |||
| 463 | (base32 | 463 | (base32 |
| 464 | "1dq23fqrk75g1a4v7569fvnnw5q440zawbxi3w0g05n8jlqsmvcy")))) | 464 | "1dq23fqrk75g1a4v7569fvnnw5q440zawbxi3w0g05n8jlqsmvcy")))) |
| 465 | (arguments | 465 | (arguments |
| 466 | (substitute-keyword-arguments (package-arguments base) | 466 | (substitute-keyword-arguments arguments |
| 467 | ;; The configure flags are identical to the flags used by the "GCC | 467 | ;; The configure flags are identical to the flags used by the "GCC |
| 468 | ;; ARM embedded" project. | 468 | ;; ARM embedded" project. |
| 469 | ((#:configure-flags flags) | 469 | ((#:configure-flags flags) |
| @@ -517,7 +517,7 @@ embedded-7-branch/") | |||
| 517 | (delete "isl") | 517 | (delete "isl") |
| 518 | (prepend flex isl-0.18))) | 518 | (prepend flex isl-0.18))) |
| 519 | (arguments | 519 | (arguments |
| 520 | (substitute-keyword-arguments (package-arguments xgcc) | 520 | (substitute-keyword-arguments arguments |
| 521 | ((#:phases phases) | 521 | ((#:phases phases) |
| 522 | #~(modify-phases #$phases | 522 | #~(modify-phases #$phases |
| 523 | (add-after 'unpack 'expand-version-string | 523 | (add-after 'unpack 'expand-version-string |
| @@ -602,7 +602,7 @@ embedded-7-branch/") | |||
| 602 | (base32 | 602 | (base32 |
| 603 | "095j23mg928rmf4yqmj39wc0nsd207liqrdw4ygh58nygsm4gpmh")))) | 603 | "095j23mg928rmf4yqmj39wc0nsd207liqrdw4ygh58nygsm4gpmh")))) |
| 604 | (arguments | 604 | (arguments |
| 605 | (substitute-keyword-arguments (package-arguments base) | 605 | (substitute-keyword-arguments arguments |
| 606 | ;; The configure flags are identical to the flags used by the "GCC | 606 | ;; The configure flags are identical to the flags used by the "GCC |
| 607 | ;; ARM embedded" project. | 607 | ;; ARM embedded" project. |
| 608 | ((#:configure-flags flags) | 608 | ((#:configure-flags flags) |
| @@ -645,7 +645,7 @@ embedded-7-branch/") | |||
| 645 | (sha256 | 645 | (sha256 |
| 646 | (base32 "0r6q0m3d8g3k3rkmnqjw8aw5fcnsrmywf4ispdkxmk1al3whk1vk")))) | 646 | (base32 "0r6q0m3d8g3k3rkmnqjw8aw5fcnsrmywf4ispdkxmk1al3whk1vk")))) |
| 647 | (arguments | 647 | (arguments |
| 648 | (substitute-keyword-arguments (package-arguments base) | 648 | (substitute-keyword-arguments arguments |
| 649 | ((#:phases phases) | 649 | ((#:phases phases) |
| 650 | #~(modify-phases #$phases | 650 | #~(modify-phases #$phases |
| 651 | (replace 'expand-version-string | 651 | (replace 'expand-version-string |
| @@ -685,7 +685,7 @@ embedded-7-branch/") | |||
| 685 | (sha256 | 685 | (sha256 |
| 686 | (base32 | 686 | (base32 |
| 687 | "0drs9v8avh4y2h5bs0ixjn9x662jzkkikx8z034wgl41dxmn6786")))) | 687 | "0drs9v8avh4y2h5bs0ixjn9x662jzkkikx8z034wgl41dxmn6786")))) |
| 688 | (arguments (substitute-keyword-arguments (package-arguments base) | 688 | (arguments (substitute-keyword-arguments arguments |
| 689 | ((#:configure-flags flags) | 689 | ((#:configure-flags flags) |
| 690 | #~(cons* "--enable-newlib-mb" | 690 | #~(cons* "--enable-newlib-mb" |
| 691 | "--enable-newlib-reent-check-verify" | 691 | "--enable-newlib-reent-check-verify" |
| @@ -761,7 +761,7 @@ embedded-7-branch/") | |||
| 761 | (package | 761 | (package |
| 762 | (inherit base) | 762 | (inherit base) |
| 763 | (name "libstdc++-nano-arm-none-eabi") | 763 | (name "libstdc++-nano-arm-none-eabi") |
| 764 | (arguments (substitute-keyword-arguments (package-arguments base) | 764 | (arguments (substitute-keyword-arguments arguments |
| 765 | ((#:make-flags flags) | 765 | ((#:make-flags flags) |
| 766 | #~(map (lambda (flag) | 766 | #~(map (lambda (flag) |
| 767 | (if (or (string-prefix? "CFLAGS=" flag) | 767 | (if (or (string-prefix? "CFLAGS=" flag) |
| @@ -902,7 +902,7 @@ languages are C and C++.") | |||
| 902 | (inherit gdb) | 902 | (inherit gdb) |
| 903 | (name "gdb-arm-none-eabi") | 903 | (name "gdb-arm-none-eabi") |
| 904 | (arguments | 904 | (arguments |
| 905 | (substitute-keyword-arguments (package-arguments gdb) | 905 | (substitute-keyword-arguments arguments |
| 906 | ((#:configure-flags flags '()) | 906 | ((#:configure-flags flags '()) |
| 907 | #~(cons* "--target=arm-none-eabi" | 907 | #~(cons* "--target=arm-none-eabi" |
| 908 | "--enable-multilib" | 908 | "--enable-multilib" |
| @@ -1069,7 +1069,7 @@ with a layered architecture of JTAG interface and TAP support.") | |||
| 1069 | "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck")) | 1069 | "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck")) |
| 1070 | (patches '()))) | 1070 | (patches '()))) |
| 1071 | (arguments | 1071 | (arguments |
| 1072 | (substitute-keyword-arguments (package-arguments xbinutils) | 1072 | (substitute-keyword-arguments arguments |
| 1073 | ((#:configure-flags flags) | 1073 | ((#:configure-flags flags) |
| 1074 | #~(cons "--disable-werror" #$flags)) | 1074 | #~(cons "--disable-werror" #$flags)) |
| 1075 | ;; FIXME: For some reason there are many test failures. It's not | 1075 | ;; FIXME: For some reason there are many test failures. It's not |
| @@ -1149,7 +1149,7 @@ with a layered architecture of JTAG interface and TAP support.") | |||
| 1149 | (search-patches | 1149 | (search-patches |
| 1150 | "gcc-cross-environment-variables.patch"))))) | 1150 | "gcc-cross-environment-variables.patch"))))) |
| 1151 | (arguments | 1151 | (arguments |
| 1152 | (substitute-keyword-arguments (package-arguments xgcc) | 1152 | (substitute-keyword-arguments arguments |
| 1153 | ((#:phases phases) | 1153 | ((#:phases phases) |
| 1154 | #~(modify-phases #$phases | 1154 | #~(modify-phases #$phases |
| 1155 | (delete 'pre-x86-configure) | 1155 | (delete 'pre-x86-configure) |
