From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mK/QIwENb19BPQAA0tVLHw (envelope-from ) for ; Sat, 26 Sep 2020 09:42:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SBbhHwENb1/BLAAA1q6Kng (envelope-from ) for ; Sat, 26 Sep 2020 09:42:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4D2959400D3 for ; Sat, 26 Sep 2020 09:42:24 +0000 (UTC) Received: from localhost ([::1]:39328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kM6il-0001fU-2t for larch@yhetil.org; Sat, 26 Sep 2020 05:42:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kM6iQ-0001fM-6J for guix-patches@gnu.org; Sat, 26 Sep 2020 05:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kM6iP-0003CS-TK for guix-patches@gnu.org; Sat, 26 Sep 2020 05:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kM6iP-0002Ip-Q4 for guix-patches@gnu.org; Sat, 26 Sep 2020 05:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43208] [PATCH v3] gnu: emacs-ess: Update to 18.10.2-0.24da603. Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 09:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43208@debbugs.gnu.org Cc: ludo@gnu.org, mail@nicolasgoaziou.fr Received: via spool by 43208-submit@debbugs.gnu.org id=B43208.16011132638784 (code B ref 43208); Sat, 26 Sep 2020 09:42:01 +0000 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== 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.6 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Tim Howes , Tim Howes via Guix-patches From: Tim Howes via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=lavabit.com header.s=bazinga header.b=Wj25TOiQ; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 05TbEYKAEtXV * 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