From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IFZnOzcm22bOLwAAe85BDQ:P1 (envelope-from ) for ; Fri, 06 Sep 2024 15:56:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id IFZnOzcm22bOLwAAe85BDQ (envelope-from ) for ; Fri, 06 Sep 2024 17:56:40 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=oMClAk14; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=C65FGe9W; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725638199; 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=xS+MrryqrGQ075cvewf2KQU08NvPH3CzQUbbJM3tMd0=; b=jPVGRX94WOkI+6z91B2J2QbopmNb6SSh3xgWzEjUMtxDPk1eqvG1tVWzSpPl2FV2QjmQiU 5zF3drZFTKpcO7jViIj9tj37RSgrhZkzxuwc39p7U6g6se9DfI4W0332aeHc2lpYOt+m5B 9xBCyC1WQUI+s4Br5b2Uqk+iRorGaCWjriJmmDepb+vi71BIrYaSi2p2dZBW/0FSmoGEhx tnwGTQ9Rcs7LTlNvZoHMDZoAJpW/B4ZDUyzr85wYf2UtpMWOi8+0c66gn12fZMPQSWTZH4 GhXXk/tbucEcpWLkgI6k5TJBmG/sRkvgmoiVEYslAEMIqu1zlpnO+9AbOOqvag== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=oMClAk14; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=C65FGe9W; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725638199; a=rsa-sha256; cv=none; b=IUxUL25kCtpAk+r8rhR1S8lUfHVmLRvh71PgGskV/bQdg2/oLPh4Z2xYYqClROq3f8Wstx 4/+7GHBCr+Bi3/gS5XHfFxiv6cBhWSTNzh0HYi4VIG7XxMhqg6cK0k7MuL/XMr8izU28iO CM/Al+Gv9pE1P92FYWweRKEzIPzLT+mTnK9A0zWuNrIV7HVTPB0yqxd15sFLB3ofcQ+2Ml 7o3IRIv1POo7RKdYaDnxxVf+kCkw7HgJ1WTSshLukrZO5LtjybLYZliJ1v96cMhyMORVDf g8qSpiNWJQHD0/lGeYEm1/UHJLg3NE5qv82nwOTC3Os8YF1HUx2JgwdXnXoUug== 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 DCBCC6F067 for ; Fri, 06 Sep 2024 17:56:39 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smbJf-0005Oo-Rt; Fri, 06 Sep 2024 11:56: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 1smbJf-0005Lf-3A for guix-patches@gnu.org; Fri, 06 Sep 2024 11:56: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 1smbJe-0000To-Pu; Fri, 06 Sep 2024 11:56:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xS+MrryqrGQ075cvewf2KQU08NvPH3CzQUbbJM3tMd0=; b=oMClAk14NswhWrIDo+/MxANHRJZtvTbiCLFtoC9FPH2a8IEsar4SAhFRDVYkzkZnXGhMHJFg56FlA95dPXwWJM191ZrI11wJ/awD3FIRf515gfRcR1nvPKxLBkNFIz1TKGrmnBAdGFdWgvSd91qeBE/E/KYlvZYVBo00dat/d/27BMBlt+u8cHBLXxQDqFVmFwGHTtkPahuPni95yHucQlRkGHCZcYrW3vOAbcQ31iqLizWh/mJTYQ6aRsBCxatdl+Up2c5YGCYgk/KxoT8yrx6/BF+GgkFdHxhLb1bGxakT8z9WjUvDfTWvuPBrppGeXy1PNZO6bZ3N0/eOxVOJ6g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smbJa-0007q7-Bx; Fri, 06 Sep 2024 11:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH 1/6] guix: packages: Allow origin with label as inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.172563815530080 (code B ref 73073); Fri, 06 Sep 2024 15:56:02 +0000 Received: (at 73073) by debbugs.gnu.org; 6 Sep 2024 15:55:55 +0000 Received: from localhost ([127.0.0.1]:53937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smbJT-0007p5-60 for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:55:55 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:46428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smbJR-0007og-3i for 73073@debbugs.gnu.org; Fri, 06 Sep 2024 11:55:53 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-374c1120a32so1229177f8f.1 for <73073@debbugs.gnu.org>; Fri, 06 Sep 2024 08:55:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725638088; x=1726242888; darn=debbugs.gnu.org; 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=xS+MrryqrGQ075cvewf2KQU08NvPH3CzQUbbJM3tMd0=; b=C65FGe9WIlY72QHOhay4jltA0HX6PHS1OJcxTcRbtUR3cUDDOKjzsxgeo15Gy0jhbv AH27Ax1LB6er4X6Ttpq91/G3td+C1WDB/k3AIwps0btj5HYdQ44T2xFJ+Pq5IMldRu9z H38EbKSitHnE9IAWO8DAp2OnO+QNur1VAEuSi/vY0WDI405aVJFFu9mZRqNxl0vivNzj zLLhe5dw9vmHZ0FFU6KVcl54D8M+gwsXgGKMdXRZAk2cZd3Y2cLrx9ZzxvO1t9YTFoeM X6l+krXtDpLehT2xeNo51CsVu3KPXnCIPW3aAXoMM2ZL5VXYq+U2WbAmPLf/kvb9wW+e s5ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725638088; x=1726242888; 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=xS+MrryqrGQ075cvewf2KQU08NvPH3CzQUbbJM3tMd0=; b=p50EgC8AWbQ5TVK7dCjdfEaoPyxiWaVtE7EkQOC2YwZ8kejUbP0Pdsi8IiBNg8yoJr nsJ3ctloqERDobVIImdbTmcJOdnK1uaYHIa8CcR86C+rBiqbH46h1+6LQq22ZcspxAZX +W3VdVcTFn5kSb7iq8tgNLBJTz/xtoE8vzfN3NRJMYh+3gou2nmPlW3aviXNkJT0cwJF Rw2AVE8NWau0HtXWq0V2Ga9yubori1lCWKPMmgKsPmZiTsddxgwyzdPBGRwrgpXxy16D o96e1BV5/SK3SpMR3bKqvY+xovfYt9rjkqbvasx0v+kRs4sdWu13P4VxmRb040iyt6uu bfmQ== X-Gm-Message-State: AOJu0Ywy7CuMgk2NQwGHeDEKCbGgSmsjHWyGWLmUuPEWMsE0t17N7fpW 8icRYs1wfCiaxZxTxJkPzHKNcBoVDHtouBp/wdJcHz411Ca16VByJK4DiA== X-Google-Smtp-Source: AGHT+IFtOdiRRc9d778BmOotpdFyc9y9DQbbG6XASE4+2XwU/gI7l45kp4g7OnQa4k9vEnRtdw5Z5A== X-Received: by 2002:a5d:452c:0:b0:371:7c71:9ab2 with SMTP id ffacd0b85a97d-378896a5d2dmr1861092f8f.52.1725638087551; Fri, 06 Sep 2024 08:54:47 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:34c8:9fc9:674c:115f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37891669fd4sm209588f8f.115.2024.09.06.08.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 08:54:47 -0700 (PDT) From: Simon Tournier Date: Fri, 6 Sep 2024 17:54:29 +0200 Message-ID: <5cbe0dd85c9326d7e598e7a9c30d7d26f1abdaa9.1725636992.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 X-Migadu-Queue-Id: DCBCC6F067 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.42 X-Spam-Score: -8.42 X-TUID: IQmD3A8LAv7Q * guix/packages.scm (add-input-label): Allow the old style pattern using label as it is sometimes required by origins listed under inputs record field. Change-Id: I799612976a0051d4c953969d12d71913c9243cd4 --- guix/packages.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index f373136d22..5fea44c2bb 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -676,6 +676,8 @@ (define (add-input-label input) "_") ,obj ,@(if (string=? output "out") '() (list output))))) + (((? string? label) obj) ;Allow old style as sometimes requires by origin in inputs + `(,label ,obj)) (x `("_" ,x)))) -- 2.45.2