From patchwork Mon Jan 8 08:02:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58628 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 59F1627BBE2; Mon, 8 Jan 2024 08:06:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DC1B27BBE2 for ; Mon, 8 Jan 2024 08:06:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdB-0003O3-BT; Mon, 08 Jan 2024 03:05:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMkd9-0003MQ-Db for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMkd9-000307-5C for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdF-00083N-5j for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 21/48] build-system: go: Redefine go-build and go-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470107430426 (code B ref 68315); Mon, 08 Jan 2024 08:05:13 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:34 +0000 Received: from localhost ([127.0.0.1]:34961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcb-0007uT-QN for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500 Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:38613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcV-0007t7-91 for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:28 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.2.72]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 065522FC27 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:20 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-n7x8q (unknown [10.110.168.38]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A7EB01FD5B; Mon, 8 Jan 2024 08:04:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-n7x8q with ESMTPSA id HcKVJoOsm2WmAQAAxpI9mw (envelope-from ); Mon, 08 Jan 2024 08:04:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0013721d57c-8756-485a-a951-f12a49366416, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:53 +0100 Message-ID: <20240108080350.1665-21-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12430779398944580322 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2021, 2023 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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