~ruther/guix-local

f59df1aa3c104aabff3291f6b8b155fb01aebc06 — Maxim Cournoyer 2 years ago 0e88150
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
117 files changed, 205 insertions(+), 204 deletions(-)

M gnu/packages/acl.scm
M gnu/packages/apl.scm
M gnu/packages/axoloti.scm
M gnu/packages/backup.scm
M gnu/packages/base.scm
M gnu/packages/benchmark.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/boost.scm
M gnu/packages/bootloaders.scm
M gnu/packages/bqn.scm
M gnu/packages/commencement.scm
M gnu/packages/cpp.scm
M gnu/packages/cross-base.scm
M gnu/packages/cups.scm
M gnu/packages/curl.scm
M gnu/packages/debian.scm
M gnu/packages/dezyne.scm
M gnu/packages/dictionaries.scm
M gnu/packages/djvu.scm
M gnu/packages/docker.scm
M gnu/packages/emacs-xyz.scm
M gnu/packages/emulators.scm
M gnu/packages/engineering.scm
M gnu/packages/esolangs.scm
M gnu/packages/firmware.scm
M gnu/packages/fonts.scm
M gnu/packages/freedesktop.scm
M gnu/packages/game-development.scm
M gnu/packages/gcc.scm
M gnu/packages/gdb.scm
M gnu/packages/genimage.scm
M gnu/packages/geo.scm
M gnu/packages/gimp.scm
M gnu/packages/gnome.scm
M gnu/packages/gnucash.scm
M gnu/packages/gnupg.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/graph.scm
M gnu/packages/guile-xyz.scm
M gnu/packages/ibus.scm
M gnu/packages/image.scm
M gnu/packages/instrumentation.scm
M gnu/packages/java.scm
M gnu/packages/language.scm
M gnu/packages/librewolf.scm
M gnu/packages/linux.scm
M gnu/packages/machine-learning.scm
M gnu/packages/mail.scm
M gnu/packages/make-bootstrap.scm
M gnu/packages/maths.scm
M gnu/packages/messaging.scm
M gnu/packages/mpd.scm
M gnu/packages/mpi.scm
M gnu/packages/music.scm
M gnu/packages/networking.scm
M gnu/packages/ocaml.scm
M gnu/packages/openldap.scm
M gnu/packages/package-management.scm
M gnu/packages/plotutils.scm
M gnu/packages/qt.scm
M gnu/packages/racket.scm
M gnu/packages/ratpoison.scm
M gnu/packages/scheme.scm
M gnu/packages/selinux.scm
M gnu/packages/shellutils.scm
M gnu/packages/simh.scm
M gnu/packages/speech.scm
M gnu/packages/statistics.scm
M gnu/packages/stb.scm
M gnu/packages/telegram.scm
M gnu/packages/texinfo.scm
M gnu/packages/text-editors.scm
M gnu/packages/tor-browsers.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/virtualization.scm
M gnu/packages/web-browsers.scm
M gnu/packages/web.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xorg.scm
M guix/build-system/agda.scm
M guix/build-system/android-ndk.scm
M guix/build-system/ant.scm
M guix/build-system/asdf.scm
M guix/build-system/cargo.scm
M guix/build-system/chicken.scm
M guix/build-system/cmake.scm
M guix/build-system/composer.scm
M guix/build-system/copy.scm
M guix/build-system/dub.scm
M guix/build-system/elm.scm
M guix/build-system/emacs.scm
M guix/build-system/font.scm
M guix/build-system/glib-or-gtk.scm
M guix/build-system/gnu.scm
M guix/build-system/go.scm
M guix/build-system/guile.scm
M guix/build-system/haskell.scm
M guix/build-system/julia.scm
M guix/build-system/linux-module.scm
M guix/build-system/maven.scm
M guix/build-system/minify.scm
M guix/build-system/mix.scm
M guix/build-system/node.scm
M guix/build-system/ocaml.scm
M guix/build-system/perl.scm
M guix/build-system/python.scm
M guix/build-system/r.scm
M guix/build-system/rakudo.scm
M guix/build-system/rebar.scm
M guix/build-system/renpy.scm
M guix/build-system/ruby.scm
M guix/build-system/scons.scm
M guix/build-system/texlive.scm
M guix/build-system/waf.scm
M guix/build-system/zig.scm
M tests/modules.scm
M gnu/packages/acl.scm => gnu/packages/acl.scm +1 -1
@@ 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?)))

