01/02: gnu: Add Texinfo 6.1.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 8c4c2a983e28d08034cb151ed9c1a41094bc921b
Author: Ludovic Courtès <address@hidden>
Date:   Sat Feb 6 18:46:34 2016 +0100

    gnu: Add Texinfo 6.1.
    
    * gnu/packages/texinfo.scm (texinfo-6.1): New variable.
    * gnu/packages/emacs.scm (emacs): Add comment about 'info.info'.
---
 gnu/packages/emacs.scm   |    3 ++-
 gnu/packages/texinfo.scm |   14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 68f4e0a..fc940eb 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -89,7 +89,8 @@
                 "pwd"))))
          (add-after 'install 'remove-info.info
            (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")))
                (delete-file
                 (string-append out "/share/info/info.info.gz"))
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index bffff78..5c1204e 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;;
@@ -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.")
     (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
   (package (inherit texinfo)
     (version "5.2")