From patchwork Tue Aug 12 09:04:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43373 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 899CD27BC4C; Tue, 12 Aug 2025 10:07:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 0080827BC49 for ; Tue, 12 Aug 2025 10:07:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxw-00074m-B1; Tue, 12 Aug 2025 05:06:44 -0400 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 1ulkxT-0006oq-EX for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 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 1ulkxT-0001JO-44 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=bVXTRMUbcB7tls+b/xtsUagkOFVwFO4Vxj6M8fwTsoo=; b=nE9GhyU/7pybLOdKFf0kJKLJF6JU5TRrKHvPwQzrvf4WxVK0Aqngdm9AVz23ynvQ0wixoGQ7mggdLKGSfsTxKyVUAX1gNf/NzMrhu1VQs+oSnQO7knQAvZb/Eg2xdYfs5HYwKJzn5izBq5sHnBZvNxgpHAFTLXKpCiwZU5TmI47BCc6YR6zODH6bI8cnWukXby34+RrXIn1Z9gk7acAxKfM6FarP+Ukg62CEuN7E57KdxNUt9b1ifdVNMJTpXL3VmTDtOKm22jQotcBXq6UoaSUzrk7zX1EU4rCqX96VbdBLUcICQe5yOQRmbUOQlh986DUCiUBca/XaMKf0nxnS9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxR-0007iY-TD for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 19/43] 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: Tue, 12 Aug 2025 09:06:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79224@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498955829384 (code B ref 79224); Tue, 12 Aug 2025 09:06:13 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:58 +0000 Received: from localhost ([127.0.0.1]:51828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxB-0007dg-N5 for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:58 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:60439) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwp-0007b4-Py for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:36 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZk4R9Jz5yC3; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.205]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZk3S92z1xqp; Tue, 12 Aug 2025 09:05:34 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0B7C08E327B; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G0056c8cb75a-451b-4919-9e64-6441752203fe, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:27 +0200 Message-ID: <20250812090457.19016-19-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812090457.19016-1-ngraves@ngraves.fr> References: <20250812090457.19016-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 278660228378976994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=bVXTRMUbcB7tls+b/xtsUagkOFVwFO4Vxj6M8fwTsoo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989534; v=1; b=cymoPytPCw/mU+31tyb8D8ueAeK+JZRWmEld5QmD2+7tpOn1pu7xrPnM8r3owFxKOPLltZvu hJoZbzoJQvsyMp1r2OwmH2jBqNayNXC5rUl1UR8sy2LLdDVJMOCMNn0eWqmHWA1ktki9zjz2P4/ pwIa3C/w1/way3JeJEFdwmyX/6C7DSt8AV52G6S9PshJAgXkZaGLJXcWx4u1rntSUCpir5K6n1X OKp6oONfT0DKWwQxrgG/RiNi2AnhLB1Kqmbslmnyb0YnUm94uqe1J4znLFthCEc3YnsZbVdKYtw n/1d62ig+LH/afqcWnpPMQ+R/aX/DHB+JcXybnyf0B7KQ== 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 | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 90e63640c1a..f76d969e331 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2024 Christina O'Donnell ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -248,12 +249,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 - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (go-cross-build name #:key @@ -295,7 +292,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)) @@ -333,14 +330,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