M gnu/packages/apl.scm => gnu/packages/apl.scm +1 -1
@@ 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:)

M gnu/packages/axoloti.scm => gnu/packages/axoloti.scm +3 -3
@@ 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)

M gnu/packages/backup.scm => gnu/packages/backup.scm +1 -1
@@ 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

M gnu/packages/base.scm => gnu/packages/base.scm +1 -1
@@ 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

M gnu/packages/benchmark.scm => gnu/packages/benchmark.scm +1 -1
@@ 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

M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +2 -2
@@ 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

M gnu/packages/boost.scm => gnu/packages/boost.scm +2 -2
@@ 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

M gnu/packages/bootloaders.scm => gnu/packages/bootloaders.scm +2 -2
@@ 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

M gnu/packages/bqn.scm => gnu/packages/bqn.scm +1 -1
@@ 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)

M gnu/packages/commencement.scm => gnu/packages/commencement.scm +4 -4
@@ 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)

M gnu/packages/cpp.scm => gnu/packages/cpp.scm +1 -1
@@ 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))

M gnu/packages/cross-base.scm => gnu/packages/cross-base.scm +1 -1
@@ 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)

M gnu/packages/cups.scm => gnu/packages/cups.scm +3 -3
@@ 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")

M gnu/packages/curl.scm => gnu/packages/curl.scm +2 -2
@@ 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")

M gnu/packages/debian.scm => gnu/packages/debian.scm +1 -1
@@ 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

M gnu/packages/dezyne.scm => gnu/packages/dezyne.scm +2 -2
@@ 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

M gnu/packages/dictionaries.scm => gnu/packages/dictionaries.scm +1 -1
@@ 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)

M gnu/packages/djvu.scm => gnu/packages/djvu.scm +2 -2
@@ 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

M gnu/packages/docker.scm => gnu/packages/docker.scm +1 -1
@@ 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

M gnu/packages/emacs-xyz.scm => gnu/packages/emacs-xyz.scm +10 -10
@@ 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

M gnu/packages/emulators.scm => gnu/packages/emulators.scm +1 -1
@@ 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:)

M gnu/packages/engineering.scm => gnu/packages/engineering.scm +3 -3
@@ 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))

M gnu/packages/esolangs.scm => gnu/packages/esolangs.scm +1 -1
@@ 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:)

M gnu/packages/firmware.scm => gnu/packages/firmware.scm +1 -1
@@ 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))

M gnu/packages/fonts.scm => gnu/packages/fonts.scm +2 -2
@@ 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

M gnu/packages/freedesktop.scm => gnu/packages/freedesktop.scm +2 -3
@@ 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

M gnu/packages/game-development.scm => gnu/packages/game-development.scm +2 -2
@@ 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

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +3 -3
@@ 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)

M gnu/packages/gdb.scm => gnu/packages/gdb.scm +1 -1
@@ 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)

M gnu/packages/genimage.scm => gnu/packages/genimage.scm +1 -1
@@ 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

M gnu/packages/geo.scm => gnu/packages/geo.scm +1 -1
@@ 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

M gnu/packages/gimp.scm => gnu/packages/gimp.scm +1 -1
@@ 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

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -1
@@ 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)

M gnu/packages/gnucash.scm => gnu/packages/gnucash.scm +1 -1
@@ 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)

M gnu/packages/gnupg.scm => gnu/packages/gnupg.scm +1 -1
@@ 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

M gnu/packages/gnuzilla.scm => gnu/packages/gnuzilla.scm +3 -3
@@ 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

