From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 kH5pFGzU2WaA6wAA62LTzQ:P1 (envelope-from ) for ; Thu, 05 Sep 2024 15:55:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kH5pFGzU2WaA6wAA62LTzQ (envelope-from ) for ; Thu, 05 Sep 2024 17:55:24 +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="E2XbHAr/"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SRB1DDOa; 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=1725551724; 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=RFXM8mKWiMDbU6hQRB/KR+LBIL5icqVRKU+526Ayvrk=; b=mYL/5wqVxvckYkqAqGhmFQO9Q8sbL12tcEPOOJIUj+SYfHNJ7AM+nSBPu07EBfSbUbLHEB /eE0r11bFpW1AIPHl1G9z0WLd45DPgPXtJgGzGT7MLHSBKEY8f/iS/4drhK1ngdtUnN76Y 01bepjYnnhcwV7jsInWItdgX97mt63OxFvYxovGsYJChxQcS2Cw7htf+55DoWmfE3PJPkA Y0BfTkrw8If3gg4UII4XirBJ0Kpd0KVc+jwSvLyZ2rA6tDIcHDHFCBxQ1ci4KWqwEnXnyd Bc0Jj/sRzcQR5rUCe2DgChjiLEH+DChaRLg7+JY0G9sROgxLXTe7LFzLs35hPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="E2XbHAr/"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SRB1DDOa; 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=1725551724; a=rsa-sha256; cv=none; b=H3k2xV5tUdYsgkrHY8gUj+RnHf8b4W36CK9Muc4YuljILbE/Bgm4UNa7sgxzkk2OPiGn98 p6OJfR0rKe/BL6uo9XQ9NQWxvrQW6ef90EKEhMrEdQcw2w9FplxZjIzhwkH/vGke83PF5q SeBs0YGrzWwB0jujR0RHJwZQ9qjQiAljI/So5iDxDGuy18CKsVz0oW6YPfpVjdZly4D0P6 n7VKz9zzJ9iLPbUUf2JaT1iCWHXfA7T0VBv7vCcVJGpoGSsDXCyyk463vxFl15w8plWdaH sYFJFSKKOVWq7aD6DN1yZHHt+7VmDvkn9p6t3xz4Kt9xjapD20lPQ22LcwxY3w== 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 D38E212E11 for ; Thu, 5 Sep 2024 17:55:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smEp1-0001x5-UU; Thu, 05 Sep 2024 11:54:59 -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 1smEp0-0001rp-Kl for guix-patches@gnu.org; Thu, 05 Sep 2024 11:54: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 1smEp0-0002mw-BO for guix-patches@gnu.org; Thu, 05 Sep 2024 11:54:58 -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=RFXM8mKWiMDbU6hQRB/KR+LBIL5icqVRKU+526Ayvrk=; b=E2XbHAr/cceLlSgJxI0eX6cjs2ruwSGmZY4ZkvYX8subGxQzXd2BcIRRzDF6e6ygkwSd8bj9RhotpmqPLqyvrIxeYkWm9hPlOZi3DyYmQOiaSZGdmWaYS1Z+iQBFI80BcgSZhXMjnLJm6tOyg9D1g89uHYgIz0BIVX+F0YQNTjYTDzoyTnesWnlFgAx3E2DprJMALZP5o2/BaoEmkUP4gLJgclo7ivEE01y/Il9UVbRddTQU2cv3DJNPRj0VD+3GZ1dhNHYcsJM0O3G/pPnNfFWQ9hlbf56g/txmTWRHnr2YwTqXcC079rhBlqMt5SyoGfoIrcnkxy7aTC/WPKmnRA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smEq3-0003xG-FE for guix-patches@gnu.org; Thu, 05 Sep 2024 11:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73034] [PATCH v3 3/3] gnu: git: Move git-manpages origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 15:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73034@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73034-submit@debbugs.gnu.org id=B73034.172555171115049 (code B ref 73034); Thu, 05 Sep 2024 15:56:03 +0000 Received: (at 73034) by debbugs.gnu.org; 5 Sep 2024 15:55:11 +0000 Received: from localhost ([127.0.0.1]:37918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smEpD-0003uZ-9z for submit@debbugs.gnu.org; Thu, 05 Sep 2024 11:55:11 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:50216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smEY1-0002fj-CJ for 73034@debbugs.gnu.org; Thu, 05 Sep 2024 11:37:25 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42c94eb9822so7734045e9.0 for <73034@debbugs.gnu.org>; Thu, 05 Sep 2024 08:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725550514; x=1726155314; 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=RFXM8mKWiMDbU6hQRB/KR+LBIL5icqVRKU+526Ayvrk=; b=SRB1DDOagE3M8hgN2jyJUvpM/ugiYqDkJF2ma7iGbqsBHKWAtcnfou9T9/naOnOkoP 54SzD1i4IvBbLy3wgTU3Xe6qyYTqzJp5VIi6k2qmU5kD+JBYlR0IAOCc1mtc1vV0UwJ/ sSyUbpUCcSpDIMDsjnsPTY4Wkg42dDs+6U+a3yMwq6/mWEJ1gueWC8uWSOIXVE2BXN1v cu90m170DsOpeMK31zqT0jqxX9jmkeh+r0sSmdPAHZz7noK/WQqM2NZzB1g2FUYrymKs mVsmvMivmnWNCRnc+mVgbHA7bLR+mP80yqhSdMb8msRc5yEzld1GQ8/DwZ85FYL7ZwTy s4bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725550514; x=1726155314; 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=RFXM8mKWiMDbU6hQRB/KR+LBIL5icqVRKU+526Ayvrk=; b=O8Wx+bomortH+nQK28MKKLlWGGi3Dpq0Jp4bx5poVpfkuT8zyCGLtw5eW04lONclbT QKrTWihYnbovQP9iF1uZx1Hl9YnuHPbOclYubA8MVfPLmA5jyNwt1t22Pld43jROFHk9 ZaLYbmlewdwH3es+AhqbqsJkVqjd7+OmmjBJ+xYwJGGUKwlwfDapGHj4Hb7HPBMMUBzp yODoe2ROs9Ul43pY4wpQt49vfSi80vzc2VvJzbpG9yx9jxB3WE3PWJtYODECIWFM+Dkc /XzCMjWUyf+m1UA2imLyjasfPV9xPPOVNd9+eoG0rdUIjn1NdtdI/7Xs7+LpXAyzNHn+ TLMQ== X-Gm-Message-State: AOJu0YzPjXDRTXOjYauvrsFUpTUbaYOxagd14rdLSWSWz+Fki+XwnBxW RqsPWSmB3qSJcrPvM+LHv1JSOq/og6EC/SBH5/QGaLCrTjFw2chCHKpRxg== X-Google-Smtp-Source: AGHT+IFFsxnYTnjam3oIzVldxBKXzP3MDrsFY1nmv5dZ3IHbBaEOs2q0Derh/46ZHQ6aZ9XdZj937Q== X-Received: by 2002:a05:600c:3d18:b0:426:5c9b:dee6 with SMTP id 5b1f17b1804b1-42c7b5d8f7fmr109516335e9.26.1725550514390; Thu, 05 Sep 2024 08:35:14 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:4d6d:a7b0:20be:6231]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42c9bb7d3a4sm19365875e9.1.2024.09.05.08.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 08:35:14 -0700 (PDT) From: Simon Tournier Date: Thu, 5 Sep 2024 17:34:50 +0200 Message-ID: <3a6d3ee8f2768bef9f17196b82c47c99c2ea09f5.1725550253.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: D38E212E11 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.92 X-Spam-Score: -9.92 X-TUID: wXwbZUvRgwoH The move from native-inputs to the install-man-pages phase had been done by f288604428e9c8f096ec9e0eccf207e079806271. * gnu/packages/version-control.scm (git)[arguments]: Move git-manpages origin from here... [native-inputs]: ...to here. Change-Id: I9fa543f7410bce6eb8a82d275eab81a1ea86ecc0 --- gnu/packages/version-control.scm | 44 ++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9a4c2fdbdc..3e8f042d18 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -695,26 +695,32 @@ (define-public git (with-directory-excursion man (invoke "tar" "xvf" - #$(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/" - "git-manpages-" (package-version this-package) - ".tar.xz")) - (sha256 - (base32 - "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw")))))))))))) + #$(this-package-native-input "git-manpages")))))))))) (native-inputs - (modify-inputs (package-native-inputs git-minimal) - ;; For subtree documentation. - (append asciidoc - docbook2x - docbook-xml-4.5 - docbook-xsl - libxslt - pkg-config - texinfo - xmlto))) + (cons + ;; To build the man pages from the git sources, we would need a dependency + ;; on a full XML tool chain, and building it actually takes ages. So we + ;; use this lazy approach and use released tarball. + `("git-manpages" + ,(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/git-manpages-" + (package-version this-package) ".tar.xz")) + (sha256 + (base32 + "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw")))) + + (modify-inputs (package-native-inputs git-minimal) + ;; For subtree documentation. + (append asciidoc + docbook2x + docbook-xml-4.5 + docbook-xsl + libxslt + pkg-config + texinfo + xmlto)))) (inputs (modify-inputs (package-inputs git-minimal) (append bash-minimal ;for wrap-program -- 2.45.2