GNU bug report logs - #43208
[PATCH] gnu: emacs-ess: Update to 20.09.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Tim Howes <timhowes@HIDDEN>; Keywords: patch; dated Fri, 4 Sep 2020 23:51:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.
Changed bug title to '[PATCH] gnu: emacs-ess: Update to 20.09.' from '[PATCH] gnu: emacs-ess: Update to 20200903.1516.' Request was from Tim Howes <timhowes@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 43208 <at> debbugs.gnu.org:


Received: (at 43208) by debbugs.gnu.org; 6 Sep 2020 00:57:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 20:57:40 2020
Received: from localhost ([127.0.0.1]:44387 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEj00-0001QD-8k
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 20:57:40 -0400
Received: from lavabit.com ([76.8.29.66]:49442)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <timhowes@HIDDEN>) id 1kEizy-0001Pw-K7
 for 43208 <at> debbugs.gnu.org; Sat, 05 Sep 2020 20:57:39 -0400
Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100])
 by lavabit.com with ESMTP id XOJOK29QAKDW
 for <43208 <at> debbugs.gnu.org>; Sat, 05 Sep 2020 19:57:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga;
 t=1599353850; bh=hCuh8X0m4zWg9cBmf4R6OJife7ckGuuW7NSKqjZup3M=;
 h=Subject:To:References:From:Message-ID:Date:User-Agent:
 MIME-Version:In-Reply-To:Content-Type:Content-Language:
 Content-Transfer-Encoding;
 b=iTB4Oo1Lna5CTW6nSZUBtp/vuVCtNDy6zrjG0J+jn5nje7sUwnB5/yg4LiowdgrrN
 S4KHmJxh84648iEFRAJmCExjHmFSuJTv52ZmD2M3+Y29o/Axi9R4B1zSqbqkY/XYgp
 U5D5egTyL9JdKoGzzemrhPqBmAOqCnOddVcGPxTWywEDlRZeh+QDKjAFrShLzrtEXc
 e7GbDFG4PAsWMJHnzLyiX+1/zCQ+fS9psCopW6E/sxAhOyNzSCnNVcmnEgLj9edCk2
 aeUQUq+Z5c9uVxh+ErGSk+lcfG+SbMALHOKObka46fQRA/lxV7qwxrA4Ux/hg2+WWf
 9mWh39RWC3tbg==
Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09.
To: 43208 <at> debbugs.gnu.org
References: <20200904235023.11193-1-timhowes@HIDDEN>
 <877dt8tkhj.fsf@HIDDEN>
From: Tim Howes <timhowes@HIDDEN>
Message-ID: <d9d83e86-4636-583d-6c0a-5b495681c8b4@HIDDEN>
Date: Sat, 5 Sep 2020 17:57:29 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <877dt8tkhj.fsf@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.1 (/)
X-Debbugs-Envelope-To: 43208
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.1 (-)

retitle 43208 [PATCH] gnu: emacs-ess: Update to 20.09.
thanks





Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at 43208 <at> debbugs.gnu.org:


Received: (at 43208) by debbugs.gnu.org; 5 Sep 2020 21:45:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 17:45:56 2020
Received: from localhost ([127.0.0.1]:44292 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEg0R-0007L6-Lt
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 17:45:55 -0400
Received: from lavabit.com ([76.8.29.66]:34090)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <timhowes@HIDDEN>) id 1kEg0Q-0007Kt-7E
 for 43208 <at> debbugs.gnu.org; Sat, 05 Sep 2020 17:45:54 -0400
