Merge remote-tracking branch 'origin/master' into core-updates

This commit is contained in:
Andreas Enge 2016-07-25 21:58:36 +02:00
commit 14656f4495
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
37 changed files with 867 additions and 178 deletions

View file

@ -117,9 +117,7 @@
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((guix-src (assoc-ref inputs "guix-src"))
(out (assoc-ref outputs "out"))
(lisp-dir (string-append out "/share/emacs/"
,(version-major+minor version)
"/site-lisp"))
(lisp-dir (string-append out "/share/emacs/site-lisp"))
(unpack (assoc-ref %standard-phases 'unpack)))
(mkdir "guix")
(with-directory-excursion "guix"
@ -2079,9 +2077,7 @@ It is built on top of the custom theme support in Emacs 24 or later.")
"1ha3slc6d9wi9ilkhmwrzkvf308n6ph7b0k69pk369s9304awxzx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s)))
`(("emacs-dash" ,emacs-dash)))
(home-page "http://github.com/bbatsov/solarized-emacs")
(synopsis "Port of the Solarized theme for Emacs")
(description