From patchwork Sat Aug 5 02:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 1696 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 07A9B27BBE9; Sat, 5 Aug 2023 03:52:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 23AEB27BBE2 for ; Sat, 5 Aug 2023 03:52:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qS7Oi-0004tg-Nx; Fri, 04 Aug 2023 22:52:08 -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 1qS7Oh-0004tD-6Q for guix-patches@gnu.org; Fri, 04 Aug 2023 22:52:07 -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 1qS7Og-0003RF-4K; Fri, 04 Aug 2023 22:52:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qS7Oc-00018M-Ik; Fri, 04 Aug 2023 22:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65062] [PATCH core-updates 0/1] 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:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org 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 submit@debbugs.gnu.org id=B.16912038864297 (code B ref -1); Sat, 05 Aug 2023 02:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Aug 2023 02:51:26 +0000 Received: from localhost ([127.0.0.1]:55140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7O1-00017E-Q8 for submit@debbugs.gnu.org; Fri, 04 Aug 2023 22:51:26 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7O0-00016z-9s for submit@debbugs.gnu.org; Fri, 04 Aug 2023 22:51:24 -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 1qS7Nu-0004i0-Ok for guix-patches@gnu.org; Fri, 04 Aug 2023 22:51:18 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qS7Nr-0003K3-Rk for guix-patches@gnu.org; Fri, 04 Aug 2023 22:51:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691203865; 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; bh=jFjpDppUCp8M7BGMtEtHCXKxEOQrHJO0Vy1HGDmqhlQ=; b=cg1lypVGfj29X3H0zN3IS1pavcRiH47apgoDiAKxT6c40IjNGaRK2ZxlDCYxWqbO7faFM5 X1TfrW2V6q1ldYwdwESmMkxyBbxB1KmXRNUw5UAg+7ZCB4v4rOU16av7UDyqv+AY3FdBh0 rFIr1As7t6ZrOiCMGrIYDaT85Zbq2R+MIRnJuFHQdeT+Cpv401u59z9fFycAA5Qabga4eb wxD9DbPZQQWFtQFomvhkxNt8vVICMmqvbsJBmOa/b97kTlfPPrxNvKPiLsb5Q6StqXuzMS qU2JBNzrsJEaRuGuJfaIsptl4vXQ6LOicyOMG8POrElNolGHuJT4Iq02O0GMGA== Date: Sat, 5 Aug 2023 10:50:32 +0800 Message-ID: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello Guix, Recently I found it not possible to find `(,gcc "lib") in inputs with `this-package-input' since it has the label "gcc" and there're other "gcc"s in the build environment. As we should avoid direct use on input labels, I think the solution is to modify `add-input-label', hence the patch. Taking `aide' from (gnu packages admin) as an example, the current behavior is that both `pcre:static' and `pcre' have the label "pcre", this affects `this-package-input' and `modify-inputs': --8<---------------cut here---------------start------------->8--- scheme@(guix-user)> ,use (guix packages) scheme@(guix-user)> ,use (gnu packages admin) scheme@(guix-user)> ((@@ (guix packages) add-input-label) (package-inputs aide)) $1 = ("_" ([...] ("pcre" # "static") ("pcre" #) ("zlib" # "static") ("zlib" #))) --8<---------------cut here---------------end--------------->8--- With the patch appiled, `pcre:static' has the label "pcre:static", while `pcre' stays "pcre": --8<---------------cut here---------------start------------->8--- scheme@(guix-user)> ,use (guix packages) scheme@(guix-user)> ,use (gnu packages admin) scheme@(guix-user)> ((@@ (guix packages) add-input-label) (package-inputs aide)) $1 = ("_" ([...] ("pcre:static" # "static") ("pcre" #) ("zlib:static" # "static") ("zlib" #))) --8<---------------cut here---------------end--------------->8--- Thanks Hilton Chain (1): packages: Specify output in input label when it's not "out". guix/packages.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) base-commit: 8852e6bb5521edca099d6f346efc92db3244584c --- 2.41.0