Received: from localhost.localdomain (158-51-80-100.pool.common.net
 [158.51.80.100]) by lavabit.com with ESMTP id R4ZLOJ3UNJVX
 for <43208 <at> debbugs.gnu.org>; Sat, 05 Sep 2020 16:45:48 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga;
 t=1599342348; bh=GDxldGqPpW2qBvGPGz8t+rN9UKuP3Umg1wZ8GBavcUs=;
 h=From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:
 MIME-Version:Content-Transfer-Encoding;
 b=J0tCql19ka1UUT7USXwv2J0m8AtRj2Wj2xTpATHcSMf1fbZeB30itbSi73cPBfRKH
 YS08k189Fx49LggHDf2oVsSelBufBjfTmlLnwi/PhiZw04731gyWY9oXiPDxU+ts0E
 HxQ3oXPh6KYZC8aVzmBBTq4H1dKf5sHDlwEiKLNx/vObuPPISptzeB8hfqzh4+eUOu
 KLR5+gDN4eeUQgS5J9jQ3AZ5WixlfHY1sZxx6XO7pOIw2dnZQab0AY+/7GzO1RG1sY
 KwlE1CtA31SplbzRmu5TjYICNSNFsvFINp9Gft7wo/8+0WG82D3JIlWBL6GhR8x+qR
 /nRA1deN+G8Lw==
From: Tim Howes <timhowes@HIDDEN>
To: 43208 <at> debbugs.gnu.org
Subject: [PATCH] gnu: emacs-ess: Update to 20.09.
Date: Sat,  5 Sep 2020 14:45:24 -0700
Message-Id: <20200905214524.17263-1-timhowes@HIDDEN>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <877dt8tkhj.fsf@HIDDEN>
References: <877dt8tkhj.fsf@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 43208
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/statistics.scm (emacs-ess): Update to 20.09.
[version]: Use version-revision-commit for version numbering.
[source]: Fix snippet for removing julia-mode.  Remove snippet to modify
roxy-preview-Rd-test.  Add snippet to modify r-help-mode test.  Add
snippet to fix install target to install files to correct directories.
[arguments]: Add flag to specify INFODIR.  Remove patch modifying SHELL.
---
This fixes the version numbering to consider this revision 0 of version
20.09, similar to how it's done for other emacs packages in guix.

 gnu/packages/statistics.scm | 47 +++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index c1cefa8c41..c705c71460 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5803,31 +5803,28 @@ Java package that provides routines for various statistical distributions.")
     (license license:gpl2+)))
 
 (define-public emacs-ess
+  (let ((commit "82cd308ae54a6b918bbceb235e6bf02f53e48e19")
+        (version "20.09")
+        (revision "0"))
   (package
     (name "emacs-ess")
-    (version "18.10.2")
+    (version (git-version version revision commit))
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/emacs-ess/ESS")
-                    (commit (string-append "v" version))))
+                    (commit commit)))
               (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:"))
-                  ;; Include *.el files in install target.
-                  (substitute* "lisp/Makefile"
-                    (("\t\\$\\(INSTALL) \\$\\(ELC\\) \\$\\(LISPDIR\\)" elc)
-                     (string-append "\t$(INSTALL) $(ELS) ess-autoloads.el "
-                                    "$(LISPDIR)\n" elc)))
+                    ((" \\$\\(JULIAS)") "")
+                    (("\ttest.*julia-mode.*\\.el") ""))
                   ;; Only build docs in info format.
                   (substitute* "doc/Makefile"
                     (("all  : info text")
@@ -5836,12 +5833,16 @@ Java package that provides routines for various statistical distributions.")
                      "install: install-info"))
                   ;; 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)"))
