[PATCH] gnu: texinfo: Use version 6.1 by default.

[Alex Kost <alezost@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]

Ludovic Courtès (2016-03-19 00:11 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Ludovic Courtès (2016-03-17 11:52 +0300) wrote:
[...]
>>> I guess most of us are using Texinfo 6.1 now and won’t notice.
>>
>> Oh, I've never noticed that I use 6.0.  It's because I update my
>> profiles using "guix package --manifest" facility and:
>>
>>   (@ (gnu packages texinfo) texinfo) gives Texinfo 6.0
>>
>> Is there a reason why we keep so many versions of texinfo?  In
>> particular why there is ‘texinfo-6.1’ variable, while ‘texinfo’ is still
>> 6.0?
>
> It’s just that the upgrade wuold trigger a full rebuild.
>
> We should replace 6.0 with 6.1 in ‘core-updates’.  Would you like to
> take care of it?

If you mean to make a patch for this update, then it is attached.  But
if you mean to rebuild the world, and to check if anything fails, then I
wouldn't like to give so much care to this, sorry.  So if it's OK to
commit this patch to core-updates without testing, then I will gladly do
this :-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-texinfo-Use-version-6.1-by-default.patch --]
[-- Type: text/x-patch, Size: 2885 bytes --]

From 6fc9bc8181a7be3dc2106f7ea6563b7536ff9fd7 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 19 Mar 2016 11:36:33 +0300
Subject: [PATCH] gnu: texinfo: Use version 6.1 by default.

* gnu/packages/texinfo.scm (texinfo): Update to 6.1.
(texinfo-6.1): Remove.
* gnu/packages/emacs.scm (emacs)[arguments]: Remove 'remove-info.info' phase.
---
 gnu/packages/emacs.scm   |  8 --------
 gnu/packages/texinfo.scm | 16 ++--------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7270fc4..321e489 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -88,14 +88,6 @@
              (substitute* (find-files "." "^Makefile\\.in$")
                (("/bin/pwd")
                 "pwd"))))
-         (add-after 'install 'remove-info.info
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; 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"))
-               #t)))
          (add-after 'install 'install-site-start
            ;; Copy guix-emacs.el from Guix and add it to site-start.el.  This
            ;; way, Emacs packages provided by Guix and installed in
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 5c1204e..8b9ed00 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -32,14 +32,14 @@
 (define-public texinfo
   (package
     (name "texinfo")
-    (version "6.0")
+    (version "6.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/texinfo/texinfo-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi"))))
+                "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"))))
     (build-system gnu-build-system)
     (native-inputs `(("procps" ,procps)))  ;one of the tests needs pgrep
     (inputs `(("ncurses" ,ncurses)
@@ -62,18 +62,6 @@ 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")
-- 
2.6.3