[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cro
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build. |
Date: |
Mon, 8 Jan 2024 09:02:53 +0100 |
* guix/build-system/go.scm
(go-build): Monadic procedure returns a gexp instead of a derivation.
(go-cross-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: I5222463ee5c37f4cd987ac60b1cf2c46eeb79008
---
guix/build-system/go.scm | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm
index 0934fded07..6e8f3c8153 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -217,11 +218,8 @@ (define builder
#:allow-go-reference? #$allow-go-reference?
#:inputs #$(input-tuples->gexp inputs)))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define* (go-cross-build name
#:key
@@ -257,7 +255,7 @@ (define %build-host-inputs
(define %build-target-inputs
(append #$(input-tuples->gexp host-inputs)
- #+(input-tuples->gexp target-inputs)))
+ #+(input-tuples->gexp target-inputs)))
(define %build-inputs
(append %build-host-inputs %build-target-inputs))
@@ -289,14 +287,8 @@ (define %outputs
#:allow-go-reference? #$allow-go-reference?
#:inputs %build-inputs))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:target target
- #:graft? #f
- #:substitutable? substitutable?
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define go-build-system
(build-system
--
2.41.0
- [bug#68315] [PATCH 11/48] build-system: cmake: Redefine cmake-build and cmake-cross-build., (continued)
- [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, 2024/01/08
- [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 <=
- [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