+                    ((".*/dir.*") ""))
+                  ;; Fix r-help-mode test.
+                  (substitute* "test/ess-test-r.el"
+                    (("\\(equal ess-help-object \"plot.default\")") "t"))
+                  ;; Install to correct directories.
+                  (substitute* "Makefile"
+                    (("mkdir -p \\$\\(ESSDESTDIR)")
+                     "$(MAKE) -C lisp install; $(MAKE) -C doc install")
+                    (("\\$\\(INSTALL) -R \\./\\* \\$\\(ESSDESTDIR)/")
+                     "$(MAKE) -C etc install"))
                   #t))))
     (build-system gnu-build-system)
     (arguments
@@ -5850,16 +5851,12 @@ Java package that provides routines for various statistical distributions.")
                             (string-append "ETCDIR=" %output
                                            ,base-directory "/etc")
                             (string-append "LISPDIR=" %output
-                                           ,base-directory))
+                                           ,base-directory)
+                            (string-append "INFODIR=" %output
+                                           "/share/info"))
          #:phases
          (modify-phases %standard-phases
            (delete 'configure)
-           (add-before 'build 'more-shebang-patching
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "Makeconf"
-                 (("SHELL = /bin/sh")
-                  (string-append "SHELL = " (which "sh"))))
-               #t))
            (replace 'check
              (lambda _
                (invoke "make" "test")))))))
@@ -5877,4 +5874,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:gpl2+))))
-- 
2.28.0






Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at 43208 <at> debbugs.gnu.org:


Received: (at 43208) by debbugs.gnu.org; 5 Sep 2020 17:58:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 13:58:34 2020
Received: from localhost ([127.0.0.1]:44032 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEcSP-00085P-N6
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 13:58:33 -0400
Received: from lavabit.com ([76.8.29.66]:45407)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <timhowes@HIDDEN>) id 1kEcSO-000854-21
 for 43208 <at> debbugs.gnu.org; Sat, 05 Sep 2020 13:58:32 -0400
Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100])
 by lavabit.com with ESMTP id 13PYYA0V0SUL;
 Sat, 05 Sep 2020 12:58:26 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga;
 t=1599328706; bh=hqrY39hfm2G62EWMwf0oKP7OMr/15df6WFBnqCLr5w8=;
 h=Subject:To:Cc:References:From:Message-ID:Date:User-Agent:
 MIME-Version:In-Reply-To:Content-Type:Content-Language:
 Content-Transfer-Encoding;
 b=eVK5s7pqUuo29UvATUapzIKPljYRabfFEDtTSIbAN9/DpjvqyB1+tqTGaD7gLYB9T
 gYJRkvDGeJIlqxUYAPZztVsOplHkP709O+EFbvKycEhpSEb20OCNp4BUX2MQGfnHd6
 KIags3yUCONi77QhRtg6uynuMA9yDnADUqZXg0ivXW9Xly+Qlut4ZqF6qWHkiVSz52
 7nS/3eaDFB+jBBHZhKktyHGP12YQuWWYMKOJMveLEY+ab4GeeUp2DBAPdKxi714YAT
 EHvRD6Ip6sLHuF0XFZ0DnmIUgxvHEZIMKKjfB/fRSCipAlwvanGDo1JhNN/Uq01dzs
 UZ5xnqWe4wjSQ==
Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20200903.1516.
To: Nicolas Goaziou <mail@HIDDEN>,
 Tim Howes via Guix-patches via <guix-patches@HIDDEN>
References: <20200904235023.11193-1-timhowes@HIDDEN>
 <877dt8tkhj.fsf@HIDDEN>
From: Tim Howes <timhowes@HIDDEN>
Message-ID: <6c878feb-8a41-b22f-366d-01678dbe5676@HIDDEN>
Date: Sat, 5 Sep 2020 10:58:25 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <877dt8tkhj.fsf@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.1 (/)
X-Debbugs-Envelope-To: 43208
Cc: 43208 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.1 (-)

> I don't think this numbering is great because it makes it difficult to
> switch to the official one once it is increased. Usually, we add
> a revision number to the version, see, e.g., emacs-ansi.

That makes sense. It looks like there's actually a planned 20.09 
release, so maybe I'll call this revision 0 of 20.09.

https://github.com/emacs-ess/ESS/milestone/3





Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 5 Sep 2020 17:58:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 13:58:33 2020
Received: from localhost ([127.0.0.1]:44030 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEcSP-00085N-DJ
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 13:58:33 -0400
Received: from lists.gnu.org ([209.51.188.17]:49788)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <timhowes@HIDDEN>) id 1kEcSN-00085B-TO
 for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 13:58:32 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35720)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <timhowes@HIDDEN>)
 id 1kEcSN-0006Z8-Kj
 for guix-patches@HIDDEN; Sat, 05 Sep 2020 13:58:31 -0400
