From: Bruno Victal <mirai@makinata.eu>
To: 60826@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>, liliana.prikler@gmail.com
Subject: [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable.
Date: Mon, 19 Jun 2023 23:07:05 +0100 [thread overview]
Message-ID: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> (raw)
In-Reply-To: <c8c976b9d2598c46cc0c688095aabf9db43650d9.1673749940.git.mirai@makinata.eu>
This makes tweaking the #:module argument less reliant on the programmers
astral wisdom to divine the right module imports.
* guix/build-system/gnu.scm (%default-modules): Rename to …
(%gnu-default-modules): … this and export it as well.
---
guix/build-system/gnu.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3308302472..448a2b2a44 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -28,6 +28,7 @@ (define-module (guix build-system gnu)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (%gnu-build-system-modules
+ %gnu-default-modules
%strip-flags
%strip-directories
gnu-build
@@ -55,7 +56,7 @@ (define %gnu-build-system-modules
(guix build gremlin)
(guix elf)))
-(define %default-modules
+(define %gnu-default-modules
;; Modules in scope in the build-side environment.
'((guix build gnu-build-system)
(guix build utils)))
@@ -237,7 +238,7 @@ (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 %gnu-default-modules)
`((guix build gnu-dist)
,@modules))
((#:imported-modules modules %gnu-build-system-modules)
@@ -360,7 +361,7 @@ (define* (gnu-build name inputs
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
- (modules %default-modules)
+ (modules %gnu-default-modules)
(substitutable? #t)
allowed-references
disallowed-references)
@@ -500,7 +501,7 @@ (define* (gnu-cross-build name
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
- (modules %default-modules)
+ (modules %gnu-default-modules)
(substitutable? #t)
allowed-references
disallowed-references)
--
2.39.2
next prev parent reply other threads:[~2023-06-19 22:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-15 2:32 [bug#60826] [PATCH staging] gnu: shared-mime-info: Update to 2.2 Bruno Victal
2023-03-22 0:52 ` Maxim Cournoyer
2023-06-17 1:26 ` [bug#60826] [PATCH v2] " Bruno Victal
2023-06-17 4:40 ` Liliana Marie Prikler
2023-06-19 22:07 ` [bug#60826] [PATCH gnome-team v3 1/5] gnu: shared-mime-info: Move to (gnu packages freedesktop) Bruno Victal
2023-06-19 22:07 ` Bruno Victal [this message]
2023-06-20 4:18 ` [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable Liliana Marie Prikler
2023-06-20 6:59 ` Bruno Victal
2023-06-20 16:56 ` Liliana Marie Prikler
2023-06-19 22:07 ` [bug#60826] [PATCH gnome-team v3 3/5] gnu: Add xdgmime Bruno Victal
2023-06-19 22:07 ` [bug#60826] [PATCH gnome-team v3 4/5] gnu: shared-mime-info: Update to 2.2 Bruno Victal
2023-06-19 22:07 ` [bug#60826] [PATCH gnome-team v3 5/5] gnu: shared-mime-info: Add doc output Bruno Victal
2023-06-22 19:33 ` [bug#60826] [PATCH gnome-team v4 1/4] gnu: shared-mime-info: Move to (gnu packages freedesktop) Bruno Victal
2023-06-22 19:33 ` [bug#60826] [PATCH gnome-team v4 2/4] gnu: Add xdgmime Bruno Victal
2023-06-22 19:33 ` [bug#60826] [PATCH gnome-team v4 3/4] gnu: shared-mime-info: Update to 2.2 Bruno Victal
2023-06-22 19:54 ` Liliana Marie Prikler
2023-06-22 19:33 ` [bug#60826] [PATCH gnome-team v4 4/4] gnu: shared-mime-info: Add doc output Bruno Victal
2023-06-22 19:56 ` Liliana Marie Prikler
2023-06-25 6:21 ` bug#60826: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu \
--to=mirai@makinata.eu \
--cc=60826@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).