diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-09 11:10:48 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:16 +0200 |
| commit | f59df1aa3c104aabff3291f6b8b155fb01aebc06 (patch) | |
| tree | 65118f36da29df88bd6dece2e6b9f4d54089b6e2 /tests | |
| parent | 0e881505f19bd9ea9eb543c43483f2ac45a912b3 (diff) | |
| download | guix-f59df1aa3c104aabff3291f6b8b155fb01aebc06.tar.gz guix-f59df1aa3c104aabff3291f6b8b155fb01aebc06.zip | |
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 'tests')
| -rw-r--r-- | tests/modules.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/modules.scm b/tests/modules.scm index bb2c70e287..4a42da25b7 100644 --- a/tests/modules.scm +++ b/tests/modules.scm @@ -18,7 +18,7 @@ (define-module (test-modules) #:use-module (guix modules) - #:use-module ((guix build-system gnu) #:select (%gnu-build-system-modules)) + #:use-module ((guix build-system gnu) #:select (%default-gnu-imported-modules)) #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -30,9 +30,9 @@ (lset= equal? (live-module-closure '((guix build gnu-build-system))) (source-module-closure '((guix build gnu-build-system))) - %gnu-build-system-modules - (source-module-closure %gnu-build-system-modules) - (live-module-closure %gnu-build-system-modules))) + %default-gnu-imported-modules + (source-module-closure %default-gnu-imported-modules) + (live-module-closure %default-gnu-imported-modules))) (test-assert "closure of (gnu build install)" (lset= equal? |