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 aMDSGEiT6GY0VwAAe85BDQ:P1 (envelope-from ) for ; Mon, 16 Sep 2024 20:21:28 +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 aMDSGEiT6GY0VwAAe85BDQ (envelope-from ) for ; Mon, 16 Sep 2024 22:21:28 +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=cXZxZTQy; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KUJi8WVT; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726518088; 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=pc7utwRYhzKHVZ6Guham5DLtYwZxfqBnT1cp4E0ntXU=; b=jLPLqPCJ3iRRLUPaIGkVxzuDOe5hainFto25fxerC8xHOklFvlsNaCPW99ej21L7FaSnAn hVBW40JG4KlFenOvFKkz3R68JSMpLrey4ojKc1eyKo418/Xgc3E/XNArSlRcRSBtSQM03k fnlJoTBQMaWZDsMvGZCaHz1/OWAt/40V4hyhx7KgwlS1X+y8Xrkzt3Qri3+qR/eISL104F Ud1rXNb3U2ewWVjGupL31oafSL+auBvIKJhklraRx1HXLtnMzVQbxK34XiBoKbTB4MeSHD X5DRGSDJ2ZetVfAxCwbEy4YIK9Lz5F9rkFf1rBULo1Qsou+jzk7tYFkEa7s8nw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726518088; a=rsa-sha256; cv=none; b=kl0fBN+t+On6WkCmiv0qX07noTu6tMq2gssk4YBioUbKWG7rBSuPiCIE6RnBk6PvFZks8/ HxuyPnxL4Y8k4L/s1m9bbASqyDFMop+EYArlOWqPcHfC1EpNZoY7G0oF8EUpavORJeQgT2 3qSmIQW+s81aTFqX699dCqFUB1+9Es4dOjPZy+xvmydbqasYd8SLFg8PyEOGcT1wmBNrxd Yk+cWucAZmEb9AYyts3FLRKNGrHHbJh0cmROEyz1TE+MwGlspC0slPl2BE+WtHEJORBTln 5MjBKCBhRfPlS824xpLMbg7SrLt6u8zOvmJIm6kKQaHm4oI8E9zqg7sGhq1DZw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=cXZxZTQy; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KUJi8WVT; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 482D55A87E for ; Mon, 16 Sep 2024 22:21:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqIDX-0005MC-T8; Mon, 16 Sep 2024 16:21:04 -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 1sqIDL-0005L8-4R for guix-patches@gnu.org; Mon, 16 Sep 2024 16:20:52 -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 1sqIDI-00053m-02 for guix-patches@gnu.org; Mon, 16 Sep 2024 16:20:49 -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=pc7utwRYhzKHVZ6Guham5DLtYwZxfqBnT1cp4E0ntXU=; b=cXZxZTQyfglhXdKeU2Wlkt4S7ltiCu8aj/1lGFbkobfJUl0znbSoptyNZsMifvuCiHkbi3eXNl4GOZLUsJsC1IMWVEhU8Q/bsyu8BDQKu0rxb6wUMHAp0/QEUi7AlV/Hzaa1bxBkqkgrr3JkAVfheifaolCnNdy2CnB2HFbYkjP2lemsyraImoAeIzS12rTMAxHb+9LgSyk0Zwi+iJZA9N9C+RzYGAstIpORaUWAiEUU5OZgEHPLIUBJlf929Quhtp9c8Rbx7T7qnppylMCad9J2DVrxDvAWRAgCX8T8/hMz+7zYBS5JQn23yDDcRHivlGj3zRG8igCnd9ByzYpCzQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqIDV-0006E9-Km for guix-patches@gnu.org; Mon, 16 Sep 2024 16:21: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Sep 2024 20:21: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: Simon Tournier Cc: Christopher Baines , Josselin Poiret , Tobias Geerinckx-Rice , Mathieu Othacehe , 73073@debbugs.gnu.org Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.172651802023566 (code B ref 73073); Mon, 16 Sep 2024 20:21:01 +0000 Received: (at 73073) by debbugs.gnu.org; 16 Sep 2024 20:20:20 +0000 Received: from localhost ([127.0.0.1]:53410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqICp-000682-NL for submit@debbugs.gnu.org; Mon, 16 Sep 2024 16:20:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqICn-00064m-LQ for 73073@debbugs.gnu.org; Mon, 16 Sep 2024 16:20:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqICL-0004Ys-KK; Mon, 16 Sep 2024 16:19:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=pc7utwRYhzKHVZ6Guham5DLtYwZxfqBnT1cp4E0ntXU=; b=KUJi8WVTuctU1GN7LVX4 EXeqk4acYyTZEtM4DOHrMKTXgRGk3wDImzBfnjrnVMw55uU+WkI4IQzyEDMpeg+jJ3TwGKqQ7vcVh G3T+puUZNp3LrkqX8vLyao3Ww/f5dG9M0Ua+8ohYMLt4mOKzZSeZAYtnWp5D3CiDy1JEw9T1Iy6z2 P/IJXsng3zhYwgQOxs7l7SoZ0KHx/fIg6hCd7PQV4yczb9yseXA6+2sCVYCG4SbNc9zuuM2MOqrr2 3QdKItA+pwOUlTb1A6Ag559znJB+iPQH06TQG6HKGVcCWyU1+teElJWwZQruB9IPke8XIkZoMD8Jj lQmhelubOos25Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Simon Tournier's message of "Tue, 10 Sep 2024 03:27:09 +0200") References: Date: Mon, 16 Sep 2024 22:19:37 +0200 Message-ID: <874j6fbbc6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -5.51 X-Spam-Score: -5.51 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: 482D55A87E X-TUID: ujI2qHkKD99a 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 the= lines of what I sent in a previous message. > @@ -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? Thanks, Ludo=E2=80=99.