From: "Nicolò Balzarotti" <anothersms@gmail.com>
To: 36776@debbugs.gnu.org
Subject: [bug#36776] WIP: upgrade emacs-ess to 18.10.2
Date: Tue, 23 Jul 2019 22:11:16 +0000 [thread overview]
Message-ID: <CAO7Ox=aO+1bXgFHO0+bcGmWcVMASiJ-qW6EXADrO1YA_L3G8EQ@mail.gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 311 bytes --]
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ò
[-- Attachment #1.2: Type: text/html, Size: 427 bytes --]
[-- Attachment #2: 0001-wip-gnu-packages-Upgrade-emacs-ess-to-18.10.2.patch --]
[-- Type: text/x-patch, Size: 4215 bytes --]
From 39420bfed259d22bf0368fa0da0a6093a42e0f78 Mon Sep 17 00:00:00 2001
From: nixo <nicolo@nixo.xyz>
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 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"))
(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-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.
- (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-errors ()")
- "ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :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 statistical 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 = /bin/sh")
- (string-append "SHELL = " (which "sh"))))
- #t))
- (replace 'check
- (lambda _
- (invoke "make" "test")))))))
+ (lambda* (#:key inputs propagated-inputs #:allow-other-keys)
+ (substitute* "Makeconf"
+ (("SHELL = /bin/sh")
+ (string-append "SHELL = " (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)))
--
2.22.0
next reply other threads:[~2019-07-23 22:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 22:11 Nicolò Balzarotti [this message]
2019-12-10 16:11 ` [bug#36776] WIP: upgrade emacs-ess to 18.10.2 Nicolò Balzarotti
2020-05-07 8:39 ` bug#36776: " Nicolò Balzarotti
2020-05-08 13:46 ` [bug#36776] " Marius Bakke
2020-05-08 19:03 ` Nicolò Balzarotti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAO7Ox=aO+1bXgFHO0+bcGmWcVMASiJ-qW6EXADrO1YA_L3G8EQ@mail.gmail.com' \
--to=anothersms@gmail.com \
--cc=36776@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).