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 /gnu/packages/virtualization.scm | |
| 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 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3bdfe094a1..26d58b612c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -251,7 +251,7 @@ (srfi srfi-26) (ice-9 ftw) (ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases ;; Since we removed the bundled firmwares above, many tests @@ -757,10 +757,10 @@ firmware blobs. You can "ganeti-relax-dependencies.patch")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build haskell-build-system) (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build haskell-build-system) #:prefix haskell:) ((guix build python-build-system) #:select (site-packages)) (srfi srfi-1) @@ -1978,7 +1978,7 @@ client desktops. (search-input-file %build-inputs "/bin/xmlto"))) #:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2350,7 +2350,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") #:tests? #f ; The tests require Docker #:test-target "test-unit" #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules + (source-module-closure `(,@%default-gnu-imported-modules (guix build go-build-system))) #:phases #~(modify-phases %standard-phases |