From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sEfKCxjNUl9lHgAA0tVLHw (envelope-from ) for ; Fri, 04 Sep 2020 23:26:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0J+NBxjNUl+uOQAAB5/wlQ (envelope-from ) for ; Fri, 04 Sep 2020 23:26:16 +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 5291E940366 for ; Fri, 4 Sep 2020 23:26:12 +0000 (UTC) Received: from localhost ([::1]:60688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEL5t-0007Gy-FV for larch@yhetil.org; Fri, 04 Sep 2020 19:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEL5m-0007Go-Eu for bug-guix@gnu.org; Fri, 04 Sep 2020 19:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEL5m-0005ff-5q for bug-guix@gnu.org; Fri, 04 Sep 2020 19:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kEL5m-0004FQ-1h for bug-guix@gnu.org; Fri, 04 Sep 2020 19:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43093: [PATCH] gnu: emacs-ess: Update to 20200903.1516. References: <605a30acc9c66c09938147cccfcaafc3b9f8d57e.camel@divoplade.fr> In-Reply-To: <605a30acc9c66c09938147cccfcaafc3b9f8d57e.camel@divoplade.fr> Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 04 Sep 2020 23:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43093 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 43093@debbugs.gnu.org Received: via spool by 43093-submit@debbugs.gnu.org id=B43093.159926195316311 (code B ref 43093); Fri, 04 Sep 2020 23:26:02 +0000 Received: (at 43093) by debbugs.gnu.org; 4 Sep 2020 23:25:53 +0000 Received: from localhost ([127.0.0.1]:41011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEL5c-0004F0-Mx for submit@debbugs.gnu.org; Fri, 04 Sep 2020 19:25:53 -0400 Received: from lavabit.com ([76.8.29.66]:62562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEL5a-0004Em-Gd for 43093@debbugs.gnu.org; Fri, 04 Sep 2020 19:25:50 -0400 Received: from localhost.localdomain (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id DDQKOM9Z4R8N for <43093@debbugs.gnu.org>; Fri, 04 Sep 2020 18:25:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1599261943; bh=yhw3zGUO1DV6FVV6wwIw+liMrG2yuF0qqiD+YtX4DvQ=; h=From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=cf3wLv0IfRujB7LApjfwjZN8L0Ugx9hyhgQJ+cGVgx3HhxJQFoVIToGQFmtKgMRgk b9MFwmnTtEYWvTRmfqEomKi9EjaZpIgyUN9YKDggBNHcwq6siv4keFZT4ogHbXhkOa UvSbcZ5eFUMXZ59ZUsqYyMJz8iJTHVAsL8XmR/RsWTeD6rke1vbKyoFVmvMj30zPD1 LmSUFO2esRLRS84iy73m/sjpyvV2x5BGW8u4kIF7teE00yFL+hTzt2Qn4TGIvAy5EE u2OAv0JvUz18M753akl8vHwrCzBczrsZYRMnQ36U9fMvAHhMuuvicfVLQwusTqkdr4 PpG3SOn158FxA== Date: Fri, 4 Sep 2020 16:25:37 -0700 Message-Id: <20200904232537.11128-1-timhowes@lavabit.com> X-Mailer: git-send-email 2.28.0 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Tim Howes From: Tim Howes via Bug reports for GNU Guix X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=lavabit.com header.s=bazinga header.b=cf3wLv0I; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 5f80Tgs5+YEg * 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