From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 6DgcJ/ug32bOUwAA62LTzQ:P1 (envelope-from ) for ; Tue, 10 Sep 2024 01:29:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6DgcJ/ug32bOUwAA62LTzQ (envelope-from ) for ; Tue, 10 Sep 2024 03:29:31 +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="TPlGfG/5"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="NjuYmDM/"; 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=1725931771; 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=zqRJ5Sd4B1YSQnG721xVQc87oGus1YzPXswJCbIS0t8=; b=RK8u3u2SCD23sZUbvfcCMswTFRLRlJIef+mU6SUHP18Bu7HA6EA1B9kQgi+qCfEJTao+if RyhMoWpAutWtKoxw4eKYfo2UY88h7JCGqm2yCvfTRl8XF39ws95sYIDkEl1xgaqns9DWcT ZnOVpez3VO/sUK4220HZ9C8/zzKezrMqXEgQEe0BAZu25/66vI1ru0mqz4R+MHOnVdAFdi gi+Dlc6/7qM7ZqgIerB/auHiehQ9nNtXLBQUabr1wciG3QLnhCUuRs+AGBMuwfvBmYRfjI kWbu5TwpQVRrfzZ25A5EnFLpzbl5/S6oF6LMHMx+mbMShPnQKRLWtB6Lke2OcQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="TPlGfG/5"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="NjuYmDM/"; 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=1725931771; a=rsa-sha256; cv=none; b=pN00oJlFLff52Bub93h5gPhVdstvDbwT2HKWLvXpJ5e7xI2ggiZwtoCXVvaWc860gnxl9Q NQ0uJMaorw4M9mY44pkhavJHlL94CgVhpY/+DoTeahhXV3QwKmNxpBC1NvNCeg2r++L7Jt Ilq9GhtoMvx0vp46A9Lahs8tAs0Dll9DoqCD97u/lpuD+GHJk3GvlkKXQCb17uGSkxTrPL 6gh3x7q2IMbzMiKaor3JIP8P1tbmax5kRpUnYFtxcL18u2cZ0lbKHBk0HFHmXQVi3vpCdJ 5/7ryvr5HvIfLFmVylcQ9YUFySesgOCE5rErT1Q26GxSxhb12xn9Za/HvH+M1w== 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 7E794F75F for ; Tue, 10 Sep 2024 03:29:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgj-0005T8-E0; Mon, 09 Sep 2024 21:29:01 -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 1snpgg-0005ST-5d for guix-patches@gnu.org; Mon, 09 Sep 2024 21:28:58 -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 1snpgf-0000HH-Rv for guix-patches@gnu.org; Mon, 09 Sep 2024 21:28:57 -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:From:To:In-Reply-To:References:Subject; bh=zqRJ5Sd4B1YSQnG721xVQc87oGus1YzPXswJCbIS0t8=; b=TPlGfG/5vaKOpnB6eENGx4JbAv0h5KdWarPBgQpRlPPj/6FaIr2ngmVqvaum152QA+yF3vfBl4vXtTqqsvB6TJog0TZ9YLma9OgDCHRi9Nh5a9PybHjtKqf+c1DRsn2DzlTzhgJoocUZbK0VIqgNbs9bboEIFGJaRftLa0wRTHnYNZQhAR052rz36rZ/UAQDlodcY1nWAgya3Gs5wYrvt0G2QhxzTGKBBWFREAjVXl2vOodnvifkupu6UAsSndLlOuS1UutE9lmpW2bFaqivXlpPH787+iwZJX81HxAWZ8jzPD4xv2xhMROE55o+g495fjRho7CiK16rnxyObufN3w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgj-0000pk-OT for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 0/8] Allow origin inside inputs with "new style". References: In-Reply-To: Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29: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: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317173074 (code B ref 73073); Tue, 10 Sep 2024 01:29:01 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:37 +0000 Received: from localhost ([127.0.0.1]:34427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgK-0000nT-6u for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:36 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:54292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgH-0000n0-LM for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:34 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42cae102702so25310945e9.0 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931643; x=1726536443; darn=debbugs.gnu.org; h=content-transfer-encoding:-x-debbugs-cc:mime-version:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=zqRJ5Sd4B1YSQnG721xVQc87oGus1YzPXswJCbIS0t8=; b=NjuYmDM/WPGcm9Bu7MlbXis8PRJ1s7GCg2omBs5T+emoBj91SVP8dUWVJpzJLjRef9 7BBjiFixmkf71TkLw3axdU6ovI/8rnUiTdNslQegZDwKwolhPhUSsVvM3/EEgNOnUhFl RL/mmZ8DqXdV7Wo1jAEWPgsbqED2+yN4r2/ql9GEHsQ32InTNeNGkojhpnh5g8DnJJKk 8UizNqYHV+2e4L8kuvRjM6amcrwznRQj4bJqwJfoqAS2kV6U4bskW/rW4dw0yvD2xHdT y/EoYAnUVkjvPhYzpvhPQpxzQXXpP4yTDrgRJUKqaQYgaYoCIhzmOy1vzQBBndnWiQcf JLSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931643; x=1726536443; h=content-transfer-encoding:-x-debbugs-cc:mime-version:message-id :date:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zqRJ5Sd4B1YSQnG721xVQc87oGus1YzPXswJCbIS0t8=; b=Jfmh3joLkXATsCuuUTxp4uMQbm05NidXcID64OW0m8HomPqNUTQ1G8DBHpj84N8AMw wpvrPwff8x1kWUjfJc+VZPtsDxEahwHVGIhk6oV+V5C1n0d/zFbQqRHXCYxGOp95jyds X4G5WiTURwJleIjZhGrU09BphBGC1z38WadxqvdkkbR86LF0M7bumRy3M/HIscA4u4eZ eIveV8VWZyjpf5urYEfDr4blKy2xRm8QeXY72hFtfacW98h8nRN8arcR0Iz9pWPG/79B 4N1LzSWeRBmV4tmV/+MXNlqgx9zbyGMhxg/ptphakRBpJzrhU3IAVhWy8PBca/zvwojR kdSQ== X-Gm-Message-State: AOJu0YydHmU6yIRGkG3xiSKA3NsHUjSc2DAXUWbgV4hamngXynqopN+5 oeijeIJi6kqnLAn1HhLE1a+TgL53a8RSqfr0v32HNNnNWwXTuxjanNUspw== X-Google-Smtp-Source: AGHT+IEPilAgzgtKu/q01XQga+lh6v3RK4enTFunABttkkQZoAtKv4wWZvzPw2iR+wJFP1N1clOjYg== X-Received: by 2002:a05:600c:4f83:b0:429:e6bb:a436 with SMTP id 5b1f17b1804b1-42cae70f1b5mr60146105e9.9.1725931643007; Mon, 09 Sep 2024 18:27:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:22 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:08 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 -X-Debbugs-CC: maxim.cournoyer@gmail.com, ludo@gnu.org, liliana.prikler@gmail.com Content-Type: text/plain; charset=UTF-8 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: -5.52 X-Migadu-Queue-Id: 7E794F75F X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.52 X-TUID: XPve9UbtKxI/ Hi, Following Ludo's advice [1], here the v2. Packages use ’package-name’ as internal labels so the first patch of the serie adds ’origin-actual-file-name’ as internal labels for the origins. Then, the ’origin’ is found back via ’this-package-input’ as for the packages. For instance, without the patch, we have somewhere in the phase: #$(origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/" "git-manpages-" (package-version this-package) ".tar.xz")) (sha256 (base32 "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw")))))))))))) then with the patch, this origin is moved to the ’native-inputs’ field and the snippet above is replaced by: #$(this-package-native-input (string-append "git-manpages-" (package-version this-package) ".tar.xz"))))))))))) Please note the two special cases: tzdata and texlive-hyphen-complete. They are considered in order to avoid a world rebuild. The final adjusment can be addressed with some “build train” (or “merge train”) as discussed elsewhere. The other patches of the series provide more examples of the usage. WDYT? Cheers, simon 1: [bug#73073] [PATCH 0/6] Allow origin with label as inputs. Ludovic Courtès Fri, 06 Sep 2024 23:45:04 +0200 id:87o750wj6n.fsf@gnu.org https://issues.guix.gnu.org/73073 https://issues.guix.gnu.org/msgid/87o750wj6n.fsf@gnu.org https://yhetil.org/guix/87o750wj6n.fsf@gnu.org Simon Tournier (8): guix: packages: Allow origin inside inputs with "new style". gnu: gnome-recipes: Move libgd origin from phases to native-inputs. gnu: dmd-bootstrap: Move phobos origin from phases to native-inputs. gnu: smithforth: Move system.fs origin from phases to native-inputs. gnu: farstream: Move common origin from phases to native-inputs. gnu: gnulib: Move phobos origin from phases to native-inputs. gnu: git: Move git-manpages origin from phases to native-inputs. gnu: cgit: Remove input labels. gnu/packages/build-tools.scm | 18 ++++---- gnu/packages/dlang.scm | 21 ++++----- gnu/packages/forth.scm | 20 +++++---- gnu/packages/freedesktop.scm | 24 +++++----- gnu/packages/gnome.scm | 19 ++++---- gnu/packages/version-control.scm | 75 +++++++++++++++++--------------- guix/packages.scm | 10 +++++ 7 files changed, 106 insertions(+), 81 deletions(-) base-commit: 85a603f58b9b6fef86984a3b2cfc27bd13314ba1 -- 2.45.2