[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build.
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 31/48] build-system: ocaml: Redefine ocaml-build. |
Date: |
Mon, 8 Jan 2024 09:03:03 +0100 |
* guix/build-system/ocaml.scm
(ocaml-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Ib525ddc1df03b33b95a433dd2add79405f611f94
---
guix/build-system/ocaml.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 582d00b4cd..1872033e91 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build-system ocaml)
#:use-module (guix store)
+ #:use-module (guix monads)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix search-paths)
@@ -305,11 +307,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 ocaml-build-system
(build-system
--
2.41.0
- [bug#68315] [PATCH 20/48] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions., (continued)
- [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
- [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 <=
- [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, 2024/01/08
- [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