diff options
117 files changed, 205 insertions, 204 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index eb20fdd549..3e97332243 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -52,7 +52,7 @@ (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--disable-static") #:tests? ,(not (or (%current-target-system) (target-hurd?))) diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 0b56c8b088..1c1cd200a9 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -142,7 +142,7 @@ symbols, and almost all Latin-1 accented letters.") (native-inputs (list `(,openjdk18 "jdk") zip)) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build ant-build-system)) #:modules `((guix build gnu-build-system) ((guix build ant-build-system) #:prefix ant:) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index ebd2e37d5c..27e80082f0 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -228,7 +228,7 @@ runtime.") (sxml xpath) (sxml transform)) #:imported-modules `((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -380,7 +380,7 @@ patcher application."))) (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -790,7 +790,7 @@ This package provides the runtime.") (sxml xpath) (sxml transform)) #:imported-modules `((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5b00b1e89d..78112e8a2a 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -843,7 +843,7 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.") "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb")))) (arguments `(#:modules ((ice-9 match) (ice-9 rdelim) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases ;; This mostly mirrors the steps taken in the install.sh that ships ;; with dirvish, but simplified because we aren't prompting interactively diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 72e34a4515..c46627a901 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1356,7 +1356,7 @@ to the @code{share/locale} sub-directory of this package.") ,@modules)) ((#:imported-modules modules '()) `((gnu build locale) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) ((#:phases phases) `(modify-phases ,phases (replace 'build diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 1707403826..050fb1e590 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -90,7 +90,7 @@ (build-system gnu-build-system) (arguments (list #:modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (ice-9 textual-ports)) #:test-target "test" #:configure-flags diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f194b86d65..07048aebbe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -22861,9 +22861,9 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.") `(#: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 'patch-source-shebangs 'patch-more-source-shebangs diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 71999709ed..3225c58d25 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -114,9 +114,9 @@ (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules `(((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f #:configure-flags #~(let ((icu (dirname (dirname (search-input-file diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4072df50d7..61def12c91 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1044,7 +1044,7 @@ U-Boot must be used." ,@modules)) ((#:imported-modules imported-modules '()) `((guix build kconfig) - ,@%gnu-build-system-modules + ,@%default-gnu-imported-modules ,@imported-modules)) ((#:test-target _ "test") "test") @@ -1949,7 +1949,7 @@ order to add a suitable bootloader menu entry.") (ice-9 regex) (rnrs bytevectors)) #:imported-modules `((guix base32) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags ;; XXX: 'BUILD_ID' is used to determine when another ROM in the ;; system contains identical code in order to save space within the diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 4d03385d21..fd090ad433 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -52,7 +52,7 @@ (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build ant-build-system)) #:modules `((guix build gnu-build-system) ((guix build ant-build-system) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 314598938b..2ea34270e0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -145,7 +145,7 @@ the checkout from TARBALL, a tarball containing said checkout. #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -185,7 +185,7 @@ pure Scheme to Tar and decompression in one easy step.") #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -214,7 +214,7 @@ pure Scheme to Tar and decompression in one easy step.") #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -3236,7 +3236,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Additional modules for the libstdc++ phase below. #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7dca7a2d02..93ffef3989 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2210,7 +2210,7 @@ pointers, containers, compiler building blocks, etc.") (arguments `(#:test-target "test" #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2cc5f52e47..7d152b3270 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -359,7 +359,7 @@ target that libc." (arguments `(#:implicit-inputs? #f #:imported-modules ((gnu build cross-toolchain) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build gnu-build-system) (guix build utils) (gnu build cross-toolchain) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 61da91d1f5..bf192d2b24 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -569,7 +569,7 @@ should only be used as part of the Guix cups-pk-helper service.") (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '((guix build gnu-build-system) (guix build utils) ((guix build python-build-system) #:prefix python:)) @@ -888,7 +888,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (arguments (list #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--disable-static" (string-append "--prefix=" #$output) @@ -949,7 +949,7 @@ language.") (arguments `(#:modules ((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list (string-append "CUPSDRV=" (assoc-ref %outputs "out") "/share/cups/drv") diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1322f29cc0..6a51d7103f 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -246,9 +246,9 @@ not offer a replacement for libcurl.") (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-guilesitedir=" (assoc-ref %outputs "out") diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 6f7b809fd2..7d689c42e1 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -581,7 +581,7 @@ distributions such as Debian and Trisquel.") (arguments (list #:modules `((srfi srfi-71) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'bootstrap 'patch-version diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index ecf4431bcc..1cbcbfa4c2 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -56,7 +56,7 @@ (arguments (list #:modules `((ice-9 popen) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'setenv @@ -132,7 +132,7 @@ has formal semantics expressed in @url{https://mcrl2.org,mCRL2}.") (arguments (list #:modules `((ice-9 popen) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'setenv diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 9f493d91ad..04fe6fc491 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -280,7 +280,7 @@ and a Python library.") (assoc-ref emacs:%standard-phases 'build))) #:make-flags (list (string-append "PREFIX=" %output) "NETWORK_ACCESS=no test") - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules ((guix build gnu-build-system) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 743fc7e284..084aba2398 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -309,7 +309,7 @@ and white.") `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases @@ -395,7 +395,7 @@ and background layers of images, which can then be encoded into a DjVu file.") #:modules '((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c6d56a06b1..039cd524db 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -343,7 +343,7 @@ the built-in registry server of Docker.") (guix build union) (guix build utils)) #:imported-modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (guix build union) (guix build go-build-system)) #:phases diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8205f0eaf0..47f7a1372d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -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 diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 6d07441377..3879742e0a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -190,7 +190,7 @@ SuperCPU.") #:tests? #f ; No check target and custom tests don't seem to build #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9f620dc004..c5602899a7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -568,7 +568,7 @@ featuring various improvements and bug fixes."))) #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'build 'make-doc @@ -665,7 +665,7 @@ multipole-accelerated algorithm.") #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) @@ -3390,7 +3390,7 @@ program that can perform mesh processing tasks in batch mode, without a GUI.") (list #:imported-modules `((guix build emacs-build-system) (guix build emacs-utils) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 0651dda1b0..796f8d3f23 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -135,7 +135,7 @@ are encoded as (nested) directories. Note that the switches you pass to "shakespeare-spl-fix-grammar.patch")))) (build-system copy-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build copy-build-system)) #:modules ((guix build copy-build-system) ((guix build gnu-build-system) #:prefix gnu:) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 4348612567..44655d1d33 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -680,7 +680,7 @@ coreboot.") (supported-systems %supported-systems) (arguments (substitute-keyword-arguments (package-arguments seabios) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 match) (ice-9 threads) ,@modules)) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c269a32065..8d0322cfee 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -980,9 +980,9 @@ OpenType variant of these fonts.") (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build font-build-system)) - #:modules `(,@%gnu-build-system-modules + #:modules `(,@%default-gnu-imported-modules ((guix build font-build-system) #:prefix font:)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 92937d626c..27e64770d4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -523,7 +523,7 @@ display servers. It supports many different languages and emoji.") #:make-flags #~(list (string-append "DESTDIR=" #$output) #$(string-append "CC=" (cc-for-target))) #:imported-modules `((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules `((guix build gnu-build-system) ((guix build copy-build-system) #:prefix copy:) (guix build utils)) @@ -643,8 +643,7 @@ database is translated at Transifex.") (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - (guix build gnu-build-system) - (guix build utils)) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 59325fd47a..404ddd7632 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -695,9 +695,9 @@ clone.") (srfi srfi-1) ((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 'unpack 'patch-command diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index fb1dda36b3..68240ed794 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -420,7 +420,7 @@ Go. It also includes runtime support libraries for these languages.") ;; For native builds of some GCC versions the C++ include path needs to ;; be adjusted so it does not interfere with GCC's own build processes. (substitute-keyword-arguments (package-arguments parent) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) @@ -955,7 +955,7 @@ using compilers other than GCC." #:out-of-source? #t #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases #$@(if (version>=? (package-version gcc) "11") @@ -1103,7 +1103,7 @@ as the 'native-search-paths' field." (native-search-paths search-paths) (arguments (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `(,@modules (srfi srfi-1) (srfi srfi-26) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index f832202d18..15e6a88726 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -64,7 +64,7 @@ `(#:tests? #f ;FIXME: 217 unexpected failures #:out-of-source? #t #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 4a9d24fe78..94a85ce2e4 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -61,7 +61,7 @@ (arguments `(#:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'guixify diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 954a4ad4a0..3255f25d54 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2816,7 +2816,7 @@ orienteering sport.") #:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 9a757e6a34..6ee7148e49 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -354,7 +354,7 @@ buffers.") (list #:modules `((ice-9 popen) (ice-9 rdelim) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-gcc-reference diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0e4c2a8ab4..d2db475ab8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11835,7 +11835,7 @@ mp3, Ogg Vorbis and FLAC") (arguments `(#:imported-modules ((guix build python-build-system) (guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build glib-or-gtk-build-system) (guix build utils) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index af024b2a04..7188c9c65e 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -81,7 +81,7 @@ #:test-target "check" #:configure-flags #~(list "-DWITH_PYTHON=ON") #:make-flags #~(list "GUILE_AUTO_COMPILE=0") - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 14c25998d8..fb2860be2e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -997,7 +997,7 @@ passphrase when @code{gpg} is run and needs it."))) `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 85e26deea5..75752d5e53 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -119,7 +119,7 @@ (list #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' #:modules `((guix build cargo-utils) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:test-target "check-jstests" #:configure-flags #~(list @@ -868,7 +868,7 @@ variable defined below. It requires guile-json to be installed." (rnrs io ports) (guix elf) (guix build gremlin) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches @@ -1344,7 +1344,7 @@ list of languages supported as well as the currently used changeset." #:modules `((guix build utils) ;find-files (sxml simple) (ice-9 regex) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-cargo-checksums diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 115fe20b52..88c74d4027 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -840,9 +840,9 @@ transformed into common image formats for display or printing.") "1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build python-build-system) #:select (site-packages))) ;; The build process peaks around 4GB/RAM per core. #:parallel-build? #f diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d91e5dcb6e..b089990360 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -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) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index a2775b2f84..69ef9ee7ef 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -521,7 +521,7 @@ traditional Chinese output.") (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6b5e08e87d..239553fe3a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -895,7 +895,7 @@ work.") (outputs (list "out" "pbmtools")) (arguments `(#:modules ((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 4ed9b57cf2..9f1f76a602 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -587,7 +587,7 @@ whole-system symbolic access, and can also handle simple tracing jobs.") (list #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a2414161da..fec475daad 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -723,7 +723,7 @@ IcedTea build harness.") (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) @@ -889,7 +889,7 @@ new Date();")) (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build utils) (guix build gnu-build-system) @@ -8114,7 +8114,7 @@ discards all logging messages.") (arguments `(#:tests? #f ; no test target #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build ant-build-system) #:prefix ant:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 060f44e3c8..7a3deb0b43 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -969,7 +969,7 @@ and manipulation.") #: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 (modify-phases %standard-phases diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index c7487b1259..21f73f799d 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -286,7 +286,7 @@ (rnrs io ports) (guix elf) (guix build gremlin) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-preferences (lambda* (#:key inputs #:allow-other-keys) 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)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4c5b713cbf..08c7aaada6 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -384,10 +384,10 @@ Learning usecases.") "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3387d870b1..35be81d4b3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4222,7 +4222,7 @@ It is a replacement for the @command{urlview} program.") #: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 "--localstatedir=/var") @@ -4873,7 +4873,7 @@ ex-like commands on it.") ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (ice-9 string-fun)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:make-flags (list (string-append "prefix=" %output) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4dd45a4a27..96d2a5a81a 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -473,7 +473,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (outputs '("out")) ; all in one (arguments (substitute-keyword-arguments (package-arguments gcc-7) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) (srfi srfi-26) (ice-9 regex) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 557d9acc48..e59f36c0bc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4242,7 +4242,7 @@ language understood by many solvers.") `(#:modules ((ice-9 match) (ice-9 popen) (srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -7211,7 +7211,7 @@ set.") (list openblas)) (arguments `(#:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--enable-shared" "--disable-fortran" "--without-MPI" @@ -7718,7 +7718,7 @@ theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build python-build-system) #:select (site-packages)) (guix build gnu-build-system) (guix build utils)) @@ -9208,7 +9208,7 @@ symbolic reasoning engines that need to reason about polynomial constraints.") (arguments (list #:test-target "test" #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--aiger=.") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f375f34c6..f9f462a1a7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1414,7 +1414,7 @@ Encryption to Gajim.") #:modules '((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3916d4c406..b6b95852d2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -388,7 +388,7 @@ interface for the Music Player Daemon.") (guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index bca215df47..75cfd4af66 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -399,7 +399,7 @@ software vendors, application developers and computer science researchers.") ((guix build ant-build-system) #:prefix ant:) (guix build utils)) #:imported-modules `((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) #~(cons "--enable-mpi-java" #$flags)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b168742289..87ca64cda4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3585,7 +3585,7 @@ can connect to any JACK port and record the output into a stereo WAV file.") `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e59696772c..3334ca6251 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3907,7 +3907,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (arguments (list #:imported-modules `((guix build python-build-system) ;for site-packages - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '(((guix build python-build-system) #:prefix python:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1204c78883..0e357bc891 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1320,7 +1320,7 @@ the OCaml core distribution.") (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules '((guix build gnu-build-system) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index bd244cea1e..3f441f56b4 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -232,7 +232,7 @@ servers from Python programs.") #:select (add-installed-pythonpath python-version)) (guix build utils)) #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references (list httpd) #:configure-flags #~(list "--enable-cmocka" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6d09b1b1b8..22282c4863 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1567,9 +1567,9 @@ environments.") (list #: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-before 'build 'set-GUILE_AUTO_COMPILE @@ -1825,9 +1825,9 @@ in an isolated environment, in separate namespaces.") (list #: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-before 'build 'set-GUILE_AUTO_COMPILE diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 0fd75b328a..5174ada018 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -132,7 +132,7 @@ (guix build gnu-build-system) (guix build utils) (srfi srfi-26)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-utils)) #:configure-flags #~(list (string-append "--enable-gc=" #$(this-package-input "libgc")) @@ -263,7 +263,7 @@ using the Cairo drawing library.") (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) (guix build gnu-build-system) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a91bebf358..a0b44c7779 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3936,10 +3936,10 @@ module provides support functions to the automatically generated code.") (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -4462,7 +4462,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 3598418e58..1016915b47 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -582,7 +582,7 @@ used to build the name of the resulting store item." (guix build union) (ice-9 match)) #:imported-modules `((guix build union) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'unpack) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 14933da5a8..b39b679b7e 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -48,7 +48,7 @@ (arguments (list #:modules `((ice-9 format) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) ;; Specify the absolute location of xterm, as the user experience sucks ;; when no terminal is available (can't consult help with 'C-t ?', for ;; example). diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4c3ef66717..3d5301dd3a 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1286,7 +1286,7 @@ Gerbil code within Emacs."))) (arguments (list #:modules `((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-sh-references diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 3fc88154fa..6b41fbc5de 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -251,7 +251,7 @@ binary policies.") (name "python-sepolgen") (arguments (substitute-keyword-arguments (package-arguments libsepol) - ((#:modules _ #~%gnu-build-system-modules) + ((#:modules _ #~%default-gnu-imported-modules) '((srfi srfi-1) (guix build gnu-build-system) (guix build utils))) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 3fa9596072..d791e87d34 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -129,7 +129,7 @@ chart.") "/etc/boxes-config")) #:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index 9f5c04d8fb..7be6d934de 100644 --- a/gnu/packages/simh.scm +++ b/gnu/packages/simh.scm @@ -53,7 +53,7 @@ #:make-flags #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon")) #:modules `((ice-9 string-fun) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 36b67ccd93..0aa2a27488 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -356,7 +356,7 @@ be used by the sighted.") #: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)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 16e4a312cc..4adb3d9634 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6906,7 +6906,7 @@ Java package that provides routines for various statistical distributions.") #: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-build-system) (guix build emacs-utils)) #:make-flags diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 9286bcd87d..e9c99b6518 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -47,7 +47,7 @@ `(#:modules ((ice-9 ftw) (ice-9 regex) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index a77164b93e..432d6f79a1 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -618,7 +618,7 @@ formerly a part of telegram-cli, but now being maintained separately.") #:tests? #f ; No target #:imported-modules `((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '(((guix build copy-build-system) #:prefix copy:) @@ -691,7 +691,7 @@ formerly a part of telegram-cli, but now being maintained separately.") #:tests? #f ; No target #:imported-modules `((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '(((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index a5ddc95859..efa26f1dcc 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -230,7 +230,7 @@ is on expressing the content semantically, avoiding physical markup commands.") #:disallowed-references ,(assoc-ref (package-inputs texinfo) "perl") #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%gnu-build-system-modules))) + ,@%default-gnu-imported-modules))) (synopsis "Standalone Info documentation reader") (inputs (modify-inputs (package-inputs texinfo) (prepend gzip))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 3a72bcbe3d..9803f94793 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1236,7 +1236,7 @@ used with the Scintilla editing component.") )) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 3d01346c8c..ba6bbaa873 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -398,7 +398,7 @@ Browser.") (rnrs io ports) (guix elf) (guix build gremlin) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6098c119fa..a2cd09cde0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -263,7 +263,7 @@ Python 3.3 and later, rather than on Python 2.") (ice-9 format) (ice-9 textual-ports) ((guix build gnu-build-system) #:prefix gnu:) - ,@%gnu-build-system-modules) + ,@%default-gnu-modules) ;; Make sure the full bash does not end up in the final closure. #:disallowed-references (list bash perl) #:test-target "test" @@ -2102,7 +2102,7 @@ control to Git repositories.") (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list "GUILE_AUTO_COMPILE=0") #:phases (modify-phases %standard-phases @@ -4093,7 +4093,7 @@ TkDiff is included for browsing and merging your changes.") (list #:tests? #f ;No tests. #:imported-modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (guix build python-build-system)) #:modules '((guix build gnu-build-system) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 84be73a433..511764102f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1912,7 +1912,7 @@ audio/video codec library.") "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-4) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:configure-flags flags) 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 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ddb2f1d303..7a14e6dfb5 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -380,7 +380,7 @@ systems intended primarily for local access.") `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build qt-utils)) #:make-flags (list (string-append "PREFIX=" %output)) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0b5e6ff17e..31eeaf4be3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -235,7 +235,7 @@ `(#:tests? #f ; no target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8d9b592bb3..da6568f7e1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1587,7 +1587,7 @@ driver for the X.Org X Server version 1.7 and later (X11R7.5 or later).") "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases @@ -3012,11 +3012,11 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") #:tests? #f ;no test suite #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules + ,@%default-gnu-imported-modules (srfi srfi-26)) #:phases (with-imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #~(modify-phases %standard-phases (add-after 'install 'wrap (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 51283d316a..980927787f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6316,7 +6316,7 @@ X11 servers, Windows, or macOS.") `(#: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)) #:configure-flags (list "--with-anthy-utf8" diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index 64983dff60..409d0cda9d 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -38,7 +38,7 @@ (define %agda-build-system-modules `((guix build agda-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %default-modules '((guix build agda-build-system) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index aa7cc06279..b8cd56b871 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -31,7 +31,7 @@ (define %android-ndk-build-system-modules ;; Build-side modules imported by default. `((guix build android-ndk-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (android-ndk-build name inputs #:key diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 84bf951fab..9816cc061c 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -43,7 +43,7 @@ (guix build maven plugin) (guix build maven pom) (guix build java-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-jdk) "Return the default JDK package." diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 2b17cee37b..26b5a5008a 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -56,7 +56,7 @@ `((guix build asdf-build-system) (guix build lisp-utils) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %asdf-build-modules ;; Used (visible) build-side modules diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index c029cc1dda..658a2e525e 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -70,7 +70,7 @@ to NAME and VERSION." (define %cargo-utils-modules ;; Build-side modules imported by default. `((guix build cargo-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %cargo-build-system-modules ;; Build-side modules imported by default. diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index 9f518e66e6..e6fcfa7ee3 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -42,7 +42,7 @@ EXTENSION is the file name extension, such as '.tar.gz'." ;; Build-side modules imported and used by default. `((guix build chicken-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-chicken) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index aa187c9844..2bcc8ac046 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -42,7 +42,7 @@ (define %cmake-build-system-modules ;; Build-side modules imported by default. `((guix build cmake-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-cmake target) "Return the default CMake package." diff --git a/guix/build-system/composer.scm b/guix/build-system/composer.scm index 2ad7bbb36a..48ad90f253 100644 --- a/guix/build-system/composer.scm +++ b/guix/build-system/composer.scm @@ -62,7 +62,7 @@ ;; Build-side modules imported by default. `((guix build composer-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index d58931b33c..1f2937e0f1 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -46,7 +46,7 @@ (define %copy-build-system-modules ;; Build-side modules imported by default. `((guix build copy-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glibc) "Return the default glibc package." diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index 951c084398..831a34af0d 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -59,7 +59,7 @@ (define %dub-build-system-modules ;; Build-side modules imported by default. `((guix build dub-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (dub-build name inputs #:key diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index f5321f811b..7405db3d98 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -88,7 +88,7 @@ given VERSION with sha256 checksum HASH." `((guix build elm-build-system) (guix build json) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %elm-default-modules ;; Modules in scope in the build-side environment. diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..03273d738b 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -46,7 +46,7 @@ ;; Build-side modules imported by default. `((guix build emacs-build-system) (guix build emacs-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-emacs) "Return the default Emacs package." diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c57c304f52..b18d4af625 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -40,7 +40,7 @@ (define %font-build-system-modules ;; Build-side modules imported by default. `((guix build font-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 726d19efad..5d026ec5ab 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -72,7 +72,7 @@ (define %glib-or-gtk-build-system-modules ;; Build-side modules imported and used by default. `((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glib) "Return the default glib package from which we use diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index cdbb547773..1bd133152a 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -27,7 +27,8 @@ #:use-module (guix packages) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (%gnu-build-system-modules + #:export (%default-gnu-imported-modules + %default-gnu-modules %strip-flags %strip-directories gnu-build @@ -48,14 +49,14 @@ ;; ;; Code: -(define %gnu-build-system-modules +(define %default-gnu-imported-modules ;; Build-side modules imported and used by default. '((guix build gnu-build-system) (guix build utils) (guix build gremlin) (guix elf))) -(define %default-modules +(define %default-gnu-modules ;; Modules in scope in the build-side environment. '((guix build gnu-build-system) (guix build utils))) @@ -237,10 +238,10 @@ exact build phases are defined by PHASES." (arguments ;; Use the right phases and modules. (substitute-keyword-arguments (package-arguments p) - ((#:modules modules %default-modules) + ((#:modules modules %default-gnu-modules) `((guix build gnu-dist) ,@modules)) - ((#:imported-modules modules %gnu-build-system-modules) + ((#:imported-modules modules %default-gnu-imported-modules) `((guix build gnu-dist) ,@modules)) ((#:phases _ #f) @@ -359,8 +360,8 @@ standard packages used as implicit inputs of the GNU build system." (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) - (modules %default-modules) + (imported-modules %default-gnu-imported-modules) + (modules %default-gnu-modules) (substitutable? #t) allowed-references disallowed-references) @@ -502,8 +503,8 @@ is one of `host' or `target'." (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) - (modules %default-modules) + (imported-modules %default-gnu-imported-modules) + (modules %default-gnu-modules) (substitutable? #t) allowed-references disallowed-references) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index fc53b3be9f..9a182d2505 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -115,7 +115,7 @@ commit hash and its date rather than a proper release tag." ;; Build-side modules imported and used by default. `((guix build go-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-go) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index bd3bb1c870..0974fb5042 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -36,7 +36,7 @@ (define %guile-build-system-modules ;; Build-side modules imported by default. `((guix build guile-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index f8568e33db..b0019dd014 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -55,7 +55,7 @@ to NAME and VERSION." (define %haskell-build-system-modules ;; Build-side modules imported by default. `((guix build haskell-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-haskell) "Return the default Haskell package." diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index b5521e38e4..e098749683 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -42,7 +42,7 @@ (define %julia-build-system-modules ;; Build-side modules imported by default. `((guix build julia-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-julia) "Return the default Julia package." diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index e46195b53c..d0654a923e 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -41,7 +41,7 @@ (define %linux-module-build-system-modules ;; Build-side modules imported by default. `((guix build linux-module-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-linux) "Return the default Linux package." diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 4bbeaed6a4..03e4e96b89 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -46,7 +46,7 @@ ;; Build-side modules imported by default. `((guix build maven-build-system) (guix build maven pom) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-maven) "Return the default maven package." diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index b377b506b5..98c6e75980 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -39,7 +39,7 @@ (define %minify-build-system-modules ;; Build-side modules imported by default. `((guix build minify-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-esbuild) "Return the default package to minify JavaScript source files." diff --git a/guix/build-system/mix.scm b/guix/build-system/mix.scm index 1b04053d70..c3c5821082 100644 --- a/guix/build-system/mix.scm +++ b/guix/build-system/mix.scm @@ -90,7 +90,7 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md" (system (%current-system)) (guile #f) (imported-modules `((guix build mix-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (modules '((guix build mix-build-system) (guix build utils)))) "Build SOURCE using Elixir, and with INPUTS." diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 3f73390809..57fe5f6030 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -37,7 +37,7 @@ ;; Build-side modules imported by default. `((guix build node-build-system) (guix build json) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-node) "Return the default Node package." diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 582d00b4cd..2f2e6dd62e 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -65,7 +65,7 @@ (define %ocaml-build-system-modules ;; Build-side modules imported by default. `((guix build ocaml-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ocaml) "Return the default OCaml package." diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 3f7a2dea27..98d48fec7c 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -45,7 +45,7 @@ (define %perl-build-system-modules ;; Build-side modules imported by default. `((guix build perl-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-perl) "Return the default Perl package." diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index cca009fb28..b987aeef4e 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -59,7 +59,7 @@ extension, such as '.tar.gz'." (define %python-build-system-modules ;; Build-side modules imported by default. `((guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-python) "Return the default Python package." diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 37786f02a0..ed34745bcc 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -68,7 +68,7 @@ release corresponding to NAME and VERSION." (define %r-build-system-modules ;; Build-side modules imported by default. `((guix build r-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-r) "Return the default R package." diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index 3b30fdfd0e..ee13c50791 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -41,7 +41,7 @@ (define %rakudo-build-system-modules ;; Build-side modules imported by default. `((guix build rakudo-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rakudo) "Return the default Rakudo package." diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index de1294ec3f..7c7cc5870f 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -56,7 +56,7 @@ and VERSION." (define %rebar-build-system-modules ;; Build-side modules imported by default. `((guix build rebar-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rebar3) "Return the default Rebar3 package." diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 3039e3c63b..015dd7c210 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -44,7 +44,7 @@ `((guix build renpy-build-system) (guix build json) (guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index a3793a9381..33aab5f719 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -39,7 +39,7 @@ NAME and VERSION." (define %ruby-build-system-modules ;; Build-side modules imported by default. `((guix build ruby-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ruby) "Return the default Ruby package." diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 046ddef740..e76c419b1e 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -39,7 +39,7 @@ (define %scons-build-system-modules ;; Build-side modules imported by default. `((guix build scons-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-scons) "Return the default SCons package." diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index 88372faa58..2baa35466b 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -78,7 +78,7 @@ level package ID." ;; Build-side modules imported by default. `((guix build texlive-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-texlive-bin) "Return the default texlive-bin package." diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 91b3d0d100..5f24615514 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -42,7 +42,7 @@ (define %waf-build-system-modules ;; Build-side modules imported by default. `((guix build waf-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm index 1fa4782a2e..ad8a96b607 100644 --- a/guix/build-system/zig.scm +++ b/guix/build-system/zig.scm @@ -39,7 +39,7 @@ (define %zig-build-system-modules ;; Build-side modules imported by default. `((guix build zig-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (zig-build name inputs #:key diff --git a/tests/modules.scm b/tests/modules.scm index bb2c70e287..4a42da25b7 100644 --- a/tests/modules.scm +++ b/tests/modules.scm @@ -18,7 +18,7 @@ (define-module (test-modules) #:use-module (guix modules) - #:use-module ((guix build-system gnu) #:select (%gnu-build-system-modules)) + #:use-module ((guix build-system gnu) #:select (%default-gnu-imported-modules)) #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -30,9 +30,9 @@ (lset= equal? (live-module-closure '((guix build gnu-build-system))) (source-module-closure '((guix build gnu-build-system))) - %gnu-build-system-modules - (source-module-closure %gnu-build-system-modules) - (live-module-closure %gnu-build-system-modules))) + %default-gnu-imported-modules + (source-module-closure %default-gnu-imported-modules) + (live-module-closure %default-gnu-imported-modules))) (test-assert "closure of (gnu build install)" (lset= equal? |