nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: emacs-ess: Update to 17.11. 

* gnu/packages/emacs.scm (emacs-ess): Update to 17.11
[url]: Use github for https
[snippet]: update julia-mode substitution, only build info doc, bypass failing test
[propagated-inputs]: Add emacs-julia-mode
[description]: Mention that ESS supports Julia and JAGS (which replaces OpenBUGS)
[arguments]: Remove 'set-home' phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Alex Branham 2018-09-06 18:35:36 +02:00 committed by Ludovic Courtès
parent 1540075c79
commit 12498b59e7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/emacs.scm
View File

@ -38,6 +38,7 @@
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -4123,22 +4124,34 @@ programming language.")
(define-public emacs-ess (define-public emacs-ess
(package (package
(name "emacs-ess") (name "emacs-ess")
(version "16.10") (version "17.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://ess.r-project.org/downloads/ess/ess-" (uri (string-append "https://github.com/emacs-ess/ESS/archive/v"
version ".tgz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk")) "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Stop ESS from trying to bundle an external julia-mode.el. ;; Stop ESS from trying to bundle an external julia-mode.el.
(substitute* "lisp/Makefile" (substitute* "lisp/Makefile"
(("^\tjulia-mode.elc\\\\\n") "") (("^\tjulia-mode.elc\\\\\n") "")
(("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el") (("^dist: all julia-mode.el")
"all: $(ELC) ess-custom.el")) "dist: all"))
;; No need to build docs in so many formats. Also, skipping
;; pdf lets us not pull in texlive.
(substitute* "doc/Makefile"
(("all : info text html pdf")
"all : info")
(("install: install-info install-other-docs")
"install: install-info"))
;; Test fails upstream
(substitute* "test/ess-r-tests.el"
(("ert-deftest ess-r-namespaced-eval-no-srcref-in-errors ()")
"ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :expected-result :failed"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -4157,10 +4170,6 @@ programming language.")
(("SHELL = /bin/sh") (("SHELL = /bin/sh")
(string-append "SHELL = " (which "sh")))) (string-append "SHELL = " (which "sh"))))
#t)) #t))
;; FIXME: the texlive-union insists on regenerating fonts. It stores
;; them in HOME, so it needs to be writeable.
(add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "make" "test"))))))) (invoke "make" "test")))))))
@ -4169,16 +4178,14 @@ programming language.")
("r-minimal" ,r-minimal))) ("r-minimal" ,r-minimal)))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("texinfo" ,texinfo) ("texinfo" ,texinfo)))
("texlive" ,(texlive-union (list texlive-latex-natbib (propagated-inputs
texlive-latex-seminar `(("emacs-julia-mode" ,emacs-julia-mode)))
texlive-latex-hyperref
texlive-tex-texinfo)))))
(home-page "https://ess.r-project.org/") (home-page "https://ess.r-project.org/")
(synopsis "Emacs mode for statistical analysis programs") (synopsis "Emacs mode for statistical analysis programs")
(description "Emacs Speaks Statistics (ESS) is an add-on package for GNU (description "Emacs Speaks Statistics (ESS) is an add-on package for GNU
Emacs. It is designed to support editing of scripts and interaction with Emacs. It is designed to support editing of scripts and interaction with
various statistical analysis programs such as R and OpenBUGS.") various statistical analysis programs such as R, Julia, and JAGS.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-smex (define-public emacs-smex