[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build.
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build. |
Date: |
Mon, 8 Jan 2024 09:02:47 +0100 |
* guix/build-system/dune.scm
(dune-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I2a0a9a771afbe491538ed50aeb47b9fa4fd9341b
---
guix/build-system/dune.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm
index c45f308349..990d94db0f 100644
--- a/guix/build-system/dune.scm
+++ b/guix/build-system/dune.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 pukkamustard <pukkamustard@posteo.net>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,6 +22,7 @@
(define-module (guix build-system dune)
#:use-module (guix store)
+ #:use-module (guix monads)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix search-paths)
@@ -152,11 +154,8 @@ (define builder
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories))))
- (gexp->derivation name builder
- #:system system
- #:target #f
- #:graft? #f
- #:guile-for-build guile))
+ (mbegin %store-monad
+ (return builder)))
(define dune-build-system
(build-system
--
2.41.0
- [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build., (continued)
- [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 04/48] build-system: agda: Redefine agda-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 07/48] build-system: asdf: Redefine asdf-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and cargo-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 09/48] build-system: chicken: Redefine chicken-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 06/48] build-system: ant: Redefine ant-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 12/48] build-system: composer: Redefine composer-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 11/48] build-system: cmake: Redefine cmake-build and cmake-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 16/48] build-system: elm: Redefine elm-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build.,
Nicolas Graves <=
- [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 14/48] build-system: dub: Redefine dub-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 19/48] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 17/48] build-system: emacs: Redefine emacs-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 18/48] build-system: font: Redefine font-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 20/48] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build., Nicolas Graves, 2024/01/08
- [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