From patchwork Tue Sep 10 01:27:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67841 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEE8027BBE2; Tue, 10 Sep 2024 02:29:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84F1127BBE9 for ; Tue, 10 Sep 2024 02:29:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgl-0005UM-9W; 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-0005TU-44 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 1snpgi-0000Hq-R2 for guix-patches@gnu.org; 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=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=llm7+z+5cjrpbsdRbkPc3NSGcCyIOrbHPnMeQLti61SwVHU/vyfMT6nPneWYFgcdVcATU/Bw7qQayVX6pEMANlA4xgSQRFF0E7KUsDi18vdp47WZhsohNoHbHVYQNnDvygOGEKvA6oTCi4/bzL8EWUZEM3IumEh3WJDJRKs/plJxvd4dhg7IO2VUAjywBJJpjCyD8GAptGlQffebRfvrZ4s2fN1py1Sk8WD+UiZN5YZOz137ZhAwUG/vrcp0aYBKB6wetHgPakvptFoEK8ybfGjg4kViiKhoXLM0E9Kg7a9oregKqotdVLwLtA8F+/72txE8h9dHX6jQjXr6BnPFUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgn-0000qf-2h for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 7/8] 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: Tue, 10 Sep 2024 01:29:05 +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.17259317293175 (code B ref 73073); Tue, 10 Sep 2024 01:29:05 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:49 +0000 Received: from localhost ([127.0.0.1]:34448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgW-0000p4-Lc for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:48 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:60829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgQ-0000nd-8C for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:42 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4280ca0791bso45335635e9.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931652; x=1726536452; 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=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=UvNhnvICorhW0X1mycu1v+0MkcRFlFoO9VvmUsRIT7wZfzVJm+3+1/OlFPB52aKyNV 9X83B5wueiCgw8d8kDQW8TGWE+87AojMSHG9KkRA5Wi17cszzDFFotPaZh3gjOnHq7b3 1q9Lu85B3KGBtPXKf+dncp6wnbpxw7bd3263P9DrVLuVXFwwjg5i/RX5oVih9Zbt56x8 9zlwJIbYKIND4R9fFWZWHB3IN6OZLYLqkRPHeSiN3VvqJE0KVab5SH0yxVI5j2cNnuUA uasDBIcfHPHsHt8wi/B+hrrdPPHsV5LOo5dBCluuGZ881JzF9JGJkjBZ23jx6NE81AS4 f61Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931652; x=1726536452; 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=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=W43caYz8NDgGkchMFQ1DoaTVynpplt1CNdrslQyZakPb6sRur1qmtW1qTAnPoO4z9H KKpd+w5F1F3DQdfXEF6pKtIKOrmgpwEiQm9gXhrPwIto8FJ6VWWGlWBJ7oF+KNBDNDBu eG+CBxZI3mH6/JLq5y7Xdh7TJwxRJ4ApxDGV8Co7v/uTQcjJ7MYOz9pMK6EoTPmTKP+n +6IF4tOgYoEXytJBFwaArJ2JzwEvrlNAgDi3T8Ox9+udPj9pG7TfcT0ViAb2nC4P7m6v bjuQQQIp49KtiC9Ehr6ldBjrTJkO6v7MCcrkSqhA1utld2mgR/zmAWF0kT03Z+euBiFp WKfw== X-Gm-Message-State: AOJu0YyDnaIll7g8OOxwhWgUjDjQ/tzVGGMwL4fSvi6XWGO3tZTwyRRO Zeecfx9wI0/nXYI72T4nfzYbJPSV0d3ZvMojBsiqyN9OV9oO5gzcclzCgQ== X-Google-Smtp-Source: AGHT+IGsAEQP8FwcHlTwAwMGGHXu7HhpaCFyU78Ad5dINxXaxXrHUB5uigTonXoScquXWv3M2Pesrw== X-Received: by 2002:a05:600c:1f90:b0:425:7c95:75d0 with SMTP id 5b1f17b1804b1-42c9f9850d1mr90950315e9.18.1725931652204; Mon, 09 Sep 2024 18:27:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:31 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:15 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git)[arguments]: Move git-manpages origin from here... [native-inputs]: ...to here. Change-Id: I4affbb032523e634b82c7e33343d0dc0797cb393 --- gnu/packages/version-control.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0c4cdedce8..a0fdcb0da9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -693,15 +693,9 @@ (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 + (string-append + "git-manpages-" (package-version this-package) ".tar.xz"))))))))))) (native-inputs (modify-inputs (package-native-inputs git-minimal) ;; For subtree documentation. @@ -712,7 +706,18 @@ (define-public git libxslt pkg-config texinfo - xmlto))) + xmlto + ;; 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. + (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/git-manpages-" + (package-version this-package) ".tar.xz")) + (sha256 + (base32 + "1pqrp46kwbxycqld39027ph1cvkq9am156y3sswn6w2khsg30f09")))))) (inputs (modify-inputs (package-inputs git-minimal) (append bash-minimal ;for wrap-program