From 06cb64632af8982054eb85ab4bbe5c43e86ab653 Mon Sep 17 00:00:00 2001
From: divoplade <d@divoplade.fr>
Date: Mon, 7 Sep 2020 23:33:32 +0200
Subject: [PATCH] Update emacs-ess to a more recent snapshot

Hello guix!

There are a few things to note in that new version:
1. The license has changed, it is now GPLv3+;
2. The previous fix for roxygen is not needed anymore, as far as I can tell;
3. The makefiles seem to have changed, so removing julia is done a little
   differently;
4. The failing test =ess-test-r-help-mode= looks suspiciously like the next
   test (this one passes), =ess-test-r-index-mode=, which has the following line:

  (skip-unless (not noninteractive))

So I figured out that the previous one needed it too, it just got forgotten.

Best regards,

divoplade
---
 gnu/packages/statistics.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 70a85e8b60..6585ce54b0 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5805,24 +5805,29 @@ Java package that provides routines for various statistical distributions.")
 (define-public emacs-ess
   (package
     (name "emacs-ess")
-    (version "18.10.2")
+    (version "20200905.1022")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/emacs-ess/ESS")
-                    (commit (string-append "v" version))))
+                    (commit "82cd308ae54a6b918bbceb235e6bf02f53e48e19")))
               (sha256
                (base32
-                "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3"))
+                "0zw6j8jzrdmy41g6313js7c0xlmc2wmiazx4d4wm6hdvykn8q39k"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   ;; Stop ESS from trying to bundle an external julia-mode.el.
                   (substitute* "lisp/Makefile"
-                    (("^ess-julia.elc: julia-mode.elc") "")
-                    (("^all: julia-mode.el")
-                     "all:"))
+                    (("JULIAS := julia-mode.el julia-mode-latexsubs.el") "JULIAS ="))
+                  (substitute* "Makefile"
+                    (("$(MAKE) julia-mode.el") ""))
+                  (substitute* "test/Makefile"
+			       (("lisp: julia") "lisp:"))
+		  ;; It looks like this test misses a paste
+                  (substitute* "test/ess-test-r.el"
+			       (("\\(ert-deftest ess-test-r-help-mode \\(\\)") "(ert-deftest ess-test-r-help-mode () (skip-unless (not noninteractive))"))
                   ;; Include *.el files in install target.
                   (substitute* "lisp/Makefile"
                     (("\t\\$\\(INSTALL) \\$\\(ELC\\) \\$\\(LISPDIR\\)" elc)
@@ -5837,11 +5842,6 @@ Java package that provides routines for various statistical distributions.")
                   ;; 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"
-                               (("Add together two numbers.\n")
-                                "Add together two numbers. ")
-                               (("##' add\\(10, 1\\)") "add(10, 1)"))
                   #t))))
     (build-system gnu-build-system)
     (arguments
@@ -5877,4 +5877,4 @@ Java package that provides routines for various statistical distributions.")
     (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, Julia, and JAGS.")
-    (license license:gpl2+)))
+    (license license:gpl3+)))
-- 
2.28.0