* [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
@ 2020-05-02 4:26 Jack Hill
2020-05-04 21:00 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Jack Hill @ 2020-05-02 4:26 UTC (permalink / raw)
To: 41016; +Cc: Jack Hill
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
2020-05-02 4:26 [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91 Jack Hill
@ 2020-05-04 21:00 ` Ludovic Courtès
2020-05-04 21:03 ` Jack Hill
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2020-05-04 21:00 UTC (permalink / raw)
To: Jack Hill; +Cc: 41016
Hi Jack,
Jack Hill <jackhill@jackhill.us> skribis:
> * gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91.
> [inputs]: Remove imagemagick.
[...]
> - ,@(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?))))
For simplicity, we’d typically write:
(alist-delete "imagemagick" (package-inputs emacs))
I can do it for you if you want, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
2020-05-04 21:00 ` Ludovic Courtès
@ 2020-05-04 21:03 ` Jack Hill
2020-05-05 21:47 ` bug#41016: " Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Jack Hill @ 2020-05-04 21:03 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 41016
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
Ludo’
On Mon, 4 May 2020, Ludovic Courtès wrote:
[…]
>> - ,@(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?))))
>
> For simplicity, we’d typically write:
>
> (alist-delete "imagemagick" (package-inputs emacs))
Thanks for the tip!
> I can do it for you if you want, thanks!
Sure, please go ahead.
Best,
Jack
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#41016: [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
2020-05-04 21:03 ` Jack Hill
@ 2020-05-05 21:47 ` Ludovic Courtès
2020-05-05 22:51 ` [bug#41016] " Jack Hill
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2020-05-05 21:47 UTC (permalink / raw)
To: Jack Hill; +Cc: 41016-done
Hi,
Jack Hill <jackhill@jackhill.us> skribis:
> On Mon, 4 May 2020, Ludovic Courtès wrote:
>
> […]
>
>>> - ,@(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?))))
>>
>> For simplicity, we’d typically write:
>>
>> (alist-delete "imagemagick" (package-inputs emacs))
>
> Thanks for the tip!
>
>> I can do it for you if you want, thanks!
>
> Sure, please go ahead.
Done, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
2020-05-05 21:47 ` bug#41016: " Ludovic Courtès
@ 2020-05-05 22:51 ` Jack Hill
2020-05-10 20:15 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Jack Hill @ 2020-05-05 22:51 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 41016-done
[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]
On Tue, 5 May 2020, Ludovic Courtès wrote:
> Jack Hill <jackhill@jackhill.us> skribis:
>> On Mon, 4 May 2020, Ludovic Courtès wrote:
>>
>> […]
>>
>>>> - ,@(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?))))
>>>
>>> For simplicity, we’d typically write:
>>>
>>> (alist-delete "imagemagick" (package-inputs emacs))
>>>
>>> I can do it for you if you want, thanks!
>>
>> Sure, please go ahead.
>
> Done, thanks!
Ludo’
I guess we can take (ice-9 match) out of the imports now that we're using
alist-delete. Should I propose another patch, or do you want to do that?
Best,
Jack
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
2020-05-05 22:51 ` [bug#41016] " Jack Hill
@ 2020-05-10 20:15 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2020-05-10 20:15 UTC (permalink / raw)
To: Jack Hill; +Cc: 41016-done
Hi,
Jack Hill <jackhill@jackhill.us> skribis:
> I guess we can take (ice-9 match) out of the imports now that we're
> using alist-delete. Should I propose another patch, or do you want to
> do that?
I went ahead and removed the import, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-10 20:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-02 4:26 [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91 Jack Hill
2020-05-04 21:00 ` 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
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).