diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-17 00:08:34 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-17 00:08:34 +0200 |
| commit | f5961dd5854cec1ed9a41365836d63aa15256642 (patch) | |
| tree | 9e6168827adf5e4e90128d55fad6f0ab6448c86a /gnu/packages/emacs.scm | |
| parent | 05bb85fda06dc361b8d3d1eef0759606784b3130 (diff) | |
| parent | e28ff04108ae7506a21d451cc23d63937076e2a3 (diff) | |
| download | guix-f5961dd5854cec1ed9a41365836d63aa15256642.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e00931c504..7c60cc6021 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> @@ -68,14 +68,14 @@ (define-public emacs (package (name "emacs") - (version "26.1") + (version "26.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w")) + "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-source-date-epoch.patch")) |