M gnu/packages/graph.scm => gnu/packages/graph.scm +2 -2
@@ 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

M gnu/packages/guile-xyz.scm => gnu/packages/guile-xyz.scm +21 -20
@@ 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)

M gnu/packages/ibus.scm => gnu/packages/ibus.scm +1 -1
@@ 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

M gnu/packages/image.scm => gnu/packages/image.scm +1 -1
@@ 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

M gnu/packages/instrumentation.scm => gnu/packages/instrumentation.scm +1 -1
@@ 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)))

M gnu/packages/java.scm => gnu/packages/java.scm +3 -3
@@ 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))

M gnu/packages/language.scm => gnu/packages/language.scm +1 -1
@@ 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

M gnu/packages/librewolf.scm => gnu/packages/librewolf.scm +1 -1
@@ 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)

M gnu/packages/linux.scm => gnu/packages/linux.scm +3 -3
@@ 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))

M gnu/packages/machine-learning.scm => gnu/packages/machine-learning.scm +2 -2
@@ 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

M gnu/packages/mail.scm => gnu/packages/mail.scm +2 -2
@@ 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)

M gnu/packages/make-bootstrap.scm => gnu/packages/make-bootstrap.scm +1 -1
@@ 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)

M gnu/packages/maths.scm => gnu/packages/maths.scm +4 -4
@@ 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

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +1 -1
@@ 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

M gnu/packages/mpd.scm => gnu/packages/mpd.scm +1 -1
@@ 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

M gnu/packages/mpi.scm => gnu/packages/mpi.scm +1 -1
@@ 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))

M gnu/packages/music.scm => gnu/packages/music.scm +1 -1
@@ 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")))

M gnu/packages/networking.scm => gnu/packages/networking.scm +1 -1
@@ 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))

M gnu/packages/ocaml.scm => gnu/packages/ocaml.scm +1 -1
@@ 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)

M gnu/packages/openldap.scm => gnu/packages/openldap.scm +1 -1
@@ 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"

M gnu/packages/package-management.scm => gnu/packages/package-management.scm +4 -4
@@ 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

M gnu/packages/plotutils.scm => gnu/packages/plotutils.scm +2 -2
@@ 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)

M gnu/packages/qt.scm => gnu/packages/qt.scm +3 -3
@@ 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)

M gnu/packages/racket.scm => gnu/packages/racket.scm +1 -1
@@ 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)

M gnu/packages/ratpoison.scm => gnu/packages/ratpoison.scm +1 -1
@@ 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).

M gnu/packages/scheme.scm => gnu/packages/scheme.scm +1 -1
@@ 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

M gnu/packages/selinux.scm => gnu/packages/selinux.scm +1 -1
@@ 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)))

M gnu/packages/shellutils.scm => gnu/packages/shellutils.scm +1 -1
@@ 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)

M gnu/packages/simh.scm => gnu/packages/simh.scm +1 -1
@@ 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)

M gnu/packages/speech.scm => gnu/packages/speech.scm +1 -1
@@ 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

M gnu/packages/statistics.scm => gnu/packages/statistics.scm +1 -1
@@ 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

M gnu/packages/stb.scm => gnu/packages/stb.scm +1 -1
@@ 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)

M gnu/packages/telegram.scm => gnu/packages/telegram.scm +2 -2
@@ 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:)

M gnu/packages/texinfo.scm => gnu/packages/texinfo.scm +1 -1
@@ 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)))))

M gnu/packages/text-editors.scm => gnu/packages/text-editors.scm +1 -1
@@ 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))

M gnu/packages/tor-browsers.scm => gnu/packages/tor-browsers.scm +1 -1
@@ 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

M gnu/packages/version-control.scm => gnu/packages/version-control.scm +3 -3
@@ 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)

M gnu/packages/video.scm => gnu/packages/video.scm +1 -1
@@ 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)

M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +5 -5
@@ 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

M gnu/packages/web-browsers.scm => gnu/packages/web-browsers.scm +1 -1
@@ 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))

