From: Simon Tournier <zimon.toutoune@gmail.com>
To: 73034@debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#73034] [PATCH v3 3/3] gnu: git: Move git-manpages origin from phases to native-inputs.
Date: Thu, 5 Sep 2024 17:34:50 +0200 [thread overview]
Message-ID: <3a6d3ee8f2768bef9f17196b82c47c99c2ea09f5.1725550253.git.zimon.toutoune@gmail.com> (raw)
In-Reply-To: <cover.1725550253.git.zimon.toutoune@gmail.com>
The move from native-inputs to the install-man-pages phase had been done by
f288604428e9c8f096ec9e0eccf207e079806271.
* gnu/packages/version-control.scm (git)[arguments]<phases>: 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
next prev parent reply other threads:[~2024-09-05 15:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 1:55 [bug#73034] [PATCH] gnu: git: Fix perl search-paths of wrapped programs Simon Tournier
2024-09-05 2:37 ` [bug#73034] [PATCH v2] " Simon Tournier
2024-09-05 12:47 ` [bug#73034] [PATCH] " Ashish SHUKLA via Guix-patches via
2024-09-05 15:34 ` [bug#73034] [PATCH v3 0/3] Fix annoyances of Git and update to 2.46.0 Simon Tournier
2024-09-05 15:34 ` [bug#73034] [PATCH v3 1/3] gnu: git: Fix perl search-paths of wrapped programs Simon Tournier
2024-09-05 15:34 ` [bug#73034] [PATCH v3 2/3] gnu: git: Update to 2.46.0 Simon Tournier
2024-09-05 15:34 ` Simon Tournier [this message]
2024-09-06 4:17 ` [bug#73034] [PATCH v3 0/3] Fix annoyances of Git and update " Maxim Cournoyer
2024-09-06 10:31 ` Simon Tournier
2024-09-06 15:53 ` Simon Tournier
2024-09-08 12:10 ` bug#73034: " Maxim Cournoyer
2024-09-09 17:50 ` [bug#73034] " Simon Tournier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a6d3ee8f2768bef9f17196b82c47c99c2ea09f5.1725550253.git.zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=73034@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).