[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-bu
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build. |
Date: |
Mon, 8 Jan 2024 09:03:05 +0100 |
* guix/build-system/pyproject.scm
(pyproject-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Ia26001291b472c69c65647d8bddd1199f0ddc483
---
guix/build-system/pyproject.scm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 2a2c3af3f3..c0404d0842 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -100,7 +101,7 @@ (define* (pyproject-build name inputs
(modules '((guix build pyproject-build-system)
(guix build utils))))
"Build SOURCE using PYTHON, and with INPUTS."
- (define build
+ (define builder
(with-imported-modules imported-modules
#~(begin
(use-modules #$@(sexp->gexp modules))
@@ -124,14 +125,8 @@ (define build
search-paths))
#:inputs %build-inputs)))))
-
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name build
- #:system system
- #:graft? #f ;consistent with 'gnu-build'
- #:target #f
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define pyproject-build-system
(build-system
--
2.41.0
- [bug#68315] [PATCH 22/48] build-system: guile: Redefine guile-build and guile-cross-build., (continued)
- [bug#68315] [PATCH 22/48] build-system: guile: Redefine guile-build and guile-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 24/48] build-system: julia: Redefine julia-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 26/48] build-system: maven: Redefine maven-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 23/48] build-system: haskell: Redefine haskell-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 28/48] build-system: minify: Redefine minify-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 29/48] build-system: mix: Redefine mix-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 30/48] build-system: node: Redefine node-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 32/48] build-system: perl: Redefine perl-build and perl-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build.,
Nicolas Graves <=
- [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 38/48] build-system: rebar: Redefine rebar-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 34/48] build-system: python: Redefine python-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 39/48] build-system: renpy: Redefine renpy-build., Nicolas Graves, 2024/01/08
- [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