GNU bug report logs - #41016
[PATCH] gnu: emacs-next: Upgrade to 27.0.91.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41016 in the body.
You can then email your comments to 41016 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jack Hill <jackhill <at> jackhill.us>
To: guix-patches <at> gnu.org
Cc: Jack Hill <jackhill <at> jackhill.us>
Subject: [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Sat,  2 May 2020 00:26:56 -0400

* 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 <at> gmail.com>
 ;;; Copyright © 2019 Leo Prikler <leo.prikler <at> student.tugraz.at>
 ;;; Copyright © 2019 Amin Bandali <bandali <at> gnu.org>
+;;; Copyright © 2020 Jack Hill <jackhill <at> 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

Message #8 received at 41016 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Jack Hill <jackhill <at> jackhill.us>
Cc: 41016 <at> debbugs.gnu.org
Subject: Re: [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Mon, 04 May 2020 23:00:16 +0200

Hi Jack,

Jack Hill <jackhill <at> 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’.

Message #11 received at 41016 <at> debbugs.gnu.org (full text, mbox):

From: Jack Hill <jackhill <at> jackhill.us>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 41016 <at> debbugs.gnu.org
Subject: Re: [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Mon, 4 May 2020 17:03:15 -0400 (EDT)

[Message part 1 (text/plain, inline)]

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

Message #16 received at 41016-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Jack Hill <jackhill <at> jackhill.us>
Cc: 41016-done <at> debbugs.gnu.org
Subject: Re: [bug#41016] [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Tue, 05 May 2020 23:47:00 +0200

Hi,

Jack Hill <jackhill <at> 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’.

Message #19 received at 41016-done <at> debbugs.gnu.org (full text, mbox):

From: Jack Hill <jackhill <at> jackhill.us>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 41016-done <at> debbugs.gnu.org
Subject: Re: bug#41016: [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Tue, 5 May 2020 18:51:33 -0400 (EDT)

[Message part 1 (text/plain, inline)]

On Tue, 5 May 2020, Ludovic Courtès wrote:

> Jack Hill <jackhill <at> 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

Message #22 received at 41016-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Jack Hill <jackhill <at> jackhill.us>
Cc: 41016-done <at> debbugs.gnu.org
Subject: Re: bug#41016: [PATCH] gnu: emacs-next: Upgrade to 27.0.91.
Date: Sun, 10 May 2020 22:15:07 +0200

Hi,

Jack Hill <jackhill <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.