From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id AD/KIrLd7mPyVAAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 02:51:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SDPlIbLd7mMsUgEA9RJhRA (envelope-from ) for ; Fri, 17 Feb 2023 02:51:46 +0100 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 62EB91C649 for ; Fri, 17 Feb 2023 02:51:46 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSpu3-0007fq-8p; Thu, 16 Feb 2023 20:51:11 -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 1pSptv-0007e6-Fb for guix-patches@gnu.org; Thu, 16 Feb 2023 20:51:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSptv-0004NS-7Q for guix-patches@gnu.org; Thu, 16 Feb 2023 20:51:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSptv-0007VP-4N for guix-patches@gnu.org; Thu, 16 Feb 2023 20:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61255] [PATCH v2 3/8] gexp: computed-file: Honor %guile-for-build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 01:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61255@debbugs.gnu.org Cc: Josselin Poiret , Tobias Geerinckx-Rice , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , ludo@gnu.org, Christopher Baines , Ricardo Wurmus Received: via spool by 61255-submit@debbugs.gnu.org id=B61255.167659862228731 (code B ref 61255); Fri, 17 Feb 2023 01:51:03 +0000 Received: (at 61255) by debbugs.gnu.org; 17 Feb 2023 01:50:22 +0000 Received: from localhost ([127.0.0.1]:38077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSptF-0007TK-Iu for submit@debbugs.gnu.org; Thu, 16 Feb 2023 20:50:21 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:38714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSptA-0007SJ-2L for 61255@debbugs.gnu.org; Thu, 16 Feb 2023 20:50:16 -0500 Received: by mail-qv1-f48.google.com with SMTP id t8so2962505qvr.5 for <61255@debbugs.gnu.org>; Thu, 16 Feb 2023 17:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bKDybqOc/LxTbZoiKTfBCMuO2X8OO7B/1efhB9eM2VU=; b=FFfNLcrHlwwlyORP3ONqeHykZgZ6KvVgXcwJueDyBHacfSeDkXmDeRjgcClskJ/PeN IKSyDgmNVDCxxZhr7JY6Y+o1GBvZxaNDtmhghKzEZTfAmKzaVZiTQunCzIcdE2xmikM5 cinUfFHcafr14Zd/Fr2jWjVvysnlQ2e9JHDG/+Fvyu+gKuKv+MY3rtRvrbqMZRBgjYPC o7lzvdXdGkQxC3f5EFoI5+fFkK52DEnrMyDYphmFAexRE5P4pDrbRQQal0YddfU26dhx DRbZgyCxWwTlY8aBE8bL60hHYFvlx58z8Q9U/EVg50rVsmzsV1v5CZcrBFSyiqn3b2Gg 3jeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bKDybqOc/LxTbZoiKTfBCMuO2X8OO7B/1efhB9eM2VU=; b=6HInZX4XCqI1THiqDiRFkFaYQsoJPf0haszVGpi684AGUj5ZS0yLQSTlsQiycq3UbV 0xQXBSOzK7Z4P8uyOvLhHG4qqVVIXrRHB9+85CwM8lMq3w0+KBfm8IKDTNcDZBU6S1MW IGnEIK8VVK5KwJ2id+2Fb72xe0zPWCyNEAdYjKkl3Q5JdgkPXwfDah+XnlzHjeFDOuOf Ma90owOCzaqoeaWEGfBhplW9xAPyzS5qT7VoyPMD/Q3FoVboxmGhD5OSzpfRDBj9jeBq grK+jsZm5+GzDM28uyHxqNUxDLbGT885x1LL9Fq95ALu49lhlGY8qJNkHVVG1hWFrUcd V0xQ== X-Gm-Message-State: AO0yUKV1b6AFnGpaHHaFBRHLQ/W4DZv7TW3BTF6mWxKzh3DS38M2cypr VvVsP/E7JHUWsJP+4rAJjw5jGaJjySPBwdgS X-Google-Smtp-Source: AK7set9H2AE4ag4uzMcE5BQei0DumFogdlrnxFam6eTmSOH3tj8sc1QNHe3W4rI2dOCtKfdsFM6z/A== X-Received: by 2002:a05:6214:27cc:b0:56e:a7d1:4d65 with SMTP id ge12-20020a05621427cc00b0056ea7d14d65mr13074735qvb.52.1676598610474; Thu, 16 Feb 2023 17:50:10 -0800 (PST) Received: from localhost.localdomain (dsl-152-188.b2b2c.ca. [66.158.152.188]) by smtp.gmail.com with ESMTPSA id g66-20020a37b645000000b0073b425f6e33sm2316242qkf.100.2023.02.16.17.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 17:50:10 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 02:49:32 +0100 Message-Id: <20230217014938.20919-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217014938.20919-1-maxim.cournoyer@gmail.com> References: <20230217014938.20919-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676598706; h=from:from:sender:sender: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:dkim-signature; bh=bKDybqOc/LxTbZoiKTfBCMuO2X8OO7B/1efhB9eM2VU=; b=LPxPByH3O6ioG28Eocf8b47d1SOIJnv82jeclBrvDobIu8xpQP69ovhHelaFgWEIdzXDgd IGPpS0ApcTiqwVmEGDjz6vdeMJ+G7em54Tga06UUtFTeY7WbAUNgyjHQWL7UykuNdfAGB7 UKtvwdks2fKS/qYtLphf9hkc+jx2cPHZXKMUSQpDXOPlIX/czTdTTzyWGgfMifn9yrsVu4 kSl87ZOf8EGyEtoRIojkqKPn8OrRv4a1dCCkFH0nlXOd/h2xoCtrklbQQu3kgqbqZOXoF6 kGbKMtJo8x3qwNqBVGegfx48QPCXvLtfpvXdbtPxQ5Eet/dowQmO8CTtxSb2IA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FFfNLcrH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676598706; a=rsa-sha256; cv=none; b=FNx8r07Mh57pEkUDAfJWvxaPzhztLYBBHMiqGw6gpb97OY2W1i9aWWrPC5S59dfd7XoV2j hMr2ICRlu/GgumcdJ+ysHjGThFaLHHgB0fio7pTbsBGci/P0yfFpWNr9gvvR+8pc23NpuN us/rh9GH2Wx03UkA5o12UAFMt051nuymxVycoLFTiSMWoHVP8dGDKmufcKrvrsfZhma+ps mMKvzzkxv+K5Jkb0ysiSXXvDJd3rod36yZPS4SV4mJnK4DSf2tx6fWO/PPhLOvDHlxi58g E07rGglLL3aZB0iVZBTmsWhATnS+vetyhIo+HEcOlPBM6BR10mqloAlzaRWPeQ== X-Migadu-Spam-Score: -0.02 X-Spam-Score: -0.02 X-Migadu-Queue-Id: 62EB91C649 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FFfNLcrH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-TUID: KrsozqxxDT+y * guix/gexp.scm (computed-file-compiler): Honor %guile-for-build. --- (no changes since v1) guix/gexp.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 5f92174a2c..cabf163076 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -584,7 +584,8 @@ (define-record-type (options computed-file-options)) ;list of arguments (define* (computed-file name gexp - #:key guile (local-build? #t) (options '())) + #:key guile + (local-build? #t) (options '())) "Return an object representing the store item NAME, a file or directory computed by GEXP. When LOCAL-BUILD? is #t (the default), it ensures the corresponding derivation is built locally. OPTIONS may be used to pass @@ -600,7 +601,8 @@ (define-gexp-compiler (computed-file-compiler (file ) ;; gexp. (match file (($ name gexp guile options) - (mlet %store-monad ((guile (lower-object (or guile (default-guile)) + (mlet %store-monad ((guile (lower-object (or guile (%guile-for-build) + (default-guile)) system #:target #f))) (apply gexp->derivation name gexp #:guile-for-build guile #:system system #:target target options))))) -- 2.39.1