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 YEpcAycHVF/3GQAA0tVLHw (envelope-from ) for ; Sat, 05 Sep 2020 21:46:15 +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 mPgfOyYHVF//YQAA1q6Kng (envelope-from ) for ; Sat, 05 Sep 2020 21:46:14 +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 91BFE9403A5 for ; Sat, 5 Sep 2020 21:46:14 +0000 (UTC) Received: from localhost ([::1]:55302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEg0j-0005F5-8Z for larch@yhetil.org; Sat, 05 Sep 2020 17:46:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEg0Y-0005Ej-1v for guix-patches@gnu.org; Sat, 05 Sep 2020 17:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEg0X-0001yu-Oh for guix-patches@gnu.org; Sat, 05 Sep 2020 17:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kEg0X-0007LQ-La for guix-patches@gnu.org; Sat, 05 Sep 2020 17:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43208] [PATCH] gnu: emacs-ess: Update to 20.09. Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Sep 2020 21:46: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 Received: via spool by 43208-submit@debbugs.gnu.org id=B43208.159934235628220 (code B ref 43208); Sat, 05 Sep 2020 21:46:01 +0000 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== 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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=J0tCql19; dmarc=none; 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: EgxYMMaqtN0g * 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