diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
| commit | 6ff203663e696b74e711ab09d6f4b35c2c332f0f (patch) | |
| tree | 4bf2c77c62fa60febba527a76b1ecffaa0a00a0d /gnu/packages/man.scm | |
| parent | 408a4ed071c9c52de207d799a698781d49fa727d (diff) | |
| parent | a0751e3250dfea7e52468c8090e18c3118d93a60 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/man.scm')
| -rw-r--r-- | gnu/packages/man.scm | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 50796df89e..813ef46e62 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,18 +279,30 @@ 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)) + (list + #: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 - ;; leads to undefined behavior (see <http://bugs.gnu.org/18701>.) - #:parallel-build? #f + ;; The 'all' target depends on three targets that directly populate + ;; $(MANDIR) based on its current contents. Doing that in parallel + ;; leads to undefined behavior (see <http://bugs.gnu.org/18701>.) + #:parallel-build? #f - #:tests? #f - #:make-flags ,#~(list (string-append "mandir=" #$output "/share/man")))) + #:tests? #f + #:make-flags + #~(list (string-append "mandir=" #$output "/share/man")))) (home-page "https://www.kernel.org/doc/man-pages/") (synopsis "Development manual pages from the Linux project") (description |