From unknown Tue Jun 17 20:15:36 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#43208 <43208@debbugs.gnu.org> To: bug#43208 <43208@debbugs.gnu.org> Subject: Status: [PATCH] gnu: emacs-ess: Update to 18.10.2-0.24da603. Reply-To: bug#43208 <43208@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:15:36 +0000 retitle 43208 [PATCH] gnu: emacs-ess: Update to 18.10.2-0.24da603. reassign 43208 guix-patches submitter 43208 Tim Howes severity 43208 normal tag 43208 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 04 19:50:38 2020 Received: (at submit) by debbugs.gnu.org; 4 Sep 2020 23:50:38 +0000 Received: from localhost ([127.0.0.1]:41030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kELTa-0004oT-Ca for submit@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 ) id 1kELTY-0004oM-IP for submit@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 ) id 1kELTY-0002kU-9o for guix-patches@gnu.org; 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 ) id 1kELTW-0008BW-5i for guix-patches@gnu.org; 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 ; 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-ess: Update to 20200903.1516. Date: Fri, 4 Sep 2020 16:50:23 -0700 Message-Id: <20200904235023.11193-1-timhowes@lavabit.com> 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@lavabit.com; 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@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 05 09:35:16 2020 Received: (at submit) by debbugs.gnu.org; 5 Sep 2020 13:35:16 +0000 Received: from localhost ([127.0.0.1]:41978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEYLc-0007HV-Hi for submit@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 ) id 1kEYLa-0007HJ-Sf for submit@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 ) id 1kEYLa-0002Qe-Lx for guix-patches@gnu.org; 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 ) id 1kEYLY-0006qT-FJ for guix-patches@gnu.org; Sat, 05 Sep 2020 09:35:14 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 171E5100002; Sat, 5 Sep 2020 13:35:04 +0000 (UTC) From: Nicolas Goaziou To: Tim Howes via Guix-patches via Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20200903.1516. References: <20200904235023.11193-1-timhowes@lavabit.com> Date: Sat, 05 Sep 2020 15:35:04 +0200 In-Reply-To: <20200904235023.11193-1-timhowes@lavabit.com> (Tim Howes via Guix-patches via's message of "Fri, 4 Sep 2020 16:50:23 -0700") Message-ID: <877dt8tkhj.fsf@nicolasgoaziou.fr> 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@nicolasgoaziou.fr; 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@debbugs.gnu.org, Tim Howes X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, Tim Howes via Guix-patches via 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 05 13:58:33 2020 Received: (at submit) by debbugs.gnu.org; 5 Sep 2020 17:58:33 +0000 Received: from localhost ([127.0.0.1]:44030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEcSP-00085N-DJ for submit@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 ) id 1kEcSN-00085B-TO for submit@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 ) id 1kEcSN-0006Z8-Kj for guix-patches@gnu.org; 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 ) id 1kEcSK-00034s-AP for guix-patches@gnu.org; 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 , Tim Howes via Guix-patches via References: <20200904235023.11193-1-timhowes@lavabit.com> <877dt8tkhj.fsf@nicolasgoaziou.fr> From: Tim Howes Message-ID: <6c878feb-8a41-b22f-366d-01678dbe5676@lavabit.com> 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@nicolasgoaziou.fr> 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@lavabit.com; 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@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 05 17:45:56 2020 Received: (at 43208) by debbugs.gnu.org; 5 Sep 2020 21:45:56 +0000 Received: from localhost ([127.0.0.1]:44292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEg0R-0007L6-Lt for submit@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 ) id 1kEg0Q-0007Kt-7E for 43208@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@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 To: 43208@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@lavabit.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <877dt8tkhj.fsf@nicolasgoaziou.fr> References: <877dt8tkhj.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 43208 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 05 20:57:40 2020 Received: (at 43208) by debbugs.gnu.org; 6 Sep 2020 00:57:40 +0000 Received: from localhost ([127.0.0.1]:44387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEj00-0001QD-8k for submit@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 ) id 1kEizy-0001Pw-K7 for 43208@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@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@debbugs.gnu.org References: <20200904235023.11193-1-timhowes@lavabit.com> <877dt8tkhj.fsf@nicolasgoaziou.fr> From: Tim Howes Message-ID: 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@nicolasgoaziou.fr> 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@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) retitle 43208 [PATCH] gnu: emacs-ess: Update to 20.09. thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 05 21:00:15 2020 Received: (at control) by debbugs.gnu.org; 6 Sep 2020 01:00:15 +0000 Received: from localhost ([127.0.0.1]:44396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEj2V-0001Vl-14 for submit@debbugs.gnu.org; Sat, 05 Sep 2020 21:00:15 -0400 Received: from lavabit.com ([76.8.29.66]:53258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEj2S-0001VV-Ez for control@debbugs.gnu.org; Sat, 05 Sep 2020 21:00:12 -0400 Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id 4GFPB525VNS7 for ; Sat, 05 Sep 2020 20:00:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1599354007; 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=m2mTsbzLAJis6LV3ItgfwLZ+1KpFvdk8pLNOWMdrXcod5X0dtgfe1KyyZhquWRMT2 jfzTLUSW2fE70b5vQVyWfTsJn13kz7lqxjvgpdUPUuH57YjMizqhko8ZDElli+HFUk +zu6okdDEnNwqzZNRIqf7/Q5oq47QEMqLUwS9noRPG8i7wYjPmtKgXdmYcCgUVG6wM QHzZ0BL21wJ21hyG0t3qBmraYn+iCzFYPHqqh+7ztp+xqjX2+Az92QfspdGLghApwn w+VDpfoSzM4zQP0efSWg7wZFulOiZ8KZsAbGyl+IrLejCKOHOBXrNfKFfLN+oADvAI zusTL0yGZ/9xA== Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. To: control@debbugs.gnu.org References: <20200904235023.11193-1-timhowes@lavabit.com> <877dt8tkhj.fsf@nicolasgoaziou.fr> From: Tim Howes Message-ID: <0f9e8a6f-716a-721d-967b-4ee8a8205bdd@lavabit.com> Date: Sat, 5 Sep 2020 18:00:06 -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@nicolasgoaziou.fr> 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: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) retitle 43208 [PATCH] gnu: emacs-ess: Update to 20.09. thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 06 04:02:54 2020 Received: (at submit) by debbugs.gnu.org; 6 Sep 2020 08:02:54 +0000 Received: from localhost ([127.0.0.1]:44707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEpdW-0001nI-Bl for submit@debbugs.gnu.org; Sun, 06 Sep 2020 04:02:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:43950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEpdT-0001n5-BU for submit@debbugs.gnu.org; Sun, 06 Sep 2020 04:02:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEpdT-0001tA-55 for guix-patches@gnu.org; Sun, 06 Sep 2020 04:02:51 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:47267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEpdQ-00048C-Nq for guix-patches@gnu.org; Sun, 06 Sep 2020 04:02:50 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 566E6200007; Sun, 6 Sep 2020 08:02:40 +0000 (UTC) From: Nicolas Goaziou To: Tim Howes via Guix-patches via Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. References: <877dt8tkhj.fsf@nicolasgoaziou.fr> <20200905214524.17263-1-timhowes@lavabit.com> Date: Sun, 06 Sep 2020 10:02:39 +0200 In-Reply-To: <20200905214524.17263-1-timhowes@lavabit.com> (Tim Howes via Guix-patches via's message of "Sat, 5 Sep 2020 14:45:24 -0700") Message-ID: <87pn6zs57k.fsf@nicolasgoaziou.fr> 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.232; envelope-from=mail@nicolasgoaziou.fr; helo=relay12.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/06 04:02:44 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@debbugs.gnu.org, Tim Howes X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, Tim Howes via Guix-patches via writes: > * 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. Thank you. However, the base version should be 18.10.2, not 20.09, which is not released yet. BTW, when trying to build the package, I get the following failure: INFO Scraping files for ess-autoloads.el... .../lisp/ess-autoloads.el locked by nixbld@localh... (pid 103): (s, q, p, ?)? Cannot resolve lock conflict in batch mode make[1]: *** [Makefile:62: ess-autoloads.el] Error 255 Can you build the package successfully? Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 08 15:22:18 2020 Received: (at 43208) by debbugs.gnu.org; 8 Sep 2020 19:22:18 +0000 Received: from localhost ([127.0.0.1]:56485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFjC6-0005Jc-65 for submit@debbugs.gnu.org; Tue, 08 Sep 2020 15:22:18 -0400 Received: from 66-38.147.122.lavabit.com ([38.147.122.66]:35768 helo=lavabit.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFjC4-0005JL-Fo for 43208@debbugs.gnu.org; Tue, 08 Sep 2020 15:22:16 -0400 Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id TL84DJE22NP4; Tue, 08 Sep 2020 14:22:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1599592930; bh=yeC1qblXyYKLQMXJ2C7lvgIyUA4YKt0r0KUUYSGyNb0=; h=Subject:To:Cc:References:From:Message-ID:Date:User-Agent: MIME-Version:In-Reply-To:Content-Type:Content-Language: Content-Transfer-Encoding; b=XzCGt1j4XU4BGV9wi8Zwmd/HD+5uhXTF4mWG6MiwKo+vN6v5yNxXHl8brfax8+f8c O2prcMRTDIyh8wa1ElqhcKARq1OsbE8JudPClCAt8AV57fcSz/RLBNzl+dGIP3KdEt 57Sr9InzpQx5WksiOdryWV/yQzoWJ+BXMIdboxkPEN0bpc0eo9IdPOzsq28wHMNMTn ld0VkHcrYGAJfnJ578twrqSBcj0GfjAfhFkFeA9m4kv1tBjeoKC4OH+8025DT1MkT5 Tfx1wxuTkxdGhgSKxAemAh26MmMokt4Aql0qKy9FCXLq83JhgpIe4he7zyOh8BP3Qf qCOtLSPum3xyQ== Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. To: Nicolas Goaziou References: <877dt8tkhj.fsf@nicolasgoaziou.fr> <20200905214524.17263-1-timhowes@lavabit.com> <87pn6zs57k.fsf@nicolasgoaziou.fr> From: Tim Howes Message-ID: <47d58bad-6a89-d342-4a16-72c2c5500d6b@lavabit.com> Date: Tue, 8 Sep 2020 12:22:08 -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: <87pn6zs57k.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 43208 Cc: 43208@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) > BTW, when trying to build the package, I get the following failure: > > INFO Scraping files for ess-autoloads.el... > .../lisp/ess-autoloads.el locked by nixbld@localh... (pid 103): (s, q, p, ?)? > Cannot resolve lock conflict in batch mode > make[1]: *** [Makefile:62: ess-autoloads.el] Error 255 > > Can you build the package successfully? It builds successfully sometimes, but fails sporadically due to this file locking issue. It seems like, the way the Makefile is set up, it's trying to build the ess-autoloads target multiple times in parallel, which is causing it to fail if two processes are trying to write to the file at the same time. I'll take a look later to see if I can prevent the problem. Thanks, Tim From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 11:20:45 2020 Received: (at 43208) by debbugs.gnu.org; 24 Sep 2020 15:20:45 +0000 Received: from localhost ([127.0.0.1]:41294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLT37-0005Yb-2a for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:20:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLT36-0005YN-AA for 43208@debbugs.gnu.org; Thu, 24 Sep 2020 11:20:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34841) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLT2z-0004P6-Mb; Thu, 24 Sep 2020 11:20:37 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57484 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kLT2z-00040v-7Z; Thu, 24 Sep 2020 11:20:37 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tim Howes Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. References: <877dt8tkhj.fsf@nicolasgoaziou.fr> <20200905214524.17263-1-timhowes@lavabit.com> <87pn6zs57k.fsf@nicolasgoaziou.fr> <47d58bad-6a89-d342-4a16-72c2c5500d6b@lavabit.com> Date: Thu, 24 Sep 2020 17:20:35 +0200 In-Reply-To: <47d58bad-6a89-d342-4a16-72c2c5500d6b@lavabit.com> (Tim Howes's message of "Tue, 8 Sep 2020 12:22:08 -0700") Message-ID: <87tuvn6w1o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43208 Cc: 43208@debbugs.gnu.org, Nicolas Goaziou X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Tim & Nicolas, Any update on this? Thanks, Ludo=E2=80=99. Tim Howes skribis: >> BTW, when trying to build the package, I get the following failure: >> INFO Scraping files for ess-autoloads.el... >> .../lisp/ess-autoloads.el locked by nixbld@localh... (pid 103): (s, = q, p, ?)? >> Cannot resolve lock conflict in batch mode >> make[1]: *** [Makefile:62: ess-autoloads.el] Error 255 >> Can you build the package successfully? > > It builds successfully sometimes, but fails sporadically due to this > file locking issue. It seems like, the way the Makefile is set up, > it's trying to build the ess-autoloads target multiple times in > parallel, which is causing it to fail if two processes are trying to > write to the file at the same time. I'll take a look later to see if I > can prevent the problem. > > Thanks, > Tim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 26 05:41:03 2020 Received: (at 43208) by debbugs.gnu.org; 26 Sep 2020 09:41:03 +0000 Received: from localhost ([127.0.0.1]:45807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6hS-0002Hc-R7 for submit@debbugs.gnu.org; Sat, 26 Sep 2020 05:41:03 -0400 Received: from 66-38.147.122.lavabit.com ([38.147.122.66]:52245 helo=lavabit.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6hR-0002Gv-4P for 43208@debbugs.gnu.org; Sat, 26 Sep 2020 05:41:01 -0400 Received: from localhost.localdomain (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id 3PII93J1382M; Sat, 26 Sep 2020 04:40:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1601113255; bh=PKSY3w1iKmnQbemhrzthg7+Zetu93nJTVnuuryyVreg=; h=From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=Wj25TOiQ0oDW+bEFTUy1zgBWoP8FbLb37gy7I4Ql5NG2c250XatUV5nJvdnmO4ouO O8N0TabfI7WYBmrczk/zk8DyXHNlSh354R6MRSknTk6+38xni5ZiSDXZBQBrSOhPLH slg1bWWMvo9yyIS0XsvIMDq/jpAfnBw8S3rJSWtnCYdaNHLnerhwpmZFGLNGMr3T/R iH4mGuy1myOjBi2XP1kwW0YuEJNgiIVACenLKwjL0T49bvCY9z7TJFsAD/sCn0lEwU a/reUaxmJdDyqdb25+g1RnCyxDXphdxmn+ThZ3KbfQMQm1xPh2AFqsWiNyTmF/7uhg HRKdqQHyfJtUQ== From: Tim Howes To: 43208@debbugs.gnu.org Subject: [PATCH v3] gnu: emacs-ess: Update to 18.10.2-0.24da603. Date: Sat, 26 Sep 2020 02:40:38 -0700 Message-Id: <20200926094038.52041-1-timhowes@lavabit.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <87pn6zs57k.fsf@nicolasgoaziou.fr> References: <87pn6zs57k.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 43208 Cc: ludo@gnu.org, mail@nicolasgoaziou.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) * gnu/packages/statistics.scm (emacs-ess): Update to 18.10.2-0.24da603. [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. Correct Makefile so that ess-autoloads.el is not built twice. [arguments]: Add flag to specify INFODIR. Remove patch modifying SHELL. [license]: License is now GPLv3+. --- I corrected part of the Makefile that was causing ess-autoloads.el to be built twice, which I think was causing the file locking issue. This should now build reliably. I also selected a slightly older commit of ESS to avoid this bug: https://github.com/emacs-ess/ESS/issues/987#issuecomment-590822386 gnu/packages/statistics.scm | 51 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 03a63e6ba1..b78ed4e6f5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5784,31 +5784,28 @@ Java package that provides routines for various statistical distributions.") (license license:gpl2+))) (define-public emacs-ess + (let ((commit "24da603184ce39246611dd5b8602e769d7ebd5bf") + (version "18.10.2") + (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")) + "0j98lv07nzwzd54d4dgcfz01wy5gj48m0mnirxzh5r45ik2myh1r")) (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") @@ -5817,12 +5814,20 @@ 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")) + ;; Avoid generating ess-autoloads.el twice. + (substitute* "Makefile" + (("all: lisp doc etc autoloads") + "all: lisp doc etc")) + ;; 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 @@ -5831,16 +5836,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"))))))) @@ -5858,4 +5859,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 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 26 05:42:49 2020 Received: (at control) by debbugs.gnu.org; 26 Sep 2020 09:42:49 +0000 Received: from localhost ([127.0.0.1]:45812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6jB-0002K5-AN for submit@debbugs.gnu.org; Sat, 26 Sep 2020 05:42:49 -0400 Received: from 66-38.147.122.lavabit.com ([38.147.122.66]:33392 helo=lavabit.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6j9-0002Js-3M for control@debbugs.gnu.org; Sat, 26 Sep 2020 05:42:47 -0400 Received: from 192.168.131.127 (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id FGP4930WAHRX for ; Sat, 26 Sep 2020 04:42:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1601113361; bh=KZI4+2ql/BKLEizpLGfbPWS0/Qdm5WIIpRQCD3xragI=; h=To:From:Subject:Message-ID:Date:User-Agent:MIME-Version: Content-Type:Content-Language:Content-Transfer-Encoding; b=F9aoPFsCqyjJB4YtDQt8v579LWUiHDq6SvkaAfYsC7RYTTF3pvQHPjlslQnat7wl9 BLoPoVUrt8zIo6HyGH1wOp9UYqKczZfPIISHq9P3mi4VDDKj5qJkURFvhLR1Oh4Kei WHz0EB5stjk3qkBRLU9fg7bdU0Tioc0GxAoAtvqaSfYd0SG9zDQFAAn/Wx2Tj1ug37 C8jbl/7WLw9OwFTDDBunEPiD9CBCABqA3R2n8N9De6sBdpIT/t1r4oFh7IYg6XqXyX +Dyd3HOYWb55cmlVTptFRQKwl1gYUgo0vF2AGRcFJvrY2WrcsTD52CQAuBlX+/+0lf 0zNRpgnO1pSyg== To: control@debbugs.gnu.org From: Tim Howes Subject: Re: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. Message-ID: <0c107c98-fcd4-8262-0494-406ae47c16ed@lavabit.com> Date: Sat, 26 Sep 2020 02:42:40 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) retitle 43208 [PATCH] gnu: emacs-ess: Update to 18.10.2-0.24da603. thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 26 07:02:57 2020 Received: (at 43208-done) by debbugs.gnu.org; 26 Sep 2020 11:02:57 +0000 Received: from localhost ([127.0.0.1]:45925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM7yj-0006Wh-LE for submit@debbugs.gnu.org; Sat, 26 Sep 2020 07:02:57 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:59301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM7yg-0006WR-WE for 43208-done@debbugs.gnu.org; Sat, 26 Sep 2020 07:02:56 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id D1CB8200009; Sat, 26 Sep 2020 11:02:47 +0000 (UTC) From: Nicolas Goaziou To: Tim Howes Subject: Re: [PATCH v3] gnu: emacs-ess: Update to 18.10.2-0.24da603. References: <87pn6zs57k.fsf@nicolasgoaziou.fr> <20200926094038.52041-1-timhowes@lavabit.com> Date: Sat, 26 Sep 2020 13:02:39 +0200 In-Reply-To: <20200926094038.52041-1-timhowes@lavabit.com> (Tim Howes's message of "Sat, 26 Sep 2020 02:40:38 -0700") Message-ID: <87k0wg6bsg.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 43208-done Cc: 43208-done@debbugs.gnu.org, ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Tim Howes writes: > * gnu/packages/statistics.scm (emacs-ess): Update to > 18.10.2-0.24da603. I added a small comment explaining why we provide an unstable version, and applied your patch. Thank you. Regards, -- Nicolas Goaziou From unknown Tue Jun 17 20:15:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 24 Oct 2020 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator