From patchwork Tue Aug 12 09:04:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43394 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 3CE2827BC4C; Tue, 12 Aug 2025 10:07:06 +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 B364927BC4A for ; Tue, 12 Aug 2025 10:07:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxf-0006u2-Rk; Tue, 12 Aug 2025 05:06:29 -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-0006om-4s 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 1ulkxS-0001JY-Jl for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -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=J1N1oy8V/waDsP+0YrR8VIDHngjwuRzmRZgZR66Sx+Y=; b=aDFo/GeG+5VMLy+TXMH73mPdnH/t9iAh+0j6/6HVeOj/altVouQj7ojzPmQXek6zGULEEuLJ/73xON+xsNV6tJFtavt4LhrAe9fnbIJIG83cTGwXPPqYIlD9oW3CrP51WH8Zk707rqexSwNsGniKRsObX9/GLWeKRQYWlX/XOKe2/AUidUK6ww0gaRzYfEDXiLq0m+SWbzRpvnII9FoJxmhns119zP0ibh7BoI30l6O1Cshrl98PkChI/ed3XXB5ea9i27n4a6048HJHwi+ehw7WmULz1XLo2IGHcO699ob07gTB3sHHoSsmznWqk7QDsXIjmYDcechQmfc4yXVkmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxS-0007ig-BU for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 20/43] build-system: guile: Redefine guile-build and guile-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:14 +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.175498955929401 (code B ref 79224); Tue, 12 Aug 2025 09:06:14 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:59 +0000 Received: from localhost ([127.0.0.1]:51832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxD-0007e3-0n for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:59 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:37013) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwr-0007bI-R3 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:38 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZm51Hqz20qv; Tue, 12 Aug 2025 09:05:36 +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:36 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.13]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZm3gD7z1xpf; Tue, 12 Aug 2025 09:05:36 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 18757B8325D; Tue, 12 Aug 2025 09:05:35 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0064389161d-e6bb-46c5-9f79-396d6ae0a205, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:28 +0200 Message-ID: <20250812090457.19016-20-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: 279223179552350946 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=J1N1oy8V/waDsP+0YrR8VIDHngjwuRzmRZgZR66Sx+Y=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989536; v=1; b=jafqqIPBEcUkn2D8ZtRo7Aj4uihoSDx6zBy1sHTaeU9Je4qnI3+ojVfCbdimap5rKL484IFS OqYOVjYQzoQ25wtbp8+XK/Ncu47A8otQkEOgsCBLtvY8nonII6a7wb/CqivHr38A0t2mdAb+CMx yWIbg49St+tGs7+H1BYN2NGIFmWhD0fxzO64g3m5+28es/tQ9RD5M+CBBEHIPDNALK84iFW18/Z ykjBd9whoFz+vGFpwgZGpX8EmLUYpEPAtCBplT2X2d3djlvJHCL3s5xndYY4rJGLKmlLAchWFrp hLZe0a60NDhJ0Ypdy1cp/pliWQKVW/g7iYnnpWAHb1P+g== 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/guile.scm (guile-build): Monadic procedure returns a gexp instead of a derivation. (guile-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I60f2d7707f064ef6a678e8e47e21309d0eb545ef --- guix/build-system/guile.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 16e37eefd10..f196464feed 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018-2019, 2021-2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,14 +122,8 @@ (define builder #:search-paths '#$(map search-path-specification->sexp search-paths))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (guile-cross-build name #:key @@ -190,14 +185,8 @@ (define %outputs #:make-dynamic-linker-cache? #f ;cross-compiling #:phases #$phases)))) - (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 guile-build-system (build-system