From patchwork Mon Jan 8 08:03:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58619 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 CA68727BBEA; Mon, 8 Jan 2024 08:05:25 +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 2E54E27BBE2 for ; Mon, 8 Jan 2024 08:05:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdJ-0003Yg-Ad; Mon, 08 Jan 2024 03:05:17 -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 1rMkdI-0003Xi-3h for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:16 -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 1rMkdH-00033u-Ru for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:15 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdN-00085y-SC for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:21 +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.170470110130717 (code B ref 68315); Mon, 08 Jan 2024 08:05:21 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:01 +0000 Received: from localhost ([127.0.0.1]:35020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd2-0007zG-Ig for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:00 -0500 Received: from 10.mo561.mail-out.ovh.net ([87.98.165.232]:55833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcy-0007yU-QN for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:57 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.176.72]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id A39D82976D for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:49 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-s2kmz (unknown [10.110.168.145]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2D30C1FEC8; Mon, 8 Jan 2024 08:04:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-s2kmz with ESMTPSA id sduLCaGsm2UHAgAAcWqa/g (envelope-from ); Mon, 08 Jan 2024 08:04:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005821a2ba4-ebdf-424e-8e42-7e62066ea37f, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:13 +0100 Message-ID: <20240108080350.1665-41-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: 12439223645776437986 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth 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/ruby.scm (ruby-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I8de0e2b382271e9ea09d2be9b6169ccfc792230b --- guix/build-system/ruby.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 77f1312c13..99c2f62101 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -88,7 +88,7 @@ (define* (ruby-build name inputs (modules '((guix build ruby-build-system) (guix build utils)))) "Build SOURCE using RUBY and INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -109,13 +109,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define ruby-build-system (build-system