me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Alex Kost 2016-03-19 11:36:33 +03:00
parent 8c9ec20386
commit 2382cb4f52
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/emacs.scm
View File

@ -88,14 +88,6 @@
(substitute* (find-files "." "^Makefile\\.in$") (substitute* (find-files "." "^Makefile\\.in$")
(("/bin/pwd") (("/bin/pwd")
"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 (add-after 'install 'install-site-start
;; Copy guix-emacs.el from Guix and add it to site-start.el. This ;; Copy guix-emacs.el from Guix and add it to site-start.el. This
;; way, Emacs packages provided by Guix and installed in ;; way, Emacs packages provided by Guix and installed in

16
gnu/packages/texinfo.scm
View File

@ -32,14 +32,14 @@
(define-public texinfo (define-public texinfo
(package (package
(name "texinfo") (name "texinfo")
(version "6.0") (version "6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/texinfo/texinfo-" (uri (string-append "mirror://gnu/texinfo/texinfo-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi")))) "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep (native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep
(inputs `(("ncurses" ,ncurses) (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.") 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")