From patchwork Mon Jan 8 08:03:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 21707 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 26FD027BBEA; Mon, 8 Jan 2024 08:07:22 +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=unavailable 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 BDC3227BBE2 for ; Mon, 8 Jan 2024 08:07:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdH-0003Wq-Cy; Mon, 08 Jan 2024 03:05:15 -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 1rMkdG-0003VK-1Y for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:14 -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 1rMkdF-000337-Pt for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdL-00085N-Qi for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:19 +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.170470109330638 (code B ref 68315); Mon, 08 Jan 2024 08:05:19 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:53 +0000 Received: from localhost ([127.0.0.1]:35004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcu-0007xt-Kx for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:53 -0500 Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]:53695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcq-0007x9-Q9 for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:49 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.17.95]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 3A9FC26844 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:41 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m5qnx (unknown [10.110.96.89]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0CA141FEB0; Mon, 8 Jan 2024 08:04:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-m5qnx with ESMTPSA id 7uH6AZmsm2WCRgAAxu9BGQ (envelope-from ); Mon, 08 Jan 2024 08:04:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G001f3888731-a98b-4611-a56e-6ca8a6651ee8, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:08 +0100 Message-ID: <20240108080350.1665-36-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: 12436971847857791714 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth 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 7ab4db82b6..e6e3a99a8d 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-2023 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -135,12 +136,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