From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:50553) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iei7I-0007Hq-NQ for guix-patches@gnu.org; Tue, 10 Dec 2019 11:12:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iei7G-0007JT-Sz for guix-patches@gnu.org; Tue, 10 Dec 2019 11:12:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iei7G-0007JL-PO for guix-patches@gnu.org; Tue, 10 Dec 2019 11:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iei7G-0007dN-L5 for guix-patches@gnu.org; Tue, 10 Dec 2019 11:12:02 -0500 Subject: [bug#36776] WIP: upgrade emacs-ess to 18.10.2 Resent-Message-ID: From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: References: Date: Tue, 10 Dec 2019 17:11:47 +0100 Message-ID: <8736ds9n3w.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36776@debbugs.gnu.org Nicol=C3=B2 Balzarotti writes: Hello again! After changes to EMACSLOADPATH, emacs is failing to find ess (.el files are placed under ~/.guix-profile/share/emacs/site-lisp/guix.d) Looking at the mail archive I found this patch I sent 3 months ago >.<. It's outdated now (for the LOAD PATH thing). But we might take the time to fix this. Any thought? Thanks! Nicol=C3=B2 > Hello guix! > I'm sorry for this work in progress. I got emacs-ess 18 working, but I > really don't like how I did it (I don't think the way I'm helping emacs > finding julia-mode during the build is right), so I'm asking help here! > > On irc, @rekado expressed interest in helping. > > Thanks everybody, > Nicol=C3=B2 > From 39420bfed259d22bf0368fa0da0a6093a42e0f78 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 24 Jul 2019 00:04:37 +0200 > Subject: [PATCH] wip: gnu packages: Upgrade emacs-ess to 18.10.2 > > --- > gnu/packages/statistics.scm | 62 ++++++++++++++++++------------------- > 1 file changed, 30 insertions(+), 32 deletions(-) > > diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm > index eb5e5b4b76..35af00c58e 100644 > --- a/gnu/packages/statistics.scm > +++ b/gnu/packages/statistics.scm > @@ -5877,35 +5877,15 @@ Java package that provides routines for various s= tatistical 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/arch= ive/v" > version ".tar.gz")) > (sha256 > (base32 > - "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c")) > - (file-name (string-append name "-" version ".tar.gz")) > - (modules '((guix build utils))) > - (snippet > - '(begin > - ;; Stop ESS from trying to bundle an external julia-mo= de.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, sk= ipping > - ;; pdf lets us not pull in texlive. > - (substitute* "doc/Makefile" > - (("all : info text html pdf") > - "all : info") > - (("install: install-info install-other-docs") > - "install: install-info")) > - ;; Test fails upstream > - (substitute* "test/ess-r-tests.el" > - (("ert-deftest ess-r-namespaced-eval-no-srcref-in-er= rors ()") > - "ert-deftest ess-r-namespaced-eval-no-srcref-in-err= ors () :expected-result :failed")) > - #t)))) > + "0akz3wf6b4dvwm55875ap45rdb52m4fwxfs6nlfpccmm1q55nvbb")) > + (modules '((guix build utils))))) > (build-system gnu-build-system) > (arguments > (let ((base-directory "/share/emacs/site-lisp/guix.d/ess")) > @@ -5917,20 +5897,38 @@ Java package that provides routines for various s= tatistical distributions.") > #:phases > (modify-phases %standard-phases > (delete 'configure) > + (delete 'check) ;; emacs: standard input is not a tty > (add-before 'build 'more-shebang-patching > - (lambda* (#:key inputs #:allow-other-keys) > - (substitute* "Makeconf" > - (("SHELL =3D /bin/sh") > - (string-append "SHELL =3D " (which "sh")))) > - #t)) > - (replace 'check > - (lambda _ > - (invoke "make" "test"))))))) > + (lambda* (#:key inputs propagated-inputs #:allow-other-keys) > + (substitute* "Makeconf" > + (("SHELL =3D /bin/sh") > + (string-append "SHELL =3D " (which "sh")))) > + ;; No need to build docs in so many formats. Also, skipping > + ;; pdf lets us not pull in texlive. > + (substitute* "doc/Makefile" > + (("install: install-info install-other-docs") > + "install: install-info")) > + ;; This seems too much like a hack > + (substitute* "Makeconf" > + (("-no-site-file") > + (string-append "-no-site-file -L " > + (string-append > + (assoc-ref inputs "emacs-julia-mode") > + "/share/emacs/site-lisp/guix.d/*/" > + )))) > + (substitute* "lisp/Makefile" > + (("^\tjulia-mode.elc\\\\\n") "") > + (("^all: julia-mode.el") > + "all: ") > + (("^ess-julia.elc: julia-mode.elc") > + "")) > + #t) > + ))))) > (inputs > `(("emacs" ,emacs-minimal) > ("r-minimal" ,r-minimal))) > (native-inputs > - `(("perl" ,perl) > + `(("which" ,which) > ("texinfo" ,texinfo))) > (propagated-inputs > `(("emacs-julia-mode" ,emacs-julia-mode))) > --=20 > 2.22.0