From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 68315@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions.
Date: Mon, 8 Jan 2024 09:03:20 +0100 [thread overview]
Message-ID: <20240108080350.1665-48-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr>
* guix/build-system/trivial.scm
(trivial-build): Monadic procedure returns a gexp instead of a derivation.
(trivial-cross-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I261d5d5ae027a174eafa972e4f598afdc394caa3
---
guix/build-system/trivial.scm | 41 ++++++++++++++---------------------
1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index e08884baf1..bc71c94132 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,18 +52,13 @@ (define* (trivial-build name inputs
search-paths allowed-references)
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored."
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f))
- (builder -> (if (pair? builder)
- (sexp->gexp builder)
- builder)))
- (gexp->derivation name (with-build-variables inputs outputs builder)
- #:system system
- #:target #f
- #:graft? #f
- #:modules modules
- #:allowed-references allowed-references
- #:guile-for-build guile)))
+ (mlet* %store-monad ((builder -> (if (pair? builder)
+ (sexp->gexp builder)
+ builder)))
+ (return (with-imported-modules modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ #$(with-build-variables inputs outputs builder))))))
(define* (trivial-cross-build name
#:key
@@ -73,21 +69,16 @@ (define* (trivial-cross-build name
allowed-references)
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored."
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f))
- (builder -> (if (pair? builder)
+ (mlet* %store-monad ((builder -> (if (pair? builder)
(sexp->gexp builder)
builder)))
- (gexp->derivation name (with-build-variables
- (append build-inputs target-inputs host-inputs)
- outputs
- builder)
- #:system system
- #:target target
- #:graft? #f
- #:modules modules
- #:allowed-references allowed-references
- #:guile-for-build guile)))
+ (return (with-imported-modules modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ #$(with-build-variables
+ (append build-inputs target-inputs host-inputs)
+ outputs
+ builder))))))
(define trivial-build-system
(build-system
--
2.41.0
next prev parent reply other threads:[~2024-01-08 8:06 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 7:51 [PATCH 00/48] Extend bag-build to gexps Nicolas Graves via Development of GNU Guix and the GNU System distribution.
2024-01-10 21:50 ` Nicolas Graves via Development of GNU Guix and the GNU System distribution.
2024-01-08 8:00 ` [bug#68315] " Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 01/48] guix: packages: Extend bag-build to support gexp Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 02/48] build-system: gnu: Improve gnu-cross-build style Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 04/48] build-system: agda: Redefine agda-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 06/48] build-system: ant: Redefine ant-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 07/48] build-system: asdf: Redefine asdf-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and cargo-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 09/48] build-system: chicken: Redefine chicken-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 11/48] build-system: cmake: Redefine cmake-build and cmake-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 12/48] build-system: composer: Redefine composer-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 14/48] build-system: dub: Redefine dub-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 16/48] build-system: elm: Redefine elm-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 17/48] build-system: emacs: Redefine emacs-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 18/48] build-system: font: Redefine font-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 19/48] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 20/48] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 22/48] build-system: guile: Redefine guile-build and guile-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 23/48] build-system: haskell: Redefine haskell-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 24/48] build-system: julia: Redefine julia-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 26/48] build-system: maven: Redefine maven-build Nicolas Graves via Guix-patches via
2024-01-08 8:02 ` [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 28/48] build-system: minify: Redefine minify-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 29/48] build-system: mix: Redefine mix-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 30/48] build-system: node: Redefine node-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and perl-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 34/48] build-system: python: Redefine python-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 37/48] build-system: rakudo: Redefine rakudo-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 38/48] build-system: rebar: Redefine rebar-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 39/48] build-system: renpy: Redefine renpy-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` [bug#68315] [PATCH 47/48] build-system: zig: Redefine zig-build Nicolas Graves via Guix-patches via
2024-01-08 8:03 ` Nicolas Graves via Guix-patches via [this message]
2024-01-08 22:49 ` [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions Nicolas Graves via Guix-patches via
2024-04-13 20:53 ` [bug#68315] [Nicolas Graves] Re: [PATCH 00/48] Extend bag-build to gexps Nicolas Graves via Guix-patches via
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240108080350.1665-48-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=68315@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.