Received: from lavabit.com ([76.8.29.66]:54407)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <timhowes@HIDDEN>)
 id 1kEcSK-00034s-AP
 for guix-patches@HIDDEN; Sat, 05 Sep 2020 13:58:31 -0400
Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100])
 by lavabit.com with ESMTP id 13PYYA0V0SUL;
 Sat, 05 Sep 2020 12:58:26 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga;
 t=1599328706; bh=hqrY39hfm2G62EWMwf0oKP7OMr/15df6WFBnqCLr5w8=;
 h=Subject:To:Cc:References:From:Message-ID:Date:User-Agent:
 MIME-Version:In-Reply-To:Content-Type:Content-Language:
 Content-Transfer-Encoding;
 b=eVK5s7pqUuo29UvATUapzIKPljYRabfFEDtTSIbAN9/DpjvqyB1+tqTGaD7gLYB9T
 gYJRkvDGeJIlqxUYAPZztVsOplHkP709O+EFbvKycEhpSEb20OCNp4BUX2MQGfnHd6
 KIags3yUCONi77QhRtg6uynuMA9yDnADUqZXg0ivXW9Xly+Qlut4ZqF6qWHkiVSz52
 7nS/3eaDFB+jBBHZhKktyHGP12YQuWWYMKOJMveLEY+ab4GeeUp2DBAPdKxi714YAT
 EHvRD6Ip6sLHuF0XFZ0DnmIUgxvHEZIMKKjfB/fRSCipAlwvanGDo1JhNN/Uq01dzs
 UZ5xnqWe4wjSQ==
Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20200903.1516.
To: Nicolas Goaziou <mail@HIDDEN>,
 Tim Howes via Guix-patches via <guix-patches@HIDDEN>
References: <20200904235023.11193-1-timhowes@HIDDEN>
 <877dt8tkhj.fsf@HIDDEN>
From: Tim Howes <timhowes@HIDDEN>
Message-ID: <6c878feb-8a41-b22f-366d-01678dbe5676@HIDDEN>
Date: Sat, 5 Sep 2020 10:58:25 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <877dt8tkhj.fsf@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=76.8.29.66; envelope-from=timhowes@HIDDEN;
 helo=lavabit.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/05 13:58:26
X-ACL-Warn: Detected OS   = Linux 3.x [generic] [fuzzy]
X-Spam_score_int: -21
X-Spam_score: -2.2
X-Spam_bar: --
X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.107,
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.5 (-)
X-Debbugs-Envelope-To: submit
Cc: 43208 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.5 (--)

> I don't think this numbering is great because it makes it difficult to
> switch to the official one once it is increased. Usually, we add
> a revision number to the version, see, e.g., emacs-ansi.

That makes sense. It looks like there's actually a planned 20.09 
release, so maybe I'll call this revision 0 of 20.09.

https://github.com/emacs-ess/ESS/milestone/3





Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at 43208 <at> debbugs.gnu.org:


Received: (at 43208) by debbugs.gnu.org; 5 Sep 2020 13:35:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 09:35:17 2020
Received: from localhost ([127.0.0.1]:41980 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEYLc-0007HY-R2
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 09:35:17 -0400
Received: from relay11.mail.gandi.net ([217.70.178.231]:53881)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>) id 1kEYLa-0007HC-OU
 for 43208 <at> debbugs.gnu.org; Sat, 05 Sep 2020 09:35:15 -0400
Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67])
 (Authenticated sender: admin@HIDDEN)
 by relay11.mail.gandi.net (Postfix) with ESMTPSA id 171E5100002;
 Sat,  5 Sep 2020 13:35:04 +0000 (UTC)
