[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions. |
Date: |
Mon, 08 Jan 2024 23:49:58 +0100 |
This last patch can be skipped if we want to avoid a lot of rebuilds,
and it doesn't matter for easier extensibility since the trivial
build-system is extensible.
On 2024-01-08 09:03, Nicolas Graves wrote:
> * 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
--
Best regards,
Nicolas Graves
- [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build., (continued)
- [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 37/48] build-system: rakudo: Redefine rakudo-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 47/48] build-system: zig: Redefine zig-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions.,
Nicolas Graves <=