From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id OJfMCQ2h32YgaAAAqHPOHw:P1 (envelope-from ) for ; Tue, 10 Sep 2024 01:29:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id OJfMCQ2h32YgaAAAqHPOHw (envelope-from ) for ; Tue, 10 Sep 2024 03:29:49 +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=r5X+Burf; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="Y+xUvrN/"; 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=1725931789; 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=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=b3b/0V8gWo9aVXcSvYIpEGoBb0JC0LcpfwsXUHjjDmNdFH45RpmvyJHAWs7M5gGCsqXREt ErK0Fe39wEKajIPLAGeewZgds32NSx8iX2EcLHNjv7zZw68nh29FhC5e7/jyi8G0sTW7/w rb/ytPnUCJ72ZVFQq+N1YRxu7XiVpfzHVeF1VBItH6ver9ydg1eakvT+NwUxVWaVVBKIak 11IYMCBBmPoQzvvPUZwoTs7m6n3iTvUlOHn6OEc++/JpEFeaqCcGSHuAb6B9JToWilVy6S sAfJ49mOGW37zAHLRbhy42ct/A3MCXk7VpqF6FFdjy1g9iItED7FdLj0xAoedQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r5X+Burf; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="Y+xUvrN/"; 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=1725931789; a=rsa-sha256; cv=none; b=FI3k0ZdPx6KVTxMOwR+ypwAK+XENDq6CRCo8iYXkpvbZ0lr2YwlQa9Mxw+i9ZBxoUpOW24 7WMMfy9Wsld3lzPWA7GAJPR2PcrW9QDmTQJdmDQV7xKVvtn9k6WZ6o2lu0RBt+Q6r5K+Bg q4bLC6TA8CY1R+An06xR443EnfLb4gTc+DFfGA7N8m5Ng/LeP6QVx2WeELWlhvU6gLQD2i zXyITfMwlGwtElqJWFCKbOWfe2sSPSz5u/CqxtZICWl0iRl2rr8Ub2Kc1jUhXgb9iaA/ml FsuaS0mqlldI59gjfxlGxMa1n0ZSegbkF5OsyJmG55A2cm9go5squ8RE491qGA== 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 E78EAF9A7 for ; Tue, 10 Sep 2024 03:29:48 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgl-0005UP-Pd; Mon, 09 Sep 2024 21:29:03 -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 1snpgj-0005Tb-Gy for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -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 1snpgh-0000HQ-Qe; Mon, 09 Sep 2024 21:29:00 -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=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=r5X+BurfMEC7xhZhPzU6zOJEzpjvt3eEIJO80W6pPoyhzcIK7+/CLXrU5eQkzZfHd+mmHYJqEmYdIt0bd9E9D3kbgFjuc0208trJA/ID8DbgLlTaLZRAa/IaPYbye5WoADGVyJiQHH72GOw5+bBsbZXYtgzVHQRKH6oIslDtiBFcqJzDx9k6+3OA6TfuEfEQ22uDE4ms8ZyxFkUPmnhNpAYnsznA+FXoegO8iQuanmQakqdUq4xeWe09dZPJVHulylzWE2clrX3ylfSqOBY/x7Kygid+DwQoYrMKL07RvW5ilBVf4zVsi2ixMjCth7GnwejzP79WKgqh/WnNIZZSwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgk-0000ps-7O; Mon, 09 Sep 2024 21:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 1/8] guix: packages: Allow origin inside inputs with "new style". 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: Tue, 10 Sep 2024 01:29: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.17259317173087 (code B ref 73073); Tue, 10 Sep 2024 01:29:02 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:37 +0000 Received: from localhost ([127.0.0.1]:34430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgK-0000nX-Qk for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:37 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgI-0000n2-EW for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:34 -0400 Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-374c5bab490so3702375f8f.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931644; x=1726536444; 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=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=Y+xUvrN/ENAJqL9Dh/p6wVKLtBB0Kv6qCaZQbx2bVdmcfy5QnypOJPD/1mynt6TPL7 XqSCRZfQABBKRzEj8oTNJP+a6hecJ/Wta1ijCPgoqESv0lJ04YO7FL9MIJy2Gg/DZAO/ bBgih7xghR3lVqB0ikbaoSbBYwYGVkPeuM8eeoH5PQiQrl7j0JG9b6YVngU5n2EHCyUe Z/CSIFL6N58MkTyeZthd5f/gUkjNhSyNa6z5Giy8PIk4RPFgy5gvLQFYkiUHA7gobGsb acSARiCdIx4Hycb5OruVTia+MtxIPRvo2tkNTJWO7IRiD3vQIuMST5orFAoEaWctXbiw R0Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931644; x=1726536444; 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=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=aUpexcAYIGwsBz2WKtz8bEgDc+lj2IzQGQEGqk6SwavNFzhPXwZsq1h8wwTCY0wQBj FGRwsW9Yq+mJvvoIaygg4ISRCaVzvzTOj7hkGXdX8RgIiawLsuJkJYrkc24cCcduMk7t URQsFO3bM7aiUOUJ/ERFXSLkywBiuKb5zT4VTvY19kfZzm54/oYO7b6J0st12+a9ejkr mRDX4Go3IqzFP8/VNhLCnR9GR6SJaYW7tUHqUOPyEM4uqI8PsHdEMbjgQvtvRvG0CYYy 9MNTGT1RJy4oSTQV2drDXEBq6dU6MIAO5WR2w6fw07ZpdObh6pSuSNqr5OOGfzJpfZqi RzZQ== X-Gm-Message-State: AOJu0YxbszKVsAfd2Sh+XBCra7Z7X017SGAxc1xq+ENweuYUZjvHJ3RY hASF6ee7a43b3W0vvZObj/GD0EEvqcpDMqXnBmV1Zhgk2GIQXnLXulN/fw== X-Google-Smtp-Source: AGHT+IGo8o8kwtIe+CliisbL2kwdNROK3fBKq6439Fzxz4Asvn2szF4TV/GDWIR36xZ8kTNl4BiAMw== X-Received: by 2002:a5d:5261:0:b0:374:c57e:1ea9 with SMTP id ffacd0b85a97d-378a8a7aac9mr602508f8f.18.1725931644189; Mon, 09 Sep 2024 18:27:24 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:23 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:09 +0200 Message-ID: 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-Spam-Score: -3.52 X-Migadu-Queue-Id: E78EAF9A7 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.52 X-TUID: qohAzQnN+38x * guix/packages.scm (add-input-label): Rely on 'origin-actual-file-name' for internal inputs labels. (maybe-add-input-labels): Special case to avoid world rebuild. Change-Id: I6ba5352b1b1b8ab810da3730b09cb9db61d6429c --- guix/packages.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index f373136d22..35dba6adc3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -444,6 +444,9 @@ (define (maybe-add-input-labels inputs) ((and (pair? (car inputs)) (string? (caar inputs))) inputs) + ((and (origin? (car inputs)) ;XXXX: Remove next world rebuild + (null? (cdr inputs))) ;special case tzdata + (list (list "_" (car inputs)))) (else (map add-input-label inputs)))) (define (add-input-labels . inputs) @@ -676,6 +679,13 @@ (define (add-input-label input) "_") ,obj ,@(if (string=? output "out") '() (list output))))) + ((? origin? origin) ;XXXX: Remove next world rebuild + (let ((texlive (package-source + (module-ref (resolve-interface '(gnu packages tex)) + 'texlive-latex)))) + (if (eq? input texlive) + (list "_" origin) + (list (or (origin-actual-file-name origin) "_") origin)))) (x `("_" ,x)))) -- 2.45.2