GNU bug report logs - #65841
[PATCH emacs-team 0/5] Add emacs-next (generalized)

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 65841 in the body.
You can then email your comments to 65841 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: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH emacs-team 0/5] Add emacs-next (generalized)
Date: Sat, 9 Sep 2023 16:36:05 +0200

Hi Guix,

this series adds all the emacs next variants that currently exist on master
as well as a procedure to transform any emacs configuration into an emacs-next
one.

Cheers

Liliana Marie Prikler (5):
  gnu: Add emacs-next-minimal.
  gnu: Add emacs-next.
  gnu: Add emacs-next-pgtk.
  gnu: Add emacs-next-pgtk-xwidgets.
  gnu: Add emacs-next-tree-sitter.

 gnu/packages/emacs.scm | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)


base-commit: 94ca5b4357af8f8921f0cb0873a7cf316f13aa69
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65841 <at> debbugs.gnu.org
Subject: [PATCH emacs-team 2/5] gnu: Add emacs-next.
Date: Sat, 9 Sep 2023 16:29:07 +0200

* gnu/packages/emacs.scm (emacs->emacs-next, emacs-next): New variable.
---
 gnu/packages/emacs.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 469c5e36f2..1be58bd5c1 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -86,7 +86,8 @@ (define-module (gnu packages emacs)
   #:use-module (gnu packages xorg)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
-  #:use-module (srfi srfi-1))
+  #:use-module (srfi srfi-1)
+  #:export (emacs->emacs-next))
 
 (define (%emacs-modules build-system)
   (let ((which (build-system-name build-system)))
@@ -499,6 +500,21 @@ (define-public emacs-next-minimal
        (sha256
         (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")))))))
 
+(define* (emacs->emacs-next emacs #:optional name
+                            #:key (version (package-version emacs-next-minimal))
+                            (source (package-source emacs-next-minimal)))
+  (package
+    (inherit emacs)
+    (name (or name
+              (and (string-prefix? "emacs" (package-name emacs))
+                   (string-append "emacs-next"
+                                  (string-drop (package-name emacs)
+                                               (string-length "emacs"))))))
+    (version version)
+    (source source)))
+
+(define-public emacs-next (emacs->emacs-next emacs))
+
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
         (revision "0"))
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65841 <at> debbugs.gnu.org
Subject: [PATCH emacs-team 1/5] gnu: Add emacs-next-minimal.
Date: Sat, 9 Sep 2023 12:40:18 +0200

* gnu/packages/emacs.scm (emacs-next-minimal): New variable.
---
 gnu/packages/emacs.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 25bfe40774..469c5e36f2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -482,6 +482,23 @@ (define-public emacs-wide-int
        ((#:configure-flags flags)
         #~(cons "--with-wide-int" #$flags))))))
 
+(define-public emacs-next-minimal
+  (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
+        (revision "1"))
+   (package
+    (inherit emacs-minimal)
+    (name "emacs-next-minimal")
+    (version (git-version "30.0.50" revision commit))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.savannah.gnu.org/git/emacs.git")
+             (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")))))))
+
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
         (revision "0"))
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65841 <at> debbugs.gnu.org
Subject: [PATCH emacs-team 3/5] gnu: Add emacs-next-pgtk.
Date: Sat, 9 Sep 2023 16:30:06 +0200

* gnu/packages/emacs.scm (emacs-next-pgtk): New variable.
---
 gnu/packages/emacs.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1be58bd5c1..6edb69a51d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -514,6 +514,7 @@ (define* (emacs->emacs-next emacs #:optional name
     (source source)))
 
 (define-public emacs-next (emacs->emacs-next emacs))
+(define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
 
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65841 <at> debbugs.gnu.org
Subject: [PATCH emacs-team 4/5] gnu: Add emacs-next-pgtk-xwidgets.
Date: Sat, 9 Sep 2023 16:32:31 +0200

* gnu/packages/emacs.scm (emacs-next-pgtk-xwidgets): New variable.
---
 gnu/packages/emacs.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6edb69a51d..d16da64cb5 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -515,6 +515,7 @@ (define* (emacs->emacs-next emacs #:optional name
 
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
+(define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
 
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65841 <at> debbugs.gnu.org
Subject: [PATCH emacs-team 5/5] gnu: Add emacs-next-tree-sitter.
Date: Sat, 9 Sep 2023 16:33:04 +0200

This package currently exists on master, where both emacs and emacs-next are
built without tree-sitter.  Since most of our Emacsen now build with
tree-sitter, it is no longer needed, but let's issue a warning rather than
a hard error to those who rely on it.

* gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index d16da64cb5..72b2c7795e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -516,6 +516,8 @@ (define* (emacs->emacs-next emacs #:optional name
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
 (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
+(define-public emacs-next-tree-sitter
+  (deprecated-package "emacs-next-tree-sitter" emacs-next))
 
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
-- 
2.41.0

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

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 65841 <at> debbugs.gnu.org
Cc: liliana.prikler <at> gmail.com
Subject: Re: [bug#65841] [PATCH emacs-team 1/5] gnu: Add emacs-next-minimal.
Date: Mon, 11 Sep 2023 13:54:18 +0400

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

On 2023-09-09 12:40, Liliana Marie Prikler wrote:

> * gnu/packages/emacs.scm (emacs-next-minimal): New variable.
> ---
>  gnu/packages/emacs.scm | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 25bfe40774..469c5e36f2 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -482,6 +482,23 @@ (define-public emacs-wide-int
>         ((#:configure-flags flags)
>          #~(cons "--with-wide-int" #$flags))))))
>  
> +(define-public emacs-next-minimal
> +  (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
> +        (revision "1"))

Minor: should be "0"?

> +   (package
> +    (inherit emacs-minimal)
> +    (name "emacs-next-minimal")
> +    (version (git-version "30.0.50" revision commit))
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://git.savannah.gnu.org/git/emacs.git")
> +             (commit commit)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")))))))
> +
>  (define-public guile-emacs
>    (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
>          (revision "0"))

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

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

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 65841 <at> debbugs.gnu.org
Cc: liliana.prikler <at> gmail.com
Subject: Re: [bug#65841] [PATCH emacs-team 5/5] gnu: Add
 emacs-next-tree-sitter.
Date: Mon, 11 Sep 2023 13:57:03 +0400

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

On 2023-09-09 16:33, Liliana Marie Prikler wrote:

> This package currently exists on master, where both emacs and emacs-next are
> built without tree-sitter.  Since most of our Emacsen now build with
> tree-sitter, it is no longer needed, but let's issue a warning rather than
> a hard error to those who rely on it.

Sounds very good 👍

>
> * gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
> ---
>  gnu/packages/emacs.scm | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index d16da64cb5..72b2c7795e 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -516,6 +516,8 @@ (define* (emacs->emacs-next emacs #:optional name
>  (define-public emacs-next (emacs->emacs-next emacs))
>  (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
>  (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
> +(define-public emacs-next-tree-sitter
> +  (deprecated-package "emacs-next-tree-sitter" emacs-next))
>  
>  (define-public guile-emacs
>    (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

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

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 65841 <at> debbugs.gnu.org
Cc: liliana.prikler <at> gmail.com
Subject: Re: [bug#65841] [PATCH emacs-team 0/5] Add emacs-next (generalized)
Date: Mon, 11 Sep 2023 13:59:15 +0400

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

On 2023-09-09 16:36, Liliana Marie Prikler wrote:

> Hi Guix,
>
> this series adds all the emacs next variants that currently exist on master
> as well as a procedure to transform any emacs configuration into an emacs-next
> one.
>
> Cheers
>
> Liliana Marie Prikler (5):
>   gnu: Add emacs-next-minimal.
>   gnu: Add emacs-next.
>   gnu: Add emacs-next-pgtk.
>   gnu: Add emacs-next-pgtk-xwidgets.
>   gnu: Add emacs-next-tree-sitter.
>
>  gnu/packages/emacs.scm | 39 ++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 38 insertions(+), 1 deletion(-)
>
>
> base-commit: 94ca5b4357af8f8921f0cb0873a7cf316f13aa69

Looks good to me, thank you very much for you work!

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andrew Tropin <andrew <at> trop.in>, 65841 <at> debbugs.gnu.org
Subject: Re: [bug#65841] [PATCH emacs-team 1/5] gnu: Add emacs-next-minimal.
Date: Sat, 16 Sep 2023 18:10:51 +0200

Am Montag, dem 11.09.2023 um 13:54 +0400 schrieb Andrew Tropin:
> On 2023-09-09 12:40, Liliana Marie Prikler wrote:
> 
> > * gnu/packages/emacs.scm (emacs-next-minimal): New variable.
> > ---
> >  gnu/packages/emacs.scm | 17 +++++++++++++++++
> >  1 file changed, 17 insertions(+)
> > 
> > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> > index 25bfe40774..469c5e36f2 100644
> > --- a/gnu/packages/emacs.scm
> > +++ b/gnu/packages/emacs.scm
> > @@ -482,6 +482,23 @@ (define-public emacs-wide-int
> >         ((#:configure-flags flags)
> >          #~(cons "--with-wide-int" #$flags))))))
> >  
> > +(define-public emacs-next-minimal
> > +  (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
> > +        (revision "1"))
> 
> Minor: should be "0"?
I personally reserve "0" for "same as release", but where you start to
count doesn't matter that much in the grand scheme of things.  Thanks
for asking, though.

Cheers

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andrew Tropin <andrew <at> trop.in>, 65841-done <at> debbugs.gnu.org
Subject: Re: [bug#65841] [PATCH emacs-team 0/5] Add emacs-next (generalized)
Date: Sat, 16 Sep 2023 18:11:25 +0200

Am Montag, dem 11.09.2023 um 13:59 +0400 schrieb Andrew Tropin:
> On 2023-09-09 16:36, Liliana Marie Prikler wrote:
> 
> > Hi Guix,
> > 
> > this series adds all the emacs next variants that currently exist
> > on master as well as a procedure to transform any emacs
> > configuration into an emacs-next one.
> > 
> > Cheers
> > 
> > Liliana Marie Prikler (5):
> >   gnu: Add emacs-next-minimal.
> >   gnu: Add emacs-next.
> >   gnu: Add emacs-next-pgtk.
> >   gnu: Add emacs-next-pgtk-xwidgets.
> >   gnu: Add emacs-next-tree-sitter.
> > 
> >  gnu/packages/emacs.scm | 39
> > ++++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 38 insertions(+), 1 deletion(-)
> > 
> > 
> > base-commit: 94ca5b4357af8f8921f0cb0873a7cf316f13aa69
> 
> Looks good to me, thank you very much for you work!
Thank you.  Pushed.

Cheers

Previous Next

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