[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73034] [PATCH v3 3/3] gnu: git: Move git-manpages origin from phase
From: |
Simon Tournier |
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 |
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