From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gL+YLOOq62bVngAA62LTzQ:P1 (envelope-from ) for ; Thu, 19 Sep 2024 04:38:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gL+YLOOq62bVngAA62LTzQ (envelope-from ) for ; Thu, 19 Sep 2024 06:38:59 +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=qdCFtW1p; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WmmXpxGO; 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=1726720739; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=hdoUKkFo5XDzFjVSC9YJZPkhUaxj/X2CI8ND9/eOdy8=; b=R4EobjQBdUjOxsbD9qgemRcgKCyJ4EmvMeOXV58nHtXlDcWOTTwEQB1zkxkReDZS4H+Nue Z8cre+2ZGJuZztp5RHaHTqIJic6DiBrdQhpa1cXSI96GDiNygTQXZg6FejZkO1gjSrUe0R ZKWAFWLE5hxX4f0OEMuUSQ6yvzaNPbX/dOQnTnY/07OvRzAD8Yau+EtEseutqgbt3iD4ay exd9f59n7ZA+xcLf2kwrWjqkTPm18A570293gzhdGN1vPAqhcQtHvgqkMw+vKkib7qOEtI K211P0MBwDnRzSF1n4Mc4hq3QLhXBh3NYk8VsoFJaKh9gtYZjKA33ZswG+7aPg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726720739; a=rsa-sha256; cv=none; b=ZdZ+QjM7ntMpqHhcq+c7CntREq+BeXwsdPaAGyM0BB2mMYfBU/s+COsBeCHq/lw7xiI5pi ZMIOCSLXdVLQsRpQxXzg6TgKjaq70PVBgmKKMgT/QB5t0txCH8E9q9cKfaQfjWInTDOCZK 9gpIXQeWpe21WYfaZml2p1isyR46vJzmJxDI40UaNI7CN2x6tgRvp6aUrWvmaD0vrzs/oX ZFWU/yf5RMtNKixJJuRmaAlqP4Sj2BnzDmezxEJENtUlagKNBbvGCremz1Ne7GaBY6CMwq aqbu5gIS3oMsN0Et+z0IMpcjspTZ6X6B1Dc1T2J7+zJFEAj0ywJGsyJ6AZYSMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qdCFtW1p; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WmmXpxGO; 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) 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 3F4488795B for ; Thu, 19 Sep 2024 06:38:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sr8wJ-0006Qg-Ow; Thu, 19 Sep 2024 00:38:48 -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 1sr8wI-0006QU-1j for guix-patches@gnu.org; Thu, 19 Sep 2024 00:38:46 -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 1sr8wH-0006L0-PE for guix-patches@gnu.org; Thu, 19 Sep 2024 00:38:45 -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:Date:References:In-Reply-To:From:To:Subject; bh=hdoUKkFo5XDzFjVSC9YJZPkhUaxj/X2CI8ND9/eOdy8=; b=qdCFtW1pOy6caHm+5pmIz9zLQuJs7x8R50EiJAlLGIfMGVskyyddz3jAY+ZnJa6N/hjVh9XKy6gIyUha9PRAYyztvaxvXWDhzEXIDo2KZtqqHJ6wh0QlfBxmNT3MqfZOFg97J3meoomGBVLIvC+st9ahLAybD5bNL8TJG5ZU8MEyFOnxuCPBT4Gc9/j/A2j/aJphoB9J03uuGWyeQQ2ipj9dyF5i0OpQROOT1OqTyFyQopqUh5R0S5r3BTQF726OZ3WPxiv7yJsMx+TxdC8h/fSq+JUqg8R7dP1CWrmAOYEjHe2B5zhekTLjD79W6fM8IaVBo7U4+24E09tWbO1u2A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sr8wX-0003It-Ld for guix-patches@gnu.org; Thu, 19 Sep 2024 00:39:01 -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-patches@gnu.org Resent-Date: Thu, 19 Sep 2024 04:39:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Christopher Baines , Josselin Poiret , Tobias Geerinckx-Rice , 73073@debbugs.gnu.org, Mathieu Othacehe Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.172672070112644 (code B ref 73073); Thu, 19 Sep 2024 04:39:01 +0000 Received: (at 73073) by debbugs.gnu.org; 19 Sep 2024 04:38:21 +0000 Received: from localhost ([127.0.0.1]:59583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sr8vt-0003Hs-ER for submit@debbugs.gnu.org; Thu, 19 Sep 2024 00:38:21 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:49511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sr8vq-0003Ha-7y for 73073@debbugs.gnu.org; Thu, 19 Sep 2024 00:38:19 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-375e5c12042so182861f8f.3 for <73073@debbugs.gnu.org>; Wed, 18 Sep 2024 21:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726720615; x=1727325415; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hdoUKkFo5XDzFjVSC9YJZPkhUaxj/X2CI8ND9/eOdy8=; b=WmmXpxGO+cHxsg8sPg+ReMk89yoUFJy5qeHUouoWOpzRcjMqsmu4WNVnqeTKP+ru6L ukwhEE0PEb032ouSWrf0ZRJ6LHThKFHGfRcF0CUX24L+LBkSPefJnog5r238/LeF119Y mrxkJZ7rxn+JO+a1isuffl/HAZdICpQanFgP0lMs9iWdhNmmuiQrUaf80x/EnMeWugBB qDHFUeXDnRTrrUayKSPVyX/CmeNkZBOVc6O5hnbCWBLWPim3F/XyxjogsRrGiBEeDWQP kQzXYBlNq783ltVGDX2ASjhTkNk3XDJPo7qfrkXY9rOkDJYImZ9RJ4EqHG8SlNha9KLQ +Mpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726720615; x=1727325415; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hdoUKkFo5XDzFjVSC9YJZPkhUaxj/X2CI8ND9/eOdy8=; b=IgMpHzaIYTdPJqY/ZCIidlnkep+mezIRc5XsPbMr32WbDKT8j4TS5wfeilvdIAVb1h SwCLswDY2kPhmr/wGswa1Kg4EHrfIjM5DpzgUiirNYlCsnnm1IxEuIXbexjoxxgWlmIb UT/gSjg5KugeBZfiUhCA/Z2cDtw/Fxxua2/55yR7SwuWpdgx0Y7aoCk9Fnx4wd/+RQ32 jYk2UZVlp2KUEMV7LiES1UsWuChVoashxHC/QtZAdRw76SG0jbBVrwdshQBwpNUfR4TJ D+8nUjMiTXdxUU42TVRXQgc0qwxoTprttIxAOIyQSJc2y02MqAcMX4WmIgpJgFXPRJRe VGDA== X-Forwarded-Encrypted: i=1; AJvYcCUIDTgjB/DpPUHnxu7ZV5HN4zvqEKOqdcQ/9SYHzpvGSWBMAJJd8LoKxgcTT6KISAkhk2+JwQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwRhdMMS0bohHrIH0rrKr6X42tenzPUbdtYawrb01Mf3qw1+4v7 81clWS19RFTHX0RRD1eKAk9dzNXsxmM9BFdOAsxCM+6jl8VNin/J5347Ow== X-Google-Smtp-Source: AGHT+IFFQqsGoDoC8948ZdoF2PHp87m656wZU8PBxh/hS32JN1RXFrmtsL+uUV8Ji+tr9317mscUhw== X-Received: by 2002:a05:6000:2a8:b0:374:c283:f7b7 with SMTP id ffacd0b85a97d-378c2d06524mr20350147f8f.21.1726720615029; Wed, 18 Sep 2024 21:36:55 -0700 (PDT) Received: from lili (88-126-110-68.subs.proxad.net. [88.126.110.68]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e7804483sm13913500f8f.92.2024.09.18.21.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 21:36:53 -0700 (PDT) From: Simon Tournier In-Reply-To: <874j6fbbc6.fsf@gnu.org> References: <874j6fbbc6.fsf@gnu.org> Date: Mon, 16 Sep 2024 22:42:51 +0200 Message-ID: <87ed5j2uus.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -9.45 X-Migadu-Queue-Id: 3F4488795B X-Spam-Score: -9.45 X-TUID: i8NN6FiJsQ0q Hi Ludo, On Mon, 16 Sep 2024 at 22:19, Ludovic Court=C3=A8s wrote: > Simon Tournier skribis: > >> * 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 > > [...] > >> @@ -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)))) > > I would rather have this hack in =E2=80=98tzdata=E2=80=99 itself, along t= he lines of > what I sent in a previous message. Yes, indeed tzdata can temporarily transformed into the old style. It avoids the world rebuild and it=E2=80=99s a modification easier to change t= han the one about maybe-add-input-labels. I agree that=E2=80=99s better. >> @@ -676,6 +679,13 @@ (define (add-input-label input) >> "_") >> ,obj >> ,@(if (string=3D? 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)))) > > I think this should be avoided, but what is it that causes a rebuild in > this case? It=E2=80=99s about the package texlive-hyphen-complete; it leads to a world rebuild =E2=80=93 as pointed in the cover letter of v2 ;-) It reads: (native-inputs (list ruby-2.7 ruby-hydra-minimal/pinned ;; Build phase requires "docstrip.tex" from TEXLIVE-LATEX. ;; However, adding this package to native inputs would initiate ;; a circular dependency. To work around this, use TEXLIVE-LATEX ;; source, then add "docstrip.tex" to TEXINPUTS before build. (package-source texlive-latex) texlive-tex)) then: (add-before 'build 'include-docstrip.tex (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((docstrip.tex (search-input-file (or native-inputs inputs) "tex/latex/base/docstrip.tex"))) Well, we can apply the same hack as tzdata: temporarily revert to the old style. Cheers, simon