From: Jack Hill <jackhill@jackhill.us>
To: 41016@debbugs.gnu.org
Cc: Jack Hill <jackhill@jackhill.us>
Subject: [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Sat, 2 May 2020 00:26:56 -0400 [thread overview]
Message-ID: <20200502042656.14461-1-jackhill@jackhill.us> (raw)
* gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91.
[inputs]: Remove imagemagick.
---
gnu/packages/emacs.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ab7cc20d10..039d0d16b2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -69,6 +70,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix utils)
+ #:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define-public emacs
@@ -242,9 +244,9 @@ languages.")
(license license:gpl3+)))
(define-public emacs-next
- (let ((commit "36abf6864604b3061c2e070f8997491fa2bce44c")
+ (let ((commit "c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c")
(revision "0")
- (emacs-version "27.0.50"))
+ (emacs-version "27.0.91"))
(package
(inherit emacs)
(name "emacs-next")
@@ -256,7 +258,7 @@ languages.")
(url "https://git.savannah.gnu.org/git/emacs.git")
(commit commit)))
(sha256
- (base32 "1ckn607p0clz0dhhlizvv7l03p4nminy48h53xrpz55w4rcrcm2l"))
+ (base32 "0mlrg2npy1r79laahkgzhxd1qassfcdz8qk1cpw7mqgf6y5x505h"))
(file-name (git-file-name name version))
(patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
@@ -321,7 +323,13 @@ languages.")
(inputs
`(("jansson" ,jansson)
("harfbuzz" ,harfbuzz)
- ,@(package-inputs emacs)))
+ ;; Emacs no longer uses ImageMagick by default
+ ;; https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.0.91&id=c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c#n102
+ ,@(let ((package-eq? (lambda (symbol input-item)
+ (match input-item
+ ((name package)
+ (eq? symbol package))))))
+ (delete imagemagick (package-inputs emacs) package-eq?))))
(native-inputs
`(("autoconf" ,autoconf) ; needed when building from trunk
,@(package-native-inputs emacs)))
--
2.26.2
next reply other threads:[~2020-05-02 4:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 4:26 Jack Hill [this message]
2020-05-04 21:00 ` [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91 Ludovic Courtès
2020-05-04 21:03 ` Jack Hill
2020-05-05 21:47 ` bug#41016: " Ludovic Courtès
2020-05-05 22:51 ` [bug#41016] " Jack Hill
2020-05-10 20:15 ` Ludovic Courtès
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=20200502042656.14461-1-jackhill@jackhill.us \
--to=jackhill@jackhill.us \
--cc=41016@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).