* [bug#32648] [PATCH] Update emacs-ess to 17.11
@ 2018-09-06 16:42 alex.branham
2018-09-07 8:58 ` bug#32648: " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: alex.branham @ 2018-09-06 16:42 UTC (permalink / raw)
To: 32648
[-- Attachment #1: Type: text/plain, Size: 140 bytes --]
The following patch updates emacs-ess to 17.11. I'm still getting my
feet wet with guix, so apologies if something is wrong.
Thanks,
Alex
[-- Attachment #2: 0001-gnu-emacs-ess-Update-to-17.11.patch --]
[-- Type: text/plain, Size: 4163 bytes --]
From 3e548acbff2159c90c09ef778c74c1de3b6dc319 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 6 Sep 2018 18:35:36 +0200
Subject: [PATCH] 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)
---
gnu/packages/emacs.scm | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a1ce64ffa..5295b71f6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4120,22 +4120,33 @@ programming language.")
(define-public emacs-ess
(package
(name "emacs-ess")
- (version "16.10")
+ (version "17.11")
(source (origin
(method url-fetch)
- (uri (string-append "http://ess.r-project.org/downloads/ess/ess-"
- version ".tgz"))
+ (uri (string-append "https://github.com/emacs-ess/ESS/archive/v"
+ version ".tar.gz"))
(sha256
(base32
- "04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk"))
+ "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c"))
(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"))
+ (("^dist: all julia-mode.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))))
(build-system gnu-build-system)
(arguments
@@ -4154,10 +4165,6 @@ programming language.")
(("SHELL = /bin/sh")
(string-append "SHELL = " (which "sh"))))
#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
(lambda _
(invoke "make" "test")))))))
@@ -4166,16 +4173,14 @@ programming language.")
("r-minimal" ,r-minimal)))
(native-inputs
`(("perl" ,perl)
- ("texinfo" ,texinfo)
- ("texlive" ,(texlive-union (list texlive-latex-natbib
- texlive-latex-seminar
- texlive-latex-hyperref
- texlive-tex-texinfo)))))
+ ("texinfo" ,texinfo)))
+ (propagated-inputs
+ `(("emacs-julia-mode" ,emacs-julia-mode)))
(home-page "https://ess.r-project.org/")
(synopsis "Emacs mode for statistical analysis programs")
(description "Emacs Speaks Statistics (ESS) is an add-on package for GNU
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+)))
(define-public emacs-smex
--
2.18.0
[-- Attachment #3: Type: text/plain, Size: 4229 bytes --]
------------------------------------------------------------
From 3e548acbff2159c90c09ef778c74c1de3b6dc319 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 6 Sep 2018 18:35:36 +0200
Subject: [PATCH] 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)
---
gnu/packages/emacs.scm | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a1ce64ffa..5295b71f6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4120,22 +4120,33 @@ programming language.")
(define-public emacs-ess
(package
(name "emacs-ess")
- (version "16.10")
+ (version "17.11")
(source (origin
(method url-fetch)
- (uri (string-append "http://ess.r-project.org/downloads/ess/ess-"
- version ".tgz"))
+ (uri (string-append "https://github.com/emacs-ess/ESS/archive/v"
+ version ".tar.gz"))
(sha256
(base32
- "04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk"))
+ "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c"))
(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"))
+ (("^dist: all julia-mode.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))))
(build-system gnu-build-system)
(arguments
@@ -4154,10 +4165,6 @@ programming language.")
(("SHELL = /bin/sh")
(string-append "SHELL = " (which "sh"))))
#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
(lambda _
(invoke "make" "test")))))))
@@ -4166,16 +4173,14 @@ programming language.")
("r-minimal" ,r-minimal)))
(native-inputs
`(("perl" ,perl)
- ("texinfo" ,texinfo)
- ("texlive" ,(texlive-union (list texlive-latex-natbib
- texlive-latex-seminar
- texlive-latex-hyperref
- texlive-tex-texinfo)))))
+ ("texinfo" ,texinfo)))
+ (propagated-inputs
+ `(("emacs-julia-mode" ,emacs-julia-mode)))
(home-page "https://ess.r-project.org/")
(synopsis "Emacs mode for statistical analysis programs")
(description "Emacs Speaks Statistics (ESS) is an add-on package for GNU
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+)))
(define-public emacs-smex
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#32648: [PATCH] Update emacs-ess to 17.11
2018-09-06 16:42 [bug#32648] [PATCH] Update emacs-ess to 17.11 alex.branham
@ 2018-09-07 8:58 ` Ludovic Courtès
2018-09-07 15:10 ` [bug#32648] " Alex Branham
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2018-09-07 8:58 UTC (permalink / raw)
To: alex.branham; +Cc: 32648-done
[-- Attachment #1: Type: text/plain, Size: 837 bytes --]
Hello,
alex.branham@gmail.com skribis:
>>From 3e548acbff2159c90c09ef778c74c1de3b6dc319 Mon Sep 17 00:00:00 2001
> From: Alex Branham <alex.branham@gmail.com>
> Date: Thu, 6 Sep 2018 18:35:36 +0200
> Subject: [PATCH] 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)
Applied with the minor change below to satisfy ‘guix lint’ and with a
tweaked commit log.
Usually we’d rather split this in several patches (one that removes
TeXLive, one that does the actual update), but I think it’s OK here.
Thank you!
Ludo’.
[-- Attachment #2: Type: text/x-patch, Size: 826 bytes --]
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 34c407019..1f64a5e84 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -38,6 +38,7 @@
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us>
;;; 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.
;;;
@@ -4131,6 +4132,7 @@ programming language.")
(sha256
(base32
"0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c"))
+ (file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet
'(begin
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#32648] [PATCH] Update emacs-ess to 17.11
2018-09-07 8:58 ` bug#32648: " Ludovic Courtès
@ 2018-09-07 15:10 ` Alex Branham
0 siblings, 0 replies; 3+ messages in thread
From: Alex Branham @ 2018-09-07 15:10 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 32648-done
On Fri 07 Sep 2018 at 03:58, Ludovic Courtès <ludo@gnu.org> wrote:
> Usually we’d rather split this in several patches (one that removes
> TeXLive, one that does the actual update), but I think it’s OK here.
Thanks, I didn't know if that was different enough to merit two commits
or not. I'll keep it in mind for any future patches I submit though.
Thanks again,
Alex
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-07 15:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-06 16:42 [bug#32648] [PATCH] Update emacs-ess to 17.11 alex.branham
2018-09-07 8:58 ` bug#32648: " Ludovic Courtès
2018-09-07 15:10 ` [bug#32648] " Alex Branham
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).