From: Nicolas Goaziou <mail@HIDDEN>
To: Tim Howes via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20200903.1516.
References: <20200904235023.11193-1-timhowes@HIDDEN>
Date: Sat, 05 Sep 2020 15:35:04 +0200
In-Reply-To: <20200904235023.11193-1-timhowes@HIDDEN> (Tim Howes via
 Guix-patches via's message of "Fri, 4 Sep 2020 16:50:23 -0700")
Message-ID: <877dt8tkhj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 43208
Cc: 43208 <at> debbugs.gnu.org, Tim Howes <timhowes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hello,

Tim Howes via Guix-patches via <guix-patches@HIDDEN> writes:

> * gnu/packages/statistics.scm (emacs-ess): Update to 20200903.1516.
> [version]: Use latest commit, assign version based on commit date.
> [source]: Fix snippet for removing julia-mode.  Remove snippet to modify
> roxy-preview-Rd-test.  Add snippet to modify r-help-mode test.  Add
> snippet to fix install target to install files to correct directories.
> [arguments]: Add flag to specify INFODIR.  Remove patch modifying
> SHELL.

Thank you.

> This updates emacs-ess to the current version on github and resolves
> bugs #43093 and #42259.
>
>  gnu/packages/statistics.scm | 43 ++++++++++++++++---------------------
>  1 file changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
> index c1cefa8c41..aa14e2887f 100644
> --- a/gnu/packages/statistics.scm
> +++ b/gnu/packages/statistics.scm
> @@ -5805,29 +5805,24 @@ Java package that provides routines for various statistical distributions.")
>  (define-public emacs-ess
>    (package
>      (name "emacs-ess")
> -    (version "18.10.2")
> +    ;; Use version number based on commit date and time (UTC), similar to melpa.
> +    (version "20200903.1516")

I don't think this numbering is great because it makes it difficult to
switch to the official one once it is increased. Usually, we add
a revision number to the version, see, e.g., emacs-ansi.

Otherwise, LGTM.

Regards,
-- 
Nicolas Goaziou




Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 5 Sep 2020 13:35:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 05 09:35:16 2020
Received: from localhost ([127.0.0.1]:41978 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kEYLc-0007HV-Hi
	for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 09:35:16 -0400
Received: from lists.gnu.org ([209.51.188.17]:36706)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>) id 1kEYLa-0007HJ-Sf
 for submit <at> debbugs.gnu.org; Sat, 05 Sep 2020 09:35:15 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53700)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <mail@HIDDEN>)
 id 1kEYLa-0002Qe-Lx
 for guix-patches@HIDDEN; Sat, 05 Sep 2020 09:35:14 -0400
Received: from relay11.mail.gandi.net ([217.70.178.231]:44693)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <mail@HIDDEN>)
 id 1kEYLY-0006qT-FJ
 for guix-patches@HIDDEN; Sat, 05 Sep 2020 09:35:14 -0400
Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67])
 (Authenticated sender: admin@HIDDEN)
 by relay11.mail.gandi.net (Postfix) with ESMTPSA id 171E5100002;
 Sat,  5 Sep 2020 13:35:04 +0000 (UTC)
From: Nicolas Goaziou <mail@HIDDEN>
To: Tim Howes via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20200903.1516.
References: <20200904235023.11193-1-timhowes@HIDDEN>
Date: Sat, 05 Sep 2020 15:35:04 +0200
In-Reply-To: <20200904235023.11193-1-timhowes@HIDDEN> (Tim Howes via
 Guix-patches via's message of "Fri, 4 Sep 2020 16:50:23 -0700")
Message-ID: <877dt8tkhj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=217.70.178.231;
 envelope-from=mail@HIDDEN; helo=relay11.mail.gandi.net
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/05 09:35:09
X-ACL-Warn: Detected OS   = Linux 3.11 and newer [fuzzy]
X-Spam_score_int: -25
X-Spam_score: -2.6
X-Spam_bar: --
X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.6 (-)
X-Debbugs-Envelope-To: submit
Cc: 43208 <at> debbugs.gnu.org, Tim Howes <timhowes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)

