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.
This commit is contained in:
parent
8c9ec20386
commit
2382cb4f52
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue