;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
- #:use-module (gnu packages databases)
+ #:use-module (gnu packages dbm)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages groff)
(define-public libpipeline
(package
(name "libpipeline")
- (version "1.5.0")
+ (version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.gz"))
(sha256
(base32
- "0avg525wvifcvjrwa6i1r6kvahmsswj0mpxrsxzzdzra9wpf2whd"))))
+ "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn"))))
(build-system gnu-build-system)
(home-page "http://libpipeline.nongnu.org/")
(synopsis "C library for manipulating pipelines of subprocesses")
(define-public man-db
(package
(name "man-db")
- (version "2.8.3")
+ (version "2.9.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/man-db/man-db-"
version ".tar.xz"))
(sha256
(base32
- "1b641kcgjvyc41pj67dn4p0zvwlj1vx3l6nf7qdcc7kf6v5a2cjr"))))
+ "0qg2sdn8mayya0ril484iz1r7hi46l68d2d80cr6lvc7x3csqjjx"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(("#! /bin/sh")
(string-append "#!" (which "sh")))))
(remove file-is-directory?
- (find-files "src/tests" ".*"))))))
- (add-after 'unpack 'patch-iconv-path
+ (find-files "src/tests" ".*")))
+ #t)))
+ (add-after 'unpack 'patch-absolute-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/man.c"
(("\"iconv\"")
(string-append "\"" (which "iconv") "\"")))
+ ;; Embed an absolute reference to "preconv", otherwise it
+ ;; falls back to searching in PATH and ultimately fails
+ ;; to render unicode data (see <https://bugs.gnu.org/30785>).
+ (substitute* "lib/encodings.c"
+ (("groff_preconv = NULL")
+ (string-append "groff_preconv = \""
+ (assoc-ref inputs "groff-minimal")
+ "/bin/preconv\"")))
#t)))
#:configure-flags
(let ((groff (assoc-ref %build-inputs "groff"))
(string-append "--with-bzip2=" bzip2 "/bin/gzip")
(string-append "--with-xz=" xz "/bin/xz")
(string-append "--with-col=" util "/bin/col")
- ;; Default value is "/usr/lib/tmpfiles.d" (not
- ;; prefix-sensitive).
+ ;; The default systemd directories ignore --prefix.
+ (string-append "--with-systemdsystemunitdir="
+ %output "/lib/systemd/system")
(string-append "--with-systemdtmpfilesdir="
%output "/lib/tmpfiles.d"))
(map (lambda (prog)
(define-public man-pages
(package
(name "man-pages")
- (version "4.16")
- (source (origin
- (method url-fetch)
- (uri
- (list
- (string-append
- "mirror://kernel.org/linux/docs/man-pages/man-pages-"
- version ".tar.xz")
- (string-append
- "mirror://kernel.org/linux/docs/man-pages/Archive/"
- "man-pages-" version ".tar.xz")))
- (sha256
- (base32
- "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7"))))
+ (version "5.04")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (list (string-append "mirror://kernel.org/linux/docs/man-pages/"
+ "man-pages-" version ".tar.xz")
+ (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/"
+ "man-pages-" version ".tar.xz")))
+ (sha256
+ (base32 "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases (delete 'configure))
(define-public help2man
(package
(name "help2man")
- (version "1.47.5")
+ (version "1.47.10")
(source
(origin
(method url-fetch)
version ".tar.xz"))
(sha256
(base32
- "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"))))
+ "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk"))))
(build-system gnu-build-system)
(arguments `(;; There's no `check' target.
#:tests? #f))
automatically.")
(license gpl3+)))
+(define-public help2man/latest
+ (package
+ (inherit help2man)
+ (version "1.47.11")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/help2man/help2man-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar"))))))
+
+(define-public scdoc
+ (package
+ (name "scdoc")
+ (version "1.9.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://git.sr.ht/%7Esircmpwn/scdoc/archive/" version
+ ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure))))
+ (home-page "https://git.sr.ht/~sircmpwn/scdoc")
+ (synopsis "Simple man page generator")
+ (description "scdoc is a simple man page generator written for POSIX systems
+in C99.")
+ ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING.
+ (license expat)))
+
(define-public txt2man
(package
(name "txt2man")