me
/
guix
Archived
1
0
Fork 0
Code

gnu: emacs-ess: Update to 18.10.2. 

* gnu/packages/statistics.scm (emacs-ess): Update to 18.10.2.
[source]: Use git-fetch and git-file-name.  Fix snippets for removing
julia-mode and removing extra documentation formats.  Add snippets for
installing elisp files and stopping installation of info directory.
Remove snippet for old failing test.  Add snippet for new failing test.
[arguments]: Remove extra "/".
[native-inputs]: Add r-roxygen2.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
master
Tim Howes via Guix-patches via 2020-05-02 16:54:35 -07:00 committed by Marius Bakke
parent 6a25036fb2
commit 51ac5ce4b5
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/statistics.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com> ;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -5786,42 +5787,51 @@ Java package that provides routines for various statistical distributions.")
(define-public emacs-ess (define-public emacs-ess
(package (package
(name "emacs-ess") (name "emacs-ess")
(version "17.11") (version "18.10.2")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/emacs-ess/ESS/archive/v" (uri (git-reference
version ".tar.gz")) (url "https://github.com/emacs-ess/ESS")
(commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c")) "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(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") "") (("^ess-julia.elc: julia-mode.elc") "")
(("^dist: all julia-mode.el") (("^all: julia-mode.el")
"dist: all")) "all:"))
;; No need to build docs in so many formats. Also, skipping ;; Include *.el files in install target.
;; pdf lets us not pull in texlive. (substitute* "lisp/Makefile"
(("\t\\$\\(INSTALL) \\$\\(ELC\\) \\$\\(LISPDIR\\)" elc)
(string-append "\t$(INSTALL) $(ELS) ess-autoloads.el "
"$(LISPDIR)\n" elc)))
;; Only build docs in info format.
(substitute* "doc/Makefile" (substitute* "doc/Makefile"
(("all : info text html pdf") (("all : info text")
"all : info") "all : info")
(("install: install-info install-other-docs") (("install: install-info install-other-docs")
"install: install-info")) "install: install-info"))
;; Test fails upstream ;; Stop install-info from trying to update the info directory.
(substitute* "doc/Makefile"
((".*\\$\\(INFODIR\\)/dir.*") ""))
;; Fix roxygen preview test.
(substitute* "test/ess-r-tests.el" (substitute* "test/ess-r-tests.el"
(("ert-deftest ess-r-namespaced-eval-no-srcref-in-errors ()") (("Add together two numbers.\n")
"ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :expected-result :failed")) "Add together two numbers. ")
(("##' add\\(10, 1\\)") "add(10, 1)"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(let ((base-directory "/share/emacs/site-lisp")) (let ((base-directory "/share/emacs/site-lisp"))
`(#: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
,base-directory)) ,base-directory))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -5840,6 +5850,7 @@ Java package that provides routines for various statistical distributions.")
("r-minimal" ,r-minimal))) ("r-minimal" ,r-minimal)))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("r-roxygen2" ,r-roxygen2)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(propagated-inputs (propagated-inputs
`(("emacs-julia-mode" ,emacs-julia-mode))) `(("emacs-julia-mode" ,emacs-julia-mode)))