diff options
Diffstat (limited to 'gnu/packages/texinfo.scm')
| -rw-r--r-- | gnu/packages/texinfo.scm | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ca411a95ac..92bd9471dd 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,20 +26,22 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages perl) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses)) (define-public texinfo (package (name "texinfo") - (version "5.2") + (version "6.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/texinfo/texinfo-" - version ".tar.xz")) - (sha256 - (base32 - "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) + (method url-fetch) + (uri (string-append "mirror://gnu/texinfo/texinfo-" + version ".tar.xz")) + (sha256 + (base32 + "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi")))) (build-system gnu-build-system) + (native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep (inputs `(("ncurses" ,ncurses) ("xz" ,xz) ("perl" ,perl))) @@ -53,17 +56,17 @@ their source and the command-line Info reader. The emphasis of the language is on expressing the content semantically, avoiding physical markup commands.") (license gpl3+))) -(define-public texinfo-6 - (package - (inherit texinfo) - (version "6.0") +(define-public texinfo-5 + (package (inherit texinfo) + (version "5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) (sha256 (base32 - "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi")))))) + "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) + (native-inputs '()))) (define-public texinfo-4 (package (inherit texinfo) @@ -77,6 +80,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (sha256 (base32 "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) + (native-inputs '()) (inputs `(("ncurses" ,ncurses) ("xz" ,xz))))) (define-public texi2html |