From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id COWnKcWsm2U2awAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:05:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id aEQEIsWsm2XYxAAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:05:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701125; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=cGY2QN+Cjzj0cIEtxD5Nywlw59Ixf3pbFIwKDgy+fI8=; b=O8X9fed3AsnmqYKFwdTqMq4UBXWlt5UXu7wPDBDiCD/b9bNjlyjMJc6a2qFGn2mBGwYOcE xxiIMevww4QFiQEcFr2V6EZgyybRDSPsJ0uFQcWHVZJp6IUIFUTaj8h00o1yFVcgQhWb5d TKnFlSC8aY+lHgfWwcDlC+OH/bmInHrJvh5d9XiKscSCsY605IqrAZ6KRLN5o+eSZRxWDt oUGofMGVgghEL9XTad1EkKvPth4RYdXfb5R9gjcNMxglTN+MmYxNjao6Mq3tOepkpSmB1f ILA7Pge708joH8EBwnvQzL0LUTrGFDyu9/31/5Z53reKZGlXFfJibTCNOi7XvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701125; a=rsa-sha256; cv=none; b=GMHU13owG+dgVAz0GlR1GibJtEzsOMjwJbuUM8d7b+x82HWCacu5ZaEwq7jryeUYH0XMi1 5504CBI0qZdMIB/zt57YeD8GrwfAD04HJVVhUPkPXj1cGJNdpkbNNBuXhryJl2hg5q7BuE jVYuEisJKnI/rTero3HHWxXkYy4i4Fw+QtvELXTcZBqtDWpk9HHX5MvCoT1OymNVufQ+sn KK8bSx+Ky2VV1I3FY81Pess+blVoouGUIUH2/MdcdTy6GrShg15J5iHSFpE9pesgdTOoko tqCsdFXSH487I/lBFChCcdjmN4Nks8Uu/R6bLJgf7y0N79nrPFm2Dv/IxGtOdg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4D0F7151DE for ; Mon, 8 Jan 2024 09:05:25 +0100 (CET) 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 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 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.29 X-Spam-Score: -6.29 X-Migadu-Queue-Id: 4D0F7151DE X-TUID: gZEzjZZQ7mmp * 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 -- 2.41.0