From patchwork Tue Aug 12 09:04:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43375 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 4BF3827BC4A; Tue, 12 Aug 2025 10:07:40 +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 1D3FD27BC49 for ; Tue, 12 Aug 2025 10:07:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyG-0007Ui-EG; Tue, 12 Aug 2025 05:07:04 -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 1ulkyE-0007Sa-LI for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -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 1ulkyE-0001Tw-Cv for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -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=G1Fo37HwS2t1bGsEZJiHKQMw+EYK7h/GnTFzKmZtNW8=; b=BvFbKh/sbK/cFeT3sW2LnW2VsrE4Hl4legiNO4DitAnGr7IGRNeyJe1t/LQl5EkLmF2kQNTR1tm8WngqBoFzUwIZ7nVP3VIDLPOQqX5TX3t8YtuLOQ23wqoYt5YQCbxqd7y7Q3Y63/M+IkozQ1FSTIths8czGe03FrVhYxAT68UQT/a+i5wYCeo9bUTFlWUlXa9IRxpu3DAmYC4uUmujWQyCYjtw5tC0gL4+/9wGWx3D9lL6/MgzOtbDZwOkiK4v7vijHirj1j54SdE6oL0A6GVXX2+VT94KHWRfyadevnstqgFYIp+QZ/kjw94ZrRrwBApmRzocBPIxSfgvywR2qA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyE-0007nR-65 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 34/43] build-system: r: Redefine r-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:02 +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.175498958229845 (code B ref 79224); Tue, 12 Aug 2025 09:07:02 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:22 +0000 Received: from localhost ([127.0.0.1]:51915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxZ-0007l8-Qq for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:22 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:39175) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxF-0007eX-Qq for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:02 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbD4T4yz6MhB; Tue, 12 Aug 2025 09:06:00 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:00 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.139]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbD2YtNz5xRD; Tue, 12 Aug 2025 09:06:00 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D3D8AB8325D; Tue, 12 Aug 2025 09:05:59 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002b4386ad4-34b0-4e2e-9f5a-dc44691c0080, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:42 +0200 Message-ID: <20250812090457.19016-34-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: 285978579770139362 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=G1Fo37HwS2t1bGsEZJiHKQMw+EYK7h/GnTFzKmZtNW8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989560; v=1; b=SLgq2CfViSZs6LROWblmnmHS8/W8ANbdkVg5t60IwNdy7rXhpI2ihYfmYjkh9xoL7aYCZWrP snLkQiMCmKNtWUEMIRXS5ZeNL8PkK7IliC6DBbu09KVLczkYC3/Xh8RA+l5rf7agPoqJffuFfXi Mrqb+NvBaL40tbxIzxPtwpTmfFZuUEuycwPZVcrmxG3r1MAHztM/hd5Phs3hdD7XnQ0ImH6NrYR AtFM2m9Bqi3zUZBYuQSX4MUHrZaMNokxiwJAO+TkleiCFH6uDR/2Q0f0+EcVDlgOnf8E+190vSO lY31nc1UK0qPCuuDsz6gzy3BugE6n7NdhvhfIjoruOS/Q== 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/r.scm (r-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8f5a76eac6b65beba95852b7bf1645cd8a7b255a --- guix/build-system/r.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 4b4b3bf0c9a..9077080deec 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015-2024 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,12 +138,8 @@ (define builder search-paths)) #: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 - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define r-build-system (build-system