From f59df1aa3c104aabff3291f6b8b155fb01aebc06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 Oct 2023 11:10:48 -0400 Subject: 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 --- gnu/packages/java.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a2414161da5..fec475daade 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)) -- cgit v1.3