From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 OP7KA7m+mGPPTQEAbAwnHQ (envelope-from ) for ; Tue, 13 Dec 2022 19:04:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8MbwArm+mGOX/QAAG6o9tA (envelope-from ) for ; Tue, 13 Dec 2022 19:04:41 +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 D1BF02934A for ; Tue, 13 Dec 2022 19:04:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p59dC-00079M-8W; Tue, 13 Dec 2022 13:03:54 -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 1p59cN-000715-G6 for guix-patches@gnu.org; Tue, 13 Dec 2022 13:03: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 1p59cN-0000l5-4R for guix-patches@gnu.org; Tue, 13 Dec 2022 13:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p59cM-0003Gf-W4 for guix-patches@gnu.org; Tue, 13 Dec 2022 13:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60029] [PATCH 1/4] guix: copy-build-system: allow install plan directives to specify output Resent-From: Jonathan Scoresby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Dec 2022 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60029 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60029@debbugs.gnu.org Cc: Jonathan Scoresby Received: via spool by 60029-submit@debbugs.gnu.org id=B60029.167095455912514 (code B ref 60029); Tue, 13 Dec 2022 18:03:02 +0000 Received: (at 60029) by debbugs.gnu.org; 13 Dec 2022 18:02:39 +0000 Received: from localhost ([127.0.0.1]:33702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p59bz-0003Fl-9L for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:02:39 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:54568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p50ko-0001mC-Gz for 60029@debbugs.gnu.org; Tue, 13 Dec 2022 03:35:11 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4NWWyX4SJWz9sWy; Tue, 13 Dec 2022 09:35:00 +0100 (CET) From: Jonathan Scoresby Date: Tue, 13 Dec 2022 01:34:17 -0700 Message-Id: <57f2e77fc975bf00d1222729b0e41aef5c8a00a0.1670891520.git.me@jonscoresby.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Tue, 13 Dec 2022 13:02:37 -0500 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670954680; 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; bh=2H45mIP0TRvOfOjMCQnZW2sb5j4gtSZ2DBDbRONdgAY=; b=Ymb47lDuPpBDk5SwRl2MmyO10eT76AHNb5r88ClbDdvLyNTLaZEuGfpPRiSxUa2tbMa1AZ Rk+uhrDxc8M+g0gh0SgRtM3ofuEEMz14iUYcyuhsSSOrkUXUGjJHSprJloUAgrOf/GdKKy +BTtEl2Za1TAsdq4ZJXAbjJ3121rJ028+C1gloxnyApOMJSfm12i7h+rUVLoDg2qNuCVHi txAAmL3izNp6kkCnMw25M2rLEZVBkH+gHYYW/Ulz+Pzqy5WAEe2aKNpklUbexKePRNEsL7 R5R1Vl9zcrSSa6nYsybPpjhFFKoc5f+R7L2Rj+OxfpbiTG9MHBnMHtRzh2W6zw== 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670954680; a=rsa-sha256; cv=none; b=aXHZspAFvev9IMUUpVr2sBzvuZRjaq/tyMP+xgBC45O3rAKBVNfdeZEg0O3HWfK4Nx8TBg W8wvY5vfHSFFq+mq+QU9yFQafxCe400tG9/a+Z9Ts5JeEJ0OKmWU4nJ9cjpoC4Stn0HsKH E6Z6MLMttX0d6IzNz1i+BHS+M2D/LtWwx/YJnHbAmQHAsSMtuq85eALrmmrIDSPOqXBAkZ qhMknhQeDuHD2LT5zqrAKXgvQ1+hVRU3PaZ9ZswIAQEXUWXf/RfbFv/zWCsfsxJJ4IeUkt a7Hw30Y1G2rSUCYRRoaOZNrNfpTdFcAWNWiYFqgu7iXLuuTvgGPylCkVzD3cyQ== X-Migadu-Spam-Score: -1.27 X-Spam-Score: -1.27 X-Migadu-Queue-Id: D1BF02934A X-Migadu-Scanner: scn0.migadu.com 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=none X-TUID: 2p95Eh8hsx3B --- guix/build/copy-build-system.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm index fb2d1db056..5d2a137268 100644 --- a/guix/build/copy-build-system.scm +++ b/guix/build/copy-build-system.scm @@ -133,8 +133,16 @@ (define* (install #:key install-plan outputs #:allow-other-keys) (string-append target "/"))) file-list)))) - (define* (install source target #:key include exclude include-regexp exclude-regexp) - (let ((final-target (string-append (assoc-ref outputs "out") "/" target)) + (define* (install source + target + #:key include + exclude + include-regexp + exclude-regexp + output) + (let ((final-target (string-append (assoc-ref outputs + (or output "out")) "/" + target)) (filters? (or include exclude include-regexp exclude-regexp))) (when (and (not (file-is-directory? source)) filters?) -- 2.38.1