From patchwork Fri Apr 25 09:26:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42001 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 A3C9027BC49; Fri, 25 Apr 2025 10:29:35 +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=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 36DB127BC4D for ; Fri, 25 Apr 2025 10:29:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FMz-0005Cf-6q; Fri, 25 Apr 2025 05:29:18 -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 1u8FMn-000586-AX for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:06 -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 1u8FMl-0007pm-UP for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -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=/d6mz+SKT2aK9ebPjs7TpPMcIxrZGwL7B/OCF/OKMak=; b=TprSjUh78HdjcoZQB8f7x1hYOMc9hMkKcP0j9AFvW8UpAYnNqplRQH+DLwUYuNcs9ODp0N0KTIRTkwKUdn7c2AtEbeVImdXVPOOJe2uWnLwphUEO0Hcpsk/gG/H0760UVjmJfGXEiGp1nfmt01+aRtoMjjG2VvtFnAFtkFm5HfDI8Dx47J/VNMuGKb6sSTN4zTBLolrGcsRGmD5DiAUOBy2Ooc6EnB4cn4GAC/eWsvjjsQ2mNuxY1FlxDUxCTz61HRlHA8bdr2F89NQCRXZxpytg6d5zLaruZVes3O79igj5yGSnohQpt7KUTO6WRQHxauSjdm01JLn2OqC/RmbKWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMl-0000Sg-Nw for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 4/5] build-system: ruby: Improve ruby-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455733071666 (code B ref 78050); Fri, 25 Apr 2025 09:29:03 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:27 +0000 Received: from localhost ([127.0.0.1]:47375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FMA-0000Qn-Vx for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:27 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:50231) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLx-0000Pa-PH for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:14 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF76FYYz1475; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78050@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.118]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF72nPDz7wVj; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DA0C7BA3F7D; Fri, 25 Apr 2025 09:28:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005853271cf-54b4-448c-bdfb-45e30a02f9da, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:33 +0200 Message-ID: <20250425092759.30369-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6173027716027507426 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=/d6mz+SKT2aK9ebPjs7TpPMcIxrZGwL7B/OCF/OKMak=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573291; v=1; b=k7cq/AdovXG3GxXXFf33/AMQQBqhhYwyFdnE0C+tPyGTHLe2XzLDGZ7jVxOoXzkGUnHpP6fI J2TP68WXK1lbQ4bRU2qNb9rSJUrbrM64KmoWRydyx91ixCFkcnMD55GgosvEgVk79Ut8/pFGTaM MA8EcfY8uVJ/IPKO9dhUCMD3L2h2RNIftAJUc6ZEGNBnvbIc37Y0URnytCr77TxtR3POPp93zVB Xy8ib1Vtb5Qg4LpfCVfjfS/o2uvyPU/XgezrJaWN0WVgu1C/PjDa8zJoT9MUYrTwW/xdDpq/HVX WmzJ9hhtc/bPooIXXeYzmitDuVLgRgw0ym8Q2oLVbsuxg== 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-cross-build): Use with-imported-modules around the ruby-cross-build builder gexp. Change-Id: I1051124f034f2082ccef531e9bcf37913d5a9449 --- guix/build-system/ruby.scm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 33aab5f7190..f258ade6e75 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,24 +89,25 @@ (define* (ruby-build name inputs (guix build utils)))) "Build SOURCE using RUBY and INPUTS." (define build - #~(begin - (use-modules #$@(sexp->gexp modules)) + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) - #$(with-build-variables inputs outputs - #~(ruby-build #:name #$name - #:source #+source - #:system #$system - #:gem-flags #$gem-flags - #:test-target #$test-target - #:tests? #$tests? - #:phases #$(if (pair? phases) - (sexp->gexp phases) - phases) - #:outputs %outputs - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:inputs %build-inputs)))) + #$(with-build-variables inputs outputs + #~(ruby-build #:name #$name + #:source #+source + #:system #$system + #:gem-flags #$gem-flags + #:test-target #$test-target + #:tests? #$tests? + #:phases #$(if (pair? phases) + (sexp->gexp phases) + phases) + #:outputs %outputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs %build-inputs))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) @@ -113,7 +115,6 @@ (define build #:system system #:target #f #:graft? #f - #:modules imported-modules #:guile-for-build guile))) (define ruby-build-system