From 9e4ce281dbd92e3c52b831824ebb1f77023c960c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 9 Oct 2023 11:10:48 -0400
Subject: 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
---
 guix/build-system/agda.scm         |  2 +-
 guix/build-system/android-ndk.scm  |  2 +-
 guix/build-system/ant.scm          |  2 +-
 guix/build-system/asdf.scm         |  2 +-
 guix/build-system/cargo.scm        |  2 +-
 guix/build-system/chicken.scm      |  2 +-
 guix/build-system/cmake.scm        |  2 +-
 guix/build-system/copy.scm         |  2 +-
 guix/build-system/dub.scm          |  2 +-
 guix/build-system/elm.scm          |  2 +-
 guix/build-system/emacs.scm        |  2 +-
 guix/build-system/font.scm         |  2 +-
 guix/build-system/glib-or-gtk.scm  |  2 +-
 guix/build-system/gnu.scm          | 19 ++++++++++---------
 guix/build-system/go.scm           |  2 +-
 guix/build-system/guile.scm        |  2 +-
 guix/build-system/haskell.scm      |  2 +-
 guix/build-system/julia.scm        |  2 +-
 guix/build-system/linux-module.scm |  2 +-
 guix/build-system/maven.scm        |  2 +-
 guix/build-system/minify.scm       |  2 +-
 guix/build-system/node.scm         |  2 +-
 guix/build-system/ocaml.scm        |  2 +-
 guix/build-system/perl.scm         |  2 +-
 guix/build-system/python.scm       |  2 +-
 guix/build-system/r.scm            |  2 +-
 guix/build-system/rakudo.scm       |  2 +-
 guix/build-system/rebar.scm        |  2 +-
 guix/build-system/renpy.scm        |  2 +-
 guix/build-system/ruby.scm         |  2 +-
 guix/build-system/scons.scm        |  2 +-
 guix/build-system/texlive.scm      |  2 +-
 guix/build-system/waf.scm          |  2 +-
 33 files changed, 42 insertions(+), 41 deletions(-)

(limited to 'guix')

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 (default-agda)
 
 (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 047f884b19..23e14c7801 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -32,7 +32,7 @@ (define %android-ndk-build-system-modules
   ;; Build-side modules imported by default.
   `((guix build android-ndk-build-system)
     (guix build syscalls)
-    ,@%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 cfb033f6a5..c8beea010c 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -44,7 +44,7 @@ (define %ant-build-system-modules
     (guix build maven pom)
     (guix build java-utils)
     (guix build syscalls)
-    ,@%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 @@ (define %asdf-build-system-modules
   `((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 912400a191..e9d5421065 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -64,7 +64,7 @@ (define (default-rust)
 (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 @@ (define %chicken-build-system-modules
   ;; 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-module (guix build-system cmake)
 (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/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-module (guix build-system copy)
 (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 b4011cdb83..d53acd96e5 100644
--- a/guix/build-system/dub.scm
+++ b/guix/build-system/dub.scm
@@ -60,7 +60,7 @@ (define %dub-build-system-modules
   ;; Build-side modules imported by default.
   `((guix build dub-build-system)
     (guix build syscalls)
-    ,@%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 @@ (define %elm-build-system-modules
   `((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 @@ (define %emacs-build-system-modules
   ;; 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-module (guix build-system font)
 (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 %default-modules
 (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 c1aa187c42..0af59994c1 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -27,7 +27,8 @@ (define-module (guix build-system gnu)
   #: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 @@ (define-module (guix build-system gnu)
 ;;
 ;; 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 @@ (define* (dist-package p source #:key (phases '%dist-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 @@ (define* (gnu-build name inputs
                     (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)
@@ -499,8 +500,8 @@ (define* (gnu-cross-build name
                           (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 0a9761aac7..b1d589e342 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -107,7 +107,7 @@ (define %go-build-system-modules
   ;; 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 1bd292e267..7ac232bfca 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -36,7 +36,7 @@ (define %scheme-file-regexp
 (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 @@ (define (hackage-uri name 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-module (guix build-system julia)
 (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-module (guix build-system linux-module)
 (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 @@ (define %maven-build-system-modules
   ;; 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 787235deeb..21c17d1eb1 100644
--- a/guix/build-system/minify.scm
+++ b/guix/build-system/minify.scm
@@ -39,7 +39,7 @@ (define-module (guix build-system minify)
 (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-uglify-js)
   "Return the default package to minify JavaScript source files."
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 @@ (define %node-build-system-modules
   ;; 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-module (guix build-system ocaml)
 (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 7c6deb34bf..a8d954ea91 100644
--- a/guix/build-system/perl.scm
+++ b/guix/build-system/perl.scm
@@ -45,7 +45,7 @@ (define-module (guix build-system perl)
 (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 @@ (define* (pypi-uri name version #:optional (extension ".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 657346bea3..93acb6ab49 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -68,7 +68,7 @@ (define* (bioconductor-uri name version #:optional type)
 (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-module (guix build-system rakudo)
 (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 @@ (define (hexpm-uri name 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 @@ (define %renpy-build-system-modules
   `((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 @@ (define (rubygems-uri name 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-module (guix build-system scons)
 (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 @@ (define %texlive-build-system-modules
   ;; 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-module (guix build-system waf)
 (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
-- 
cgit v1.2.3