From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mEnKEjOtm2W6/QAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:07:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 4GPKCjOtm2UYPAEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:07:15 +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=1704701235; 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-type:content-type: 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=kB0sGJ+xsL2kWRyGpll9Z9T/0/jePxE16VkPHWnNphQ=; b=jvcqRCB2B8Bs3nfxXfej6WlB/NoYXLXL1L0FFJiSW7MO6jPgZY3CJiSOIbyWE0KJ7DJYE4 0V23cVlZZrfT2Z1N5t0x/wHJDTpYd4X7vLKnDu8WIZoOrIRsw0+XzCX8Am9YVY1vfR/xHk 6oTYOAhp08WKGtxUh3syD+reEnWAkY3Ye1BfPvd/PT3xW8IYR7gM5nwk6H+XR9UzOv4GSX QYjLMM/eEwUqlWfZSpDSySh+SG7I2jNvhNKGtIuxUBLZRkv8Thd2oAKdK/bqHkCc9hwRm1 XFbBK7Ds8gyR17ojY+ZBhXbQDLg91hEPRsBNwXlXGKeTyZeqCxhlwURmCeOVgA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701235; a=rsa-sha256; cv=none; b=lJq10zKS+tw1flBOixeWJg+huHSfMQ1CJDeHWywsPMPRNxYdu1KWP3wvGyp2eSMR0jx7Iz BXeORpyQStfyl/YC3R59bUoYp3aJOcusu7i0CjruC8ovZvIpv1G4jRJui3LlN/VVvr+nmB 0YVQyvPesOTkLbXwkRIo+kBii2/CGg1U+pshe3qzBwMEIlZ630EGmRwBcdd2gcQa4uBTz0 GQdZF+1pAcvWWVfcyxL84l9Hk3W2UajfiUbEixixR8ge552lXMVdgS7la58gXKcNrldNNw DLnganrGx5jxCwVfSHHOx69pY/k5vQx5AM+pmQLuTJawYei1TJXyOrrdvU9SjQ== 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 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 D593F17C0F for ; Mon, 8 Jan 2024 09:07:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdL-0003aU-9U; Mon, 08 Jan 2024 03:05:19 -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 1rMkdH-0003XN-Np for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:15 -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-00033j-Fg 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-00085q-Gi for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style. 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.170470110030709 (code B ref 68315); Mon, 08 Jan 2024 08:05:21 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:00 +0000 Received: from localhost ([127.0.0.1]:35017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd1-0007z1-IJ for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:00 -0500 Received: from 1.mo582.mail-out.ovh.net ([46.105.56.136]:55117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcy-0007yS-4Q for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:57 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.9.148]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id C30E42915B for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:48 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-g88tt (unknown [10.110.96.131]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 90A641FEAF; Mon, 8 Jan 2024 08:04:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-g88tt with ESMTPSA id IyD3IKCsm2XCKgAAk8/VOA (envelope-from ); Mon, 08 Jan 2024 08:04:48 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:12 +0100 Message-ID: <20240108080350.1665-40-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12438942172637684450 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.81 X-Spam-Score: -6.81 X-Migadu-Queue-Id: D593F17C0F X-Migadu-Scanner: mx12.migadu.com X-TUID: YtaDX++Q1Irs * 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 a3793a9381..77f1312c13 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 -- 2.41.0