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/modules.scm | |
| parent | 0e881505f19bd9ea9eb543c43483f2ac45a912b3 (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 'tests/modules.scm')
| -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 bb2c70e287e..4a42da25b70 100644 --- a/tests/modules.scm +++ b/tests/modules.scm | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | (define-module (test-modules) | 19 | (define-module (test-modules) |
| 20 | #:use-module (guix modules) | 20 | #:use-module (guix modules) |
| 21 | #:use-module ((guix build-system gnu) #:select (%gnu-build-system-modules)) | 21 | #:use-module ((guix build-system gnu) #:select (%default-gnu-imported-modules)) |
| 22 | #:use-module ((guix utils) #:select (call-with-temporary-directory)) | 22 | #:use-module ((guix utils) #:select (call-with-temporary-directory)) |
| 23 | #:use-module (srfi srfi-1) | 23 | #:use-module (srfi srfi-1) |
| 24 | #:use-module (srfi srfi-34) | 24 | #:use-module (srfi srfi-34) |
| @@ -30,9 +30,9 @@ | |||
| 30 | (lset= equal? | 30 | (lset= equal? |
| 31 | (live-module-closure '((guix build gnu-build-system))) | 31 | (live-module-closure '((guix build gnu-build-system))) |
| 32 | (source-module-closure '((guix build gnu-build-system))) | 32 | (source-module-closure '((guix build gnu-build-system))) |
| 33 | %gnu-build-system-modules | 33 | %default-gnu-imported-modules |
| 34 | (source-module-closure %gnu-build-system-modules) | 34 | (source-module-closure %default-gnu-imported-modules) |
| 35 | (live-module-closure %gnu-build-system-modules))) | 35 | (live-module-closure %default-gnu-imported-modules))) |
| 36 | 36 | ||
| 37 | (test-assert "closure of (gnu build install)" | 37 | (test-assert "closure of (gnu build install)" |
| 38 | (lset= equal? | 38 | (lset= equal? |
