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

gnu: emacs-ess: Update to 16.10. 

* gnu/packages/emacs.scm (emacs-ess): Update to 16.10.
[arguments]: Enable tests.
[source]: Add snippet to prevent build process from trying to download
external julia-mode.el.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Kyle Meyer 2017-10-13 12:28:37 -04:00 committed by Ludovic Courtès
parent db29e59865
commit a209907ed6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/emacs.scm
View File

@ -3408,19 +3408,26 @@ programming language.")
(define-public emacs-ess (define-public emacs-ess
(package (package
(name "emacs-ess") (name "emacs-ess")
(version "16.04") (version "16.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://ess.r-project.org/downloads/ess/ess-" (uri (string-append "http://ess.r-project.org/downloads/ess/ess-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 (base32
"0w7mbbajn377gdmvnd21mpyr368b2ia46gq6cb99y4y5rspf9pcg")))) "04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk"))
(modules '((guix build utils)))
(snippet
'(begin
;; Stop ESS from trying to bundle an external julia-mode.el.
(substitute* "lisp/Makefile"
(("^\tjulia-mode.elc\\\\\n") "")
(("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el")
"all: $(ELC) ess-custom.el"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(let ((base-directory "/share/emacs/site-lisp/guix.d/ess")) (let ((base-directory "/share/emacs/site-lisp/guix.d/ess"))
`(#:tests? #f ; There is no test suite. `(#:make-flags (list (string-append "PREFIX=" %output)
#:make-flags (list (string-append "PREFIX=" %output)
(string-append "ETCDIR=" %output "/" (string-append "ETCDIR=" %output "/"
,base-directory "/etc") ,base-directory "/etc")
(string-append "LISPDIR=" %output "/" (string-append "LISPDIR=" %output "/"
@ -3436,7 +3443,10 @@ programming language.")
;; FIXME: the texlive-union insists on regenerating fonts. It stores ;; FIXME: the texlive-union insists on regenerating fonts. It stores
;; them in HOME, so it needs to be writeable. ;; them in HOME, so it needs to be writeable.
(add-before 'build 'set-HOME (add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t)))))) (lambda _ (setenv "HOME" "/tmp") #t))
(replace 'check
(lambda _
(zero? (system* "make" "test"))))))))
(inputs (inputs
`(("emacs" ,emacs-minimal) `(("emacs" ,emacs-minimal)
("r-minimal" ,r-minimal))) ("r-minimal" ,r-minimal)))