Merge branch 'core-updates'

This commit is contained in:
Ludovic Courtès 2016-08-01 23:30:52 +02:00
parent 742effef56
commit 455859a50f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
101 changed files with 1563 additions and 2820 deletions

View file

@ -110,14 +110,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