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/python.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/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c28f76f97ca..687e2857924 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -493,7 +493,7 @@ data types.") | |||
| 493 | (for-each delete-file | 493 | (for-each delete-file |
| 494 | (find-files "Lib/distutils/command" "\\.exe$")))))) | 494 | (find-files "Lib/distutils/command" "\\.exe$")))))) |
| 495 | (arguments | 495 | (arguments |
| 496 | (substitute-keyword-arguments (package-arguments python-2) | 496 | (substitute-keyword-arguments arguments |
| 497 | ((#:configure-flags flags) | 497 | ((#:configure-flags flags) |
| 498 | #~(append #$flags | 498 | #~(append #$flags |
| 499 | ;; XXX Use quote to avoid world rebuild at this time | 499 | ;; XXX Use quote to avoid world rebuild at this time |
| @@ -1509,7 +1509,7 @@ data types.") | |||
| 1509 | (outputs '("out" "debug")) | 1509 | (outputs '("out" "debug")) |
| 1510 | (build-system gnu-build-system) | 1510 | (build-system gnu-build-system) |
| 1511 | (arguments | 1511 | (arguments |
| 1512 | (substitute-keyword-arguments (package-arguments python) | 1512 | (substitute-keyword-arguments arguments |
| 1513 | ((#:configure-flags configure-flags) | 1513 | ((#:configure-flags configure-flags) |
| 1514 | #~(append #$configure-flags | 1514 | #~(append #$configure-flags |
| 1515 | (list "--with-pydebug"))))) | 1515 | (list "--with-pydebug"))))) |
| @@ -1580,7 +1580,7 @@ and the unversioned commands available."))) | |||
| 1580 | (hidden-package | 1580 | (hidden-package |
| 1581 | (package/inherit python | 1581 | (package/inherit python |
| 1582 | (arguments | 1582 | (arguments |
| 1583 | (substitute-keyword-arguments (package-arguments python) | 1583 | (substitute-keyword-arguments arguments |
| 1584 | ((#:configure-flags flags #~()) | 1584 | ((#:configure-flags flags #~()) |
| 1585 | #~(append '("--with-ensurepip=no") | 1585 | #~(append '("--with-ensurepip=no") |
| 1586 | (delete "--with-ensurepip=install" #$flags)))))))) | 1586 | (delete "--with-ensurepip=install" #$flags)))))))) |
