diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-09 11:10:48 -0400 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-06-26 17:01:36 +0100 |
commit | 3a0da554053c8f4e676e87a30d524b782892dcfa (patch) | |
tree | b406090dcb7748c6f22ee8a82129904fd2e8626e /gnu/packages/java.scm | |
parent | 62cf1cf8fd670d8249d4c5c951310d5baba6c847 (diff) |
build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.
Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.
The renaming was automated via the command:
$ git grep -l %gnu-build-system-modules
| xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i
* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this. Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.
Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r-- | gnu/packages/java.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a2414161da..fec475daad 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -723,7 +723,7 @@ IcedTea build harness.") (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) @@ -889,7 +889,7 @@ new Date();")) (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build utils) (guix build gnu-build-system) @@ -8114,7 +8114,7 @@ discards all logging messages.") (arguments `(#:tests? #f ; no test target #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build ant-build-system) #:prefix ant:) (guix build gnu-build-system) (guix build utils)) |