nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Add Texinfo 6.1. 

* gnu/packages/texinfo.scm (texinfo-6.1): New variable.
* gnu/packages/emacs.scm (emacs): Add comment about 'info.info'.
This commit is contained in:
Ludovic Courtès 2016-02-06 18:46:34 +01:00
parent a05d1d82c0
commit 8c4c2a983e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/emacs.scm
View File

@ -89,7 +89,8 @@
"pwd")))) "pwd"))))
(add-after 'install 'remove-info.info (add-after 'install 'remove-info.info
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Remove 'info.info', which is provided by Texinfo. ;; Remove 'info.info', which is provided by Texinfo <= 6.0.
;; TODO: Remove this phase when we switch to Texinfo 6.1.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(delete-file (delete-file
(string-append out "/share/info/info.info.gz")) (string-append out "/share/info/info.info.gz"))

14
gnu/packages/texinfo.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
@ -62,6 +62,18 @@ their source and the command-line Info reader. The emphasis of the language
is on expressing the content semantically, avoiding physical markup commands.") is on expressing the content semantically, avoiding physical markup commands.")
(license gpl3+))) (license gpl3+)))
(define-public texinfo-6.1
(package
(inherit texinfo)
(version "6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/texinfo/texinfo-"
version ".tar.xz"))
(sha256
(base32
"1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"))))))
(define-public texinfo-5 (define-public texinfo-5
(package (inherit texinfo) (package (inherit texinfo)
(version "5.2") (version "5.2")