From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UMMpDtS5zWTIFwAASxT56A (envelope-from ) for ; Sat, 05 Aug 2023 04:54:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SFQZDtS5zWR9RwAA9RJhRA (envelope-from ) for ; Sat, 05 Aug 2023 04:54:12 +0200 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 D022C372C3 for ; Sat, 5 Aug 2023 04:54:11 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=qKpQoOBc; 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-Seal: i=1; s=key1; d=yhetil.org; t=1691204052; a=rsa-sha256; cv=none; b=Za8WdixSCRohrPreWMWo/ah7ODWqHReshU94W0dKlEDoEdEQd2YZ0yuIJHEauOb+6A7RYN VfgTOs9yokdedBOTPdrM6UcwdkOX3FvPY66kT/NAb845xEVrlHGpfY5wFlg2GgVnCQTaaa CdsDWUvMtcuY4zVJZLkRf1TrkKH+jNzDvkDQxikbCWyCScG5nBqdo1/wiecxbaj93p4Qaf GXUL27BvTArOV2xJ88ERE4MSTXA3Biij7Q5s+za3ih4PhxOp5+cXDtFrI1G9w1/nds+mYr Nq79XOQKAnLiFkGe67RrA2Hdx3RDCQjnCH2dsAMptPopgNhLwv8w+weoJjFWag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691204052; 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-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=80YGeaEuUV+t/P9y3Q5lVAqZ9pdW4e/EPgFNg3wXrw8=; b=sBD+i7xPWsueA95JOKLR36kc0raS099BG5dwhdlzgKA2T9d4mxm03c0wgSuEEzEylidevu jcux8/AZy8gRbI02y/yl9yvmscA365oh1Hg+UpiVraDDXkryoJ2X4JInc9A9zuYoQ9F2UK 9BMVtpzImtg0og2cQ2SSt6bT7mzyeradrrYbJme8yPDmXyVjvk/83tbmbmtjyUnH2k5b2l qnAQa1EOGDi0Lw4Osb0RSdizcFo5pfuVJ6bmOuWEcZZUuWUSrEoJjEzWEHWYoW1RnMlrcY RzHTHnyE4oY0s8NMod+zj/ISJhTutKAIthb/KnDeeEG4pRRbFoAx4yh/klCKtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=qKpQoOBc; 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 localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qS7Qd-00056c-35; Fri, 04 Aug 2023 22:54:07 -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 1qS7Qc-00052n-5Q for guix-patches@gnu.org; Fri, 04 Aug 2023 22:54: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 1qS7Qa-0003l1-T6; Fri, 04 Aug 2023 22:54:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qS7QY-0001CH-Db; Fri, 04 Aug 2023 22:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65062] [PATCH core-updates 1/1] packages: Specify output in input label when it's not "out". Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 02:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65062@debbugs.gnu.org Cc: Hilton Chain , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65062-submit@debbugs.gnu.org id=B65062.16912040314579 (code B ref 65062); Sat, 05 Aug 2023 02:54:02 +0000 Received: (at 65062) by debbugs.gnu.org; 5 Aug 2023 02:53:51 +0000 Received: from localhost ([127.0.0.1]:55151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7QN-0001Bn-CT for submit@debbugs.gnu.org; Fri, 04 Aug 2023 22:53:51 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:49610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7QL-0001Bd-H9 for 65062@debbugs.gnu.org; Fri, 04 Aug 2023 22:53:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691204022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80YGeaEuUV+t/P9y3Q5lVAqZ9pdW4e/EPgFNg3wXrw8=; b=qKpQoOBcvhnzUHSy1IvYKwszFAviv6CWuvAVI/F+0LKFYsW4aCD924k8w/ruF+GxPe9w4F XgJd3KKUGmjadXpzs6UDYAzUg8I4YxODXZ+Fv0spuRM1xfZ8BdW9kfSiWqXox4mZefWAzu +RP/cE8rWuktPA2kkkWEX8qcmHvA6HNiCXt1d8VWS5G3oRy0mUMv4rOtLWE+4QTRN6bdDg sGvkUPnGJXuWAjo4XtWDrT2qUH4Pb3vS0Ertt05V4i/98W2I8KMCZbAv6l/sMaar+5T6Cw 15g15T2v9yUU/EikPhFe1tf+lHvKBnfFQlOjLT8Jce39mQaOE4fj1dIzGKxxfA== Date: Sat, 5 Aug 2023 10:53:16 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain 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: -4.64 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: D022C372C3 X-Spam-Score: -4.64 X-TUID: qUuo5rgU76BE * guix/packages.scm (add-input-label): Specify output when it's not "out". --- guix/packages.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index ba98bb0fb4..d0e6e16cbb 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -626,7 +626,13 @@ (define (add-input-label input) ((? package? package) (list (package-name package) package)) (((? package? package) output) ;XXX: ugly? - (list (package-name package) package output)) + (if (string=? output "out") + ;; (package "out") => ("package" package "out") + (list (package-name package) package output) + ;; (package "output") => ("package:output" package "output") + (list (string-append (package-name package) ":" output) + package + output))) ((? gexp-input?) ;XXX: misplaced because 'native?' field is ignored? (let ((obj (gexp-input-thing input)) (output (gexp-input-output input))) -- 2.41.0