diff options
| author | Alex Kost <alezost@gmail.com> | 2016-03-19 11:36:33 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2016-03-23 11:39:55 +0300 |
| commit | 2382cb4f52b98e6bf28d388194ab0100ef9f23c9 (patch) | |
| tree | 6f7971be96851059c9d408e14ac7164c27231567 | |
| parent | 8c9ec2038642f075b3741816bb89c8365edd230c (diff) | |
| download | guix-2382cb4f52b98e6bf28d388194ab0100ef9f23c9.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/emacs.scm | 8 | ||||
| -rw-r--r-- | 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 f53f73bb8a..215061a67a 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 5c1204ed2e..8b9ed00de7 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") |