mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00: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
Ludovic Courtès
parent
0e881505f1
commit
f59df1aa3c
117 changed files with 205 additions and 204 deletions
|
|
@ -201,9 +201,9 @@
|
|||
(arguments
|
||||
`(#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:make-flags
|
||||
;; TODO: The documentation must be built with the `docs' target.
|
||||
(let* ((out (assoc-ref %outputs "out"))
|
||||
|
|
@ -290,9 +290,9 @@ more.")
|
|||
`(#:make-flags '("GUILE_AUTO_COMPILE=0")
|
||||
#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-guilescript
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
|
@ -786,9 +786,9 @@ you send to a FIFO file.")
|
|||
(arguments
|
||||
`(#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'strip)
|
||||
(add-after 'install 'wrap-program
|
||||
|
|
@ -1905,9 +1905,9 @@ bindings to the @code{yaml-cpp} C++ library.")
|
|||
(arguments
|
||||
`(#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:configure-flags
|
||||
(list (string-append
|
||||
"--with-guile-site-dir=" %output "/share/guile/site/"
|
||||
|
|
@ -2138,10 +2138,10 @@ above command-line parameters.")
|
|||
#:modules `(((guix build guile-build-system)
|
||||
#:select
|
||||
(target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:phases
|
||||
(with-imported-modules `((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'hall-wrap-binaries
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
|
@ -2287,7 +2287,7 @@ user which package sets would they like to install from it.")
|
|||
(guix build emacs-utils)
|
||||
(ice-9 rdelim)
|
||||
(ice-9 popen))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
#:imported-modules (,@%default-gnu-imported-modules
|
||||
(guix build emacs-build-system)
|
||||
(guix build emacs-utils))
|
||||
#:phases
|
||||
|
|
@ -2696,7 +2696,7 @@ many readers as needed).")
|
|||
#:select (target-guile-effective-version))
|
||||
(guix build utils))
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:configure-flags (list "--with-gnu-filesystem-hierarchy")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -3015,7 +3015,7 @@ inspired by the SCSH regular expression system.")
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((ice-9 match) (ice-9 ftw)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:tests? #f ; test suite is non-deterministic :(
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-haunt
|
||||
|
|
@ -3300,7 +3300,7 @@ The picture values can directly be displayed in Geiser.")
|
|||
`(#:modules
|
||||
((ice-9 match)
|
||||
(srfi srfi-1)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:tests? #f ; there are none
|
||||
#:make-flags
|
||||
(list (string-append "PICT_DIR="
|
||||
|
|
@ -5729,9 +5729,9 @@ schedulers.")
|
|||
(arguments
|
||||
`(#:modules (((guix build guile-build-system)
|
||||
#:prefix guile:)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:tests? #false ; there are none
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -5951,9 +5951,9 @@ high-level API for network management that uses rtnetlink.")
|
|||
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
|
||||
#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
|
@ -5980,6 +5980,7 @@ high-level API for network management that uses rtnetlink.")
|
|||
(native-inputs (list autoconf automake pkg-config texinfo))
|
||||
(inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib
|
||||
guile2.2-gnutls))
|
||||
|
||||
(home-page "https://github.com/artyom-poptsov/guile-gitlab")
|
||||
(synopsis "Guile interface to GitLab")
|
||||
(description
|
||||
|
|
@ -6007,9 +6008,9 @@ GitLab instance.")
|
|||
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
|
||||
#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
,@%default-gnu-imported-modules)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'strip)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue