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/docbook.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/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 260e4cf10d4..6cac689282c 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -127,7 +127,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (inherit template) (arguments (let ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ;; XXX: A default value must be provided otherwise this ;; substitution has no effect. ((#:install-plan _ #f) @@ -147,7 +147,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (inherit template) (arguments (let ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ((#:install-plan _ #f) #~`(("catalog.xml" #$dest-dir) ("docbook.nvdl" #$dest-dir) @@ -167,7 +167,7 @@ downloading from @var{source}, where @var{version} is a string and (inherit base-template) (arguments (let* ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments base-template) + (substitute-keyword-arguments arguments ((#:phases phases) ;; Some programs, such as kdoctools, instead of using ;; XML_CATALOG_FILES, prefer to use cmake to locate @@ -247,7 +247,7 @@ downloading from @var{source}, where @var{version} is a string and (package (inherit template) (arguments - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'copy-catalog-file |