guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: man-pages: Update to 6.00.


From: guix-commits
Subject: 01/02: gnu: man-pages: Update to 6.00.
Date: Sun, 16 Oct 2022 05:07:34 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit bc435c595f7ad988da37c8c5a62f54956bd873cf
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Oct 9 02:00:01 2022 +0200

    gnu: man-pages: Update to 6.00.
    
    * gnu/packages/man.scm (man-pages): Update to 6.00.
    [arguments]: Add a new 'skip-html phase.
---
 gnu/packages/man.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 50796df89e..8ecb62dbe2 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -269,7 +269,7 @@ PostScript, and PDF.  Additional tools include the 
@command{man} viewer, and
 (define-public man-pages
   (package
     (name "man-pages")
-    (version "5.13")
+    (version "6.00")
     (source
      (origin
        (method url-fetch)
@@ -279,10 +279,20 @@ PostScript, and PDF.  Additional tools include the 
@command{man} viewer, and
               (string-append 
"mirror://kernel.org/linux/docs/man-pages/Archive/"
                              "man-pages-" version ".tar.xz")))
        (sha256
-        (base32 "12vb15gs56g8wl5nqlm4llr508brh4m2lfknhq4lizbxzqzawkb1"))))
+        (base32 "1252c1356z5spya3yl0lcmmymglx3bmfwmamiz1y5l13xqpwbnwy"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases (delete 'configure))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'skip-html
+           ;; As of 6.00, this package tries to convert man pages to HTML with
+           ;; man2html.  The only Guix package currently providing that script
+           ;; is man-for-txr, but that version seems unable to handle relative
+           ;; ‘.so’ statements properly.  Disable HTML generation.
+           (lambda _
+             (substitute* "lib/build-html.mk"
+               (("(html:) .*" _ target) (string-append target "\n")))))
+         (delete 'configure))
 
        ;; The 'all' target depends on three targets that directly populate
        ;; $(MANDIR) based on its current contents.  Doing that in parallel



reply via email to

[Prev in Thread] Current Thread [Next in Thread]