diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:01 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:12 -0400 |
| commit | f67337e23ec16b1e05fcdcc7953f68f13ed6770a (patch) | |
| tree | 766e98a6c4695228f0a066accf91f639791dad68 /gnu/packages/emacs.scm | |
| parent | b99eec83b861f6bee7afb7bd6ffcbdddd8f62b65 (diff) | |
| parent | e05fc441cd5528ba6c83b6371c27c1e87dd393e9 (diff) | |
| download | patches-f67337e23ec16b1e05fcdcc7953f68f13ed6770a.tar patches-f67337e23ec16b1e05fcdcc7953f68f13ed6770a.tar.gz | |
Merge branch 'master' into core-updates
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 c6e62acb7a..b84faaff07 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2179,7 +2179,7 @@ in @code{html-mode}.") (define-public emacs-slime (package (name "emacs-slime") - (version "2.18") + (version "2.19") (source (origin (file-name (string-append name "-" version ".tar.gz")) @@ -2189,7 +2189,7 @@ in @code{html-mode}.") version ".tar.gz")) (sha256 (base32 - "146avwbwr6mw0nmgyihx8gkr0mv6al7a73igzxvysj62000cqvlj")))) + "1jhaq5cn89k45nzyl0jd12gmjxnh1bq9jlfwrxba342agxsscb0p")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) @@ -2924,7 +2924,7 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.") (string-append "SHELL = " (which "sh"))))))))) (inputs `(("emacs" ,emacs-minimal) - ("r" ,r))) + ("r-minimal" ,r-minimal))) (native-inputs `(("perl" ,perl) ("texinfo" ,texinfo) |