From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 qMN4DBU6mmOyHwAAbAwnHQ (envelope-from ) for ; Wed, 14 Dec 2022 22:03:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4EtFDBU6mmOXFAAAauVa8A (envelope-from ) for ; Wed, 14 Dec 2022 22:03:17 +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 0B077225F8 for ; Wed, 14 Dec 2022 22:03:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Yu9-00011C-KO; Wed, 14 Dec 2022 16:03:05 -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 1p5Yu7-00010x-Ue for guix-patches@gnu.org; Wed, 14 Dec 2022 16: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 1p5Yu6-0007uy-Hh for guix-patches@gnu.org; Wed, 14 Dec 2022 16:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5Yu6-0006hp-7G for guix-patches@gnu.org; Wed, 14 Dec 2022 16:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60029] [PATCH v2 1/4] guix: copy-build-system: allow install plan directives to specify output References: In-Reply-To: Resent-From: Jonathan Scoresby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 21: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.167105177225771 (code B ref 60029); Wed, 14 Dec 2022 21:03:02 +0000 Received: (at 60029) by debbugs.gnu.org; 14 Dec 2022 21:02:52 +0000 Received: from localhost ([127.0.0.1]:41837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Ytv-0006hb-Nb for submit@debbugs.gnu.org; Wed, 14 Dec 2022 16:02:51 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:42490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Yts-0006hU-V5 for 60029@debbugs.gnu.org; Wed, 14 Dec 2022 16:02:50 -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-103.mailbox.org (Postfix) with ESMTPS id 4NXSVk4kNyz9sV8; Wed, 14 Dec 2022 22:02:38 +0100 (CET) From: Jonathan Scoresby Date: Wed, 14 Dec 2022 14:01:59 -0700 Message-Id: <57f2e77fc975bf00d1222729b0e41aef5c8a00a0.1671051720.git.me@jonscoresby.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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671051797; 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=5Tf7R1BewDQ8vTeFVgAquYShPpUtDKEUsX7VccjdLXA=; b=hPonQWy0I9NwGfI+P8RaeomF6VlT+2xfq6Aysyzor988D5OR8KoQzQOyD5Nv4Y4SAj9W54 JeuiUHqfnpPggrT49ZzTM5kO52YZZrSDUz+/WwYjAp6swXYsKsv5ooM2I+M7IoTLH52nUI iv+x13mxABylDdn6ALg5uaHweYoQZ9SxVX/SjnD3ZLvKqrNUI9TTuEjkiPW87jJMkP4fMy xzex85fKqJifscM1pN2ThBrhi8EJzWBXoYAbdnoO8qLoW7YIMM3qmmrBG2D027IY7KhkdB U5WTU6+FRwVdjEzsvq31neaKJO9ZNp1Y7U0N4LRPvfz0XSYa0o4dwIzULEixdQ== 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=1671051797; a=rsa-sha256; cv=none; b=GvJ1acvUw9quNwOLHxy21cMmNzJQKxlcy2NnKkHWitInsceLPME1Ru6xiiaeAr7azRGu1P DT1fc8qDy/ZRpVHI4dwZHKgGGS0yeedsozvBaSheCDfpNIYY9mwIRYPowjNbtMEftrsnKk EArGofkxw4dA+C+6rgq/JMkF4LcqEo5CzgqvytABfgqQcmfwdGemwvf6voPwZhVF8fkSjo DSjwAxyVF3VnEdmnjpu0iaV5skAmcQH8u0RnMbQBkoqxgRJIpxoar1lVCxdfP7NIUghtHR zdyu33RovqIiOfhLORMXLLqEaMPFyq81SzWTEhl4+O95pZtfng0Y7I02fVBvXQ== X-Migadu-Spam-Score: -2.37 X-Spam-Score: -2.37 X-Migadu-Queue-Id: 0B077225F8 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: aa53bLVWhZF8 --- 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?) base-commit: 6454208222d6e7760daa964b590f35ea75ffe0e5 -- 2.38.1