1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-17 12:30:38 +02:00

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
This commit is contained in:
Maxim Cournoyer 2023-10-09 11:10:48 -04:00 committed by Ludovic Courtès
parent 0e881505f1
commit f59df1aa3c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
117 changed files with 205 additions and 204 deletions

View file

@ -2564,7 +2564,7 @@ for editing Racket's Scribble documentation syntax in Emacs.")
`(#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
#:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags (list (string-append "--with-lispdir="
@ -2675,8 +2675,8 @@ replacement.")
#:modules `((ice-9 match)
(srfi srfi-26)
((guix build emacs-build-system) #:prefix emacs:)
,@%gnu-build-system-modules)
#:imported-modules `(,@%gnu-build-system-modules
,@%default-gnu-imported-modules)
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@ -3609,7 +3609,7 @@ or unexpected behavior inside an elisp configuration file (typically
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@ -4213,7 +4213,7 @@ defined in RFC 2425 and RFC 2426 to/from The Insidious Big Brother Database
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@ -4804,7 +4804,7 @@ a set of simplified face specifications and a user-supplied color palette.")
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
#:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@ -5945,7 +5945,7 @@ during idle time, while Emacs is doing nothing else.")
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
#:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
@ -6154,7 +6154,7 @@ type, for example: packages, buffers, files, etc.")
#:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@ -9257,7 +9257,7 @@ completion of relevant keywords.")
#:modules `((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
@ -37777,7 +37777,7 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.")
(list #:modules '((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-utils))
#:test-target "test"
#:phases