Hello,

Tim Howes via Guix-patches via <guix-patches@HIDDEN> writes:

> * gnu/packages/statistics.scm (emacs-ess): Update to 20200903.1516.
> [version]: Use latest commit, assign version based on commit date.
> [source]: Fix snippet for removing julia-mode.  Remove snippet to modify
> roxy-preview-Rd-test.  Add snippet to modify r-help-mode test.  Add
> snippet to fix install target to install files to correct directories.
> [arguments]: Add flag to specify INFODIR.  Remove patch modifying
> SHELL.

Thank you.

> This updates emacs-ess to the current version on github and resolves
> bugs #43093 and #42259.
>
>  gnu/packages/statistics.scm | 43 ++++++++++++++++---------------------
>  1 file changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
> index c1cefa8c41..aa14e2887f 100644
> --- a/gnu/packages/statistics.scm
> +++ b/gnu/packages/statistics.scm
> @@ -5805,29 +5805,24 @@ Java package that provides routines for various statistical distributions.")
>  (define-public emacs-ess
>    (package
>      (name "emacs-ess")
> -    (version "18.10.2")
> +    ;; Use version number based on commit date and time (UTC), similar to melpa.
> +    (version "20200903.1516")

I don't think this numbering is great because it makes it difficult to
switch to the official one once it is increased. Usually, we add
a revision number to the version, see, e.g., emacs-ansi.

Otherwise, LGTM.

Regards,
-- 
Nicolas Goaziou




Information forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 4 Sep 2020 23:50:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 04 19:50:38 2020
Received: from localhost ([127.0.0.1]:41030 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kELTa-0004oT-Ca
	for submit <at> debbugs.gnu.org; Fri, 04 Sep 2020 19:50:38 -0400
Received: from lists.gnu.org ([209.51.188.17]:46028)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <timhowes@HIDDEN>) id 1kELTY-0004oM-IP
 for submit <at> debbugs.gnu.org; Fri, 04 Sep 2020 19:50:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:34152)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <timhowes@HIDDEN>)
 id 1kELTY-0002kU-9o
 for guix-patches@HIDDEN; Fri, 04 Sep 2020 19:50:36 -0400
Received: from lavabit.com ([76.8.29.66]:40682)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <timhowes@HIDDEN>)
 id 1kELTW-0008BW-5i
 for guix-patches@HIDDEN; Fri, 04 Sep 2020 19:50:36 -0400
Received: from localhost.localdomain (158-51-80-100.pool.common.net
 [158.51.80.100]) by lavabit.com with ESMTP id I7A7U9GV56P2
 for <guix-patches@HIDDEN>; Fri, 04 Sep 2020 18:50:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga;
 t=1599263431; bh=yhw3zGUO1DV6FVV6wwIw+liMrG2yuF0qqiD+YtX4DvQ=;
 h=From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version:
 Content-Transfer-Encoding;
 b=WYHDBznJG/npUXU5FmP88QfrvERFvtOKNefH+G/Z43V9P8RbaSEGmw5nGOhN7gZeF
 5sCoFJScAhxs6MQbpdwL8UOMdoVCTcIm54c+n7XEHttMGBpwcel/Trp8XQUDAR+zS1
 ojX1/4ypp04HregExWk+bxGIog0J7NxOYTcIg11eVdDFHYAejOImMoyQjlMhDM4U8Q
 dYiPwTkV6AOuHeMAmPlW1ao8hWreDNc5ybYK2RjGMqDHVq+hKvKU7xJubtX7U1XrB6
 g4hftZXz65FneYPhxmun0XtGS9uZm0Ur4lzUV5zD49B3LcU8VUH+6bjsPdmqPop/8/
 UXsI6ss5O0E5w==
