Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2017-09-21 20:34:49 +02:00
commit efa0ba499e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
10 changed files with 93 additions and 105 deletions

View file

@ -103,18 +103,17 @@
(define-public emacs
(package
(name "emacs")
(version "25.2")
(version "25.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz"))
(sha256
(base32
"1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar"))
"02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"))
(patches (search-patches "emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-source-date-epoch.patch"
"emacs-unsafe-enriched-mode-translations.patch"))
"emacs-source-date-epoch.patch"))
(modules '((guix build utils)))
(snippet
;; Delete the bundled byte-compiled elisp files and