From unknown Sun Aug 17 10:16:58 2025 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 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== From: Tim Howes 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-Received-From: 38.107.241.66 X-Spam-Score: -1.4 (-) 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 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 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 From unknown Sun Aug 17 10:16:58 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tim Howes Subject: bug#41039: closed (Re: [bug#41039] [PATCH] gnu: emacs-ess: Update to 18.10.2.) Message-ID: References: <875zdaz4id.fsf@devup.no> <20200502235435.2983-1-timhowes@lavabit.com> X-Gnu-PR-Message: they-closed 41039 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 41039@debbugs.gnu.org Date: Tue, 05 May 2020 17:17:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1588699023-21288-1" This is a multi-part message in MIME format... ------------=_1588699023-21288-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #41039: [PATCH] gnu: emacs-ess: Update to 18.10.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 41039@debbugs.gnu.org. --=20 41039: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D41039 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1588699023-21288-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 41039-done) by debbugs.gnu.org; 5 May 2020 17:16:35 +0000 Received: from localhost ([127.0.0.1]:37271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW1BL-0005WM-CY for submit@debbugs.gnu.org; Tue, 05 May 2020 13:16:35 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:47307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW1BJ-0005W9-DG for 41039-done@debbugs.gnu.org; Tue, 05 May 2020 13:16:33 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5AD965C0126; Tue, 5 May 2020 13:16:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 05 May 2020 13:16:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=qulJYGf95ZZtAB2Z76CUf/rcVM gFqFfXXqukHtg0YRY=; b=W1qfom5kQagn22cdVU+rdc8rJ1mFul9xmNmpvMa7Uf x3KljKKIt1XVS/T0fDuREs/HU8su27PfIYuLjl7lnleT6supFns+hGt78E26SoyG e9bb8GJoXn1AcMjsw9S4/i6hEjJfFyN1QPRPUrBeXjrdczRzdApOSdi0WVAcH397 xQQRu8/Ku0flSWu6/42FCMGVIe8/vGfX/18nsR5JIzK1lqecaFVCNMZAiXBrF7sF 9gi0EIr2hj3d7Up+gPI3uBBi88fjjWrrjp21NbVS1jUnoSi9CrkoYF4rFGLLcBZI /WpIhZ/oO72rRuvqczOYrv1YG6P5NGIfzVWlUsW9twuA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=qulJYG f95ZZtAB2Z76CUf/rcVMgFqFfXXqukHtg0YRY=; b=mF+MIPjDQIDVnCKoRFgdQF SZbeCNhdz3gSuiRGV6UReYrl8uw7BtDh73egI+DY6RuJagiaZFcPu8yL3LPBSEAZ KiK590/wHN1YipSTkUXkT1PF1VsXCGmegMnl/0UsX3mWMuTvDxvGGgWhBfIvn7BN pb+eJeRNMzM1XnTlzbz6OSyVQvjCWooStsDW8v9njTZxBw8bGfmAwlnwNST3HxAN zlJv7qrUuXXPEyVrcU6aBbfaY0+FhIlTyISj3971jY6fZxPuS1byQc8u5gI9NFxG LBHnGRU4u4+WcjdaGmAcQTM7d1+1noxyu8S2FZKEVF1Vge/0oKUX32cDu7kL7gLQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrjeeigddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpedtvdfggeevgeeivdffueejiedttedvkedtudfggfdtgeefiedtieekffdu gfeuffenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id D8CDF306606F; Tue, 5 May 2020 13:16:27 -0400 (EDT) From: Marius Bakke To: Tim Howes , 41039-done@debbugs.gnu.org Subject: Re: [bug#41039] [PATCH] gnu: emacs-ess: Update to 18.10.2. In-Reply-To: <20200502235435.2983-1-timhowes@lavabit.com> References: <20200502235435.2983-1-timhowes@lavabit.com> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Tue, 05 May 2020 19:16:26 +0200 Message-ID: <875zdaz4id.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41039-done 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 (-) --=-=-= Content-Type: text/plain Tim Howes via Guix-patches via writes: > * 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. Applied, thanks! This was not an easy patch, so kudos. :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6xn2oACgkQoqBt8qM6 VPoB1gf/akMljrsBV6gpPixb74jmmY0oUV4zeLbpxORBldf8sMfnglHYn0V1skTB 7Fqe9BDsSQmBx7F1a++OAvkqGnN3b+dVPsBJ/ie8Y56lRLh3LjcUVWmhhGRJb0cU X7FRU2Py4AbaP8MGFO4iJxm701sEhtylC+Uw5VyKOxNt59fatVoJoNDgASIgIg6X rm52ggps+qeq6aEeu00sOxGLEMVr4/LzKUZxKVRqGGw2fFYc55BCRRhs6WhUFwWp ilfWRm42Y+ChYPCVU0Spr2Mf/UOPhAlFZflEb2TlsFCIEiDx4QGaMMJW1jH+O6bT zQEmc7+Yrm0wr6xW5AJQFm4Cd5+8Cg== =u7Lz -----END PGP SIGNATURE----- --=-=-=-- ------------=_1588699023-21288-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 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== From: Tim Howes To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-ess: Update to 18.10.2. 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-Received-From: 38.107.241.66 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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 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 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 ------------=_1588699023-21288-1--