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 qAqIC24Orl6uaAAA0tVLHw (envelope-from ) for ; Sun, 03 May 2020 00:21:02 +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 kPcPMXcOrl4yHwAA1q6Kng (envelope-from ) for ; Sun, 03 May 2020 00:21:11 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 7392C941F7B for ; Sun, 3 May 2020 00:21:08 +0000 (UTC) Received: from localhost ([::1]:40652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jV2NY-0006Vv-C0 for larch@yhetil.org; Sat, 02 May 2020 20:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV2NT-0006Sm-Px for guix-patches@gnu.org; Sat, 02 May 2020 20:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jV2NT-0000ct-1C for guix-patches@gnu.org; Sat, 02 May 2020 20:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jV2NS-0000co-MB for guix-patches@gnu.org; Sat, 02 May 2020 20:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jV2NS-0003NP-I7 for guix-patches@gnu.org; Sat, 02 May 2020 20:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41039] [PATCH] gnu: emacs-ess: Update to 18.10.2. Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 May 2020 00:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41039@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158846522012904 (code B ref -1); Sun, 03 May 2020 00:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2020 00:20:20 +0000 Received: from localhost ([127.0.0.1]:54182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV2Ml-0003M3-8B for submit@debbugs.gnu.org; Sat, 02 May 2020 20:20:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:42092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV1y9-0002fc-LY for submit@debbugs.gnu.org; Sat, 02 May 2020 19:54:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV1y8-0004By-Tr for guix-patches@gnu.org; Sat, 02 May 2020 19:54:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jV1y8-0002B8-16 for guix-patches@gnu.org; Sat, 02 May 2020 19:54:52 -0400 Received: from lavabit.com ([38.107.241.66]:49843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV1y7-00022v-A7 for guix-patches@gnu.org; Sat, 02 May 2020 19:54:51 -0400 Received: from localhost.localdomain (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id IJJ3MU8MBHTN for ; Sat, 02 May 2020 18:54:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1588463689; bh=NhOslN0BrhFPFSWvFc1cnjSPPqzMtuU/a1IB7CwRBjQ=; h=From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding; b=ogcTIQtDUYP96X7JwdlgGkyfsHgZ1fUOsvHEi8miOQKhMAsMiyQysJSTzgw7T0iIP S8Cd589vqng1oMRak6YOhX3duUu7c83FFLP7iHOvBHbFQbosCpYnAdBcwYKMXkIf2/ 4K1huLOfZVIK7AVHcwInFZvO7zy/a3dbRM0m8qMSFCcH70mRcEzDQDS6xpyzhu01Ee 9DjPINjcFOimCaP8hsrZy6NJ0bOpAaacCFtu87jTTuMcWKSH7QS7NKSdiHNX3jjyxQ Jgoi/BscvXqMThkqHHv73I8DS7Y9Q5W0iXWruvTmcw8FGGbexCvFt4VtGvHjuVnDsv mRRarx3scWwEA== Date: Sat, 2 May 2020 16:54:35 -0700 Message-Id: <20200502235435.2983-1-timhowes@lavabit.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=38.107.241.66; envelope-from=timhowes@lavabit.com; helo=lavabit.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/02 19:54:49 X-ACL-Warn: Detected OS = ??? X-Mailman-Approved-At: Sat, 02 May 2020 20:20:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 X-Spam-Score: 1.49 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=lavabit.com header.s=bazinga header.b=ogcTIQtD; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [1.49 / 13.00]; HAS_REPLYTO(0.00)[timhowes@lavabit.com]; GENERIC_REPUTATION(0.00)[-0.49456104467535]; MX_INVALID(1.00)[cached]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.15), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; RCVD_COUNT_TWELVE(0.00)[12]; TO_DN_NONE(0.00)[]; R_DKIM_REJECT(1.00)[lavabit.com:s=bazinga]; DKIM_TRACE(0.00)[lavabit.com:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[guix-patches@gnu.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[tobias.gr:email,lavabit.com:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: fop0tmyHluh+ * gnu/packages/statistics.scm (emacs-ess): Update to 18.10.2. [source]: Use git-fetch and git-file-name. Fix snippets for removing julia-mode and removing extra documentation formats. Add snippets for installing elisp files and stopping installation of info directory. Remove snippet for old failing test. Add snippet for new failing test. [arguments]: Remove extra "/". [native-inputs]: Add r-roxygen2. --- Hello, I have a patch for emacs-ess that upgrades the version to 18.10.2. I switched the download mechanism to git-fetch since there was a warning about using Github's automatically generated release files. Additionally, there are a couple fixes applied to the Makefiles and one of the tests. Thanks, Tim gnu/packages/statistics.scm | 45 +++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 00b648a54c..0ead92dedf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Kost ;;; Copyright © 2018 Alex Branham +;;; Copyright © 2020 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -5786,42 +5787,51 @@ Java package that provides routines for various statistical distributions.") (define-public emacs-ess (package (name "emacs-ess") - (version "17.11") + (version "18.10.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/emacs-ess/ESS/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-ess/ESS") + (commit (string-append "v" version)))) (sha256 (base32 - "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c")) - (file-name (string-append name "-" version ".tar.gz")) + "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3")) + (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" - (("^\tjulia-mode.elc\\\\\n") "") - (("^dist: all julia-mode.el") - "dist: all")) - ;; No need to build docs in so many formats. Also, skipping - ;; pdf lets us not pull in texlive. + (("^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))) + ;; Only build docs in info format. (substitute* "doc/Makefile" - (("all : info text html pdf") + (("all : info text") "all : info") (("install: install-info install-other-docs") "install: install-info")) - ;; Test fails upstream + ;; 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" - (("ert-deftest ess-r-namespaced-eval-no-srcref-in-errors ()") - "ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :expected-result :failed")) + (("Add together two numbers.\n") + "Add together two numbers. ") + (("##' add\\(10, 1\\)") "add(10, 1)")) #t)))) (build-system gnu-build-system) (arguments (let ((base-directory "/share/emacs/site-lisp")) `(#:make-flags (list (string-append "PREFIX=" %output) - (string-append "ETCDIR=" %output "/" + (string-append "ETCDIR=" %output ,base-directory "/etc") - (string-append "LISPDIR=" %output "/" + (string-append "LISPDIR=" %output ,base-directory)) #:phases (modify-phases %standard-phases @@ -5840,6 +5850,7 @@ Java package that provides routines for various statistical distributions.") ("r-minimal" ,r-minimal))) (native-inputs `(("perl" ,perl) + ("r-roxygen2" ,r-roxygen2) ("texinfo" ,texinfo))) (propagated-inputs `(("emacs-julia-mode" ,emacs-julia-mode))) -- 2.26.2