diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-09 11:10:48 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-18 23:33:29 -0400 |
| commit | 9e4ce281dbd92e3c52b831824ebb1f77023c960c (patch) | |
| tree | 357c6979a088b5a6907f789d424f790f1ea6c508 /gnu/packages/virtualization.scm | |
| parent | 0f5fbb35de7261faf7e656e67a73e5a7f5fa71de (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/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e1cecbe3a2..eb9cf83954 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -237,7 +237,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 @@ -678,10 +678,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) @@ -1753,7 +1753,7 @@ domains, their live performance and resource utilization statistics.") (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 |