From: Tim Howes <timhowes@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: emacs-ess: Update to 20200903.1516.
Date: Fri,  4 Sep 2020 16:50:23 -0700
Message-Id: <20200904235023.11193-1-timhowes@HIDDEN>
X-Mailer: git-send-email 2.28.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=76.8.29.66; envelope-from=timhowes@HIDDEN;
 helo=lavabit.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 19:50:32
X-ACL-Warn: Detected OS   = Linux 3.x [generic] [fuzzy]
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

* gnu/packages/statistics.scm (emacs-ess): Update to 20200903.1516.
[version]: Use latest commit, assign version based on commit date.
[source]: Fix snippet for removing julia-mode.  Remove snippet to modify
roxy-preview-Rd-test.  Add snippet to modify r-help-mode test.  Add
snippet to fix install target to install files to correct directories.
[arguments]: Add flag to specify INFODIR.  Remove patch modifying SHELL.
---
This updates emacs-ess to the current version on github and resolves
bugs #43093 and #42259.

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

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index c1cefa8c41..aa14e2887f 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5805,29 +5805,24 @@ Java package that provides routines for various statistical distributions.")
 (define-public emacs-ess
   (package
     (name "emacs-ess")
-    (version "18.10.2")
+    ;; Use version number based on commit date and time (UTC), similar to melpa.
+    (version "20200903.1516")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/emacs-ess/ESS")
-                    (commit (string-append "v" version))))
+                    (commit "09c1adecf8406d85426d14e5efe2aaba6c59f224")))
               (sha256
                (base32
-                "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3"))
+                "0hl8nhf8w3rfpfqb2bfzcbh4lpsk51p83w2j5fc2knd4da4sb1s5"))
               (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:"))
-                  ;; Include *.el files in install target.
-                  (substitute* "lisp/Makefile"
-                    (("\t\\$\\(INSTALL) \\$\\(ELC\\) \\$\\(LISPDIR\\)" elc)
-                     (string-append "\t$(INSTALL) $(ELS) ess-autoloads.el "
-                                    "$(LISPDIR)\n" elc)))
+                    ((" \\$\\(JULIAS)") "")
+                    (("\ttest.*julia-mode.*\\.el") ""))
                   ;; Only build docs in info format.
                   (substitute* "doc/Makefile"
                     (("all  : info text")
@@ -5836,12 +5831,16 @@ Java package that provides routines for various statistical distributions.")
                      "install: install-info"))
                   ;; 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)"))
+                    ((".*/dir.*") ""))
+                  ;; Fix r-help-mode test.
+                  (substitute* "test/ess-test-r.el"
+                    (("\\(equal ess-help-object \"plot.default\")") "t"))
+                  ;; Install to correct directories.
+                  (substitute* "Makefile"
+                    (("mkdir -p \\$\\(ESSDESTDIR)")
+                     "$(MAKE) -C lisp install; $(MAKE) -C doc install")
+                    (("\\$\\(INSTALL) -R \\./\\* \\$\\(ESSDESTDIR)/")
+                     "$(MAKE) -C etc install"))
                   #t))))
     (build-system gnu-build-system)
     (arguments
@@ -5850,16 +5849,12 @@ Java package that provides routines for various statistical distributions.")
                             (string-append "ETCDIR=" %output
                                            ,base-directory "/etc")
                             (string-append "LISPDIR=" %output
-                                           ,base-directory))
+                                           ,base-directory)
+                            (string-append "INFODIR=" %output
+                                           "/share/info"))
          #:phases
          (modify-phases %standard-phases
            (delete 'configure)
-           (add-before 'build 'more-shebang-patching
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "Makeconf"
-                 (("SHELL = /bin/sh")
-                  (string-append "SHELL = " (which "sh"))))
-               #t))
            (replace 'check
              (lambda _
                (invoke "make" "test")))))))
-- 
2.28.0






Acknowledgement sent to Tim Howes <timhowes@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#43208; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 6 Sep 2020 01:15:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.