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/linux.scm | |
| parent | 0e881505f19bd9ea9eb543c43483f2ac45a912b3 (diff) | |
| download | guix-f59df1aa3c104aabff3291f6b8b155fb01aebc06.tar guix-f59df1aa3c104aabff3291f6b8b155fb01aebc06.tar.gz | |
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/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ba4a7e9e2..68f9ea2fe9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -285,7 +285,7 @@ of 'uname -r' behind the Linux version numbers." (arguments (substitute-keyword-arguments (package-arguments linux) - ((#:imported-modules imported-modules %gnu-build-system-modules) + ((#:imported-modules imported-modules %default-gnu-imported-modules) `((guix build kconfig) ,@imported-modules)) ((#:modules modules) `((guix build kconfig) ,@modules)) @@ -5846,7 +5846,7 @@ arrays when needed.") (for-each delete-file-recursively directories) (remove-store-references "sbin/mdadm") (delete-file "sbin/mdmon"))))))) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 ftw) ,@modules)) ((#:strip-flags _ '()) ''("--strip-all")) ;strip a few extra KiB @@ -7326,7 +7326,7 @@ graphically visualizing a @file{perf.data} file.") (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-pywrap") - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules (ice-9 binary-ports) (rnrs bytevectors) (srfi srfi-26)) |