M gnu/packages/web.scm => gnu/packages/web.scm +1 -1
@@ 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)

M gnu/packages/xdisorg.scm => gnu/packages/xdisorg.scm +3 -3
@@ 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)

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +1 -1
@@ 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"

M guix/build-system/agda.scm => guix/build-system/agda.scm +1 -1
@@ 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)

M guix/build-system/android-ndk.scm => guix/build-system/android-ndk.scm +1 -1
@@ 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

M guix/build-system/ant.scm => guix/build-system/ant.scm +1 -1
@@ 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."

M guix/build-system/asdf.scm => guix/build-system/asdf.scm +1 -1
@@ 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

M guix/build-system/cargo.scm => guix/build-system/cargo.scm +1 -1
@@ 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.

M guix/build-system/chicken.scm => guix/build-system/chicken.scm +1 -1
@@ 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.

M guix/build-system/cmake.scm => guix/build-system/cmake.scm +1 -1
@@ 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."

M guix/build-system/composer.scm => guix/build-system/composer.scm +1 -1
@@ 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

M guix/build-system/copy.scm => guix/build-system/copy.scm +1 -1
@@ 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."

M guix/build-system/dub.scm => guix/build-system/dub.scm +1 -1
@@ 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

M guix/build-system/elm.scm => guix/build-system/elm.scm +1 -1
@@ 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.

M guix/build-system/emacs.scm => guix/build-system/emacs.scm +1 -1
@@ 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."

M guix/build-system/font.scm => guix/build-system/font.scm +1 -1
@@ 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

M guix/build-system/glib-or-gtk.scm => guix/build-system/glib-or-gtk.scm +1 -1
@@ 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

M guix/build-system/gnu.scm => guix/build-system/gnu.scm +10 -9
@@ 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)

M guix/build-system/go.scm => guix/build-system/go.scm +1 -1
@@ 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.

M guix/build-system/guile.scm => guix/build-system/guile.scm +1 -1
@@ 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

M guix/build-system/haskell.scm => guix/build-system/haskell.scm +1 -1
@@ 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."

M guix/build-system/julia.scm => guix/build-system/julia.scm +1 -1
@@ 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."

M guix/build-system/linux-module.scm => guix/build-system/linux-module.scm +1 -1
@@ 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."

M guix/build-system/maven.scm => guix/build-system/maven.scm +1 -1
@@ 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."

M guix/build-system/minify.scm => guix/build-system/minify.scm +1 -1
@@ 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."

M guix/build-system/mix.scm => guix/build-system/mix.scm +1 -1
@@ 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."

M guix/build-system/node.scm => guix/build-system/node.scm +1 -1
@@ 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."

M guix/build-system/ocaml.scm => guix/build-system/ocaml.scm +1 -1
@@ 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."

M guix/build-system/perl.scm => guix/build-system/perl.scm +1 -1
@@ 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."

M guix/build-system/python.scm => guix/build-system/python.scm +1 -1
@@ 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."

M guix/build-system/r.scm => guix/build-system/r.scm +1 -1
@@ 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."

M guix/build-system/rakudo.scm => guix/build-system/rakudo.scm +1 -1
@@ 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."

M guix/build-system/rebar.scm => guix/build-system/rebar.scm +1 -1
@@ 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."

M guix/build-system/renpy.scm => guix/build-system/renpy.scm +1 -1
@@ 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

M guix/build-system/ruby.scm => guix/build-system/ruby.scm +1 -1
@@ 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."

M guix/build-system/scons.scm => guix/build-system/scons.scm +1 -1
@@ 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."

M guix/build-system/texlive.scm => guix/build-system/texlive.scm +1 -1
@@ 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."

M guix/build-system/waf.scm => guix/build-system/waf.scm +1 -1
@@ 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

M guix/build-system/zig.scm => guix/build-system/zig.scm +1 -1
@@ 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

M tests/modules.scm => tests/modules.scm +4 -4
@@ 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?