[PATCH emacs-team 0/5] Add emacs-next (generalized)

  • Done
  • quality assurance status badge
Details
2 participants
  • Andrew Tropin
  • Liliana Marie Prikler
Owner
unassigned
Submitted by
Liliana Marie Prikler
Severity
normal
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 16:36
(address . guix-patches@gnu.org)
cover.1694270165.git.liliana.prikler@gmail.com
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
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 16:29
[PATCH emacs-team 2/5] gnu: Add emacs-next.
(address . 65841@debbugs.gnu.org)
f65a727cb3f67970a9403f91a15c9b47da0796d8.1694270165.git.liliana.prikler@gmail.com
* gnu/packages/emacs.scm (emacs->emacs-next, emacs-next): New variable.
---
gnu/packages/emacs.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)

Toggle diff (38 lines)
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
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 12:40
[PATCH emacs-team 1/5] gnu: Add emacs-next-minimal.
(address . 65841@debbugs.gnu.org)
1aa5537dfe8bb1ce614fd3577f0f93dc63fc00b4.1694270165.git.liliana.prikler@gmail.com
* gnu/packages/emacs.scm (emacs-next-minimal): New variable.
---
gnu/packages/emacs.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

Toggle diff (30 lines)
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
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 16:30
[PATCH emacs-team 3/5] gnu: Add emacs-next-pgtk.
(address . 65841@debbugs.gnu.org)
cef9f37999f321905b9e135fef104e65de1e5a0b.1694270165.git.liliana.prikler@gmail.com
* gnu/packages/emacs.scm (emacs-next-pgtk): New variable.
---
gnu/packages/emacs.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
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
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 16:32
[PATCH emacs-team 4/5] gnu: Add emacs-next-pgtk-xwidgets.
(address . 65841@debbugs.gnu.org)
e12610bededc7e106440e4763030f3d3044ec6f0.1694270165.git.liliana.prikler@gmail.com
* gnu/packages/emacs.scm (emacs-next-pgtk-xwidgets): New variable.
---
gnu/packages/emacs.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
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
L
L
Liliana Marie Prikler wrote on 9 Sep 2023 16:33
[PATCH emacs-team 5/5] gnu: Add emacs-next-tree-sitter.
(address . 65841@debbugs.gnu.org)
95ddf01d11bc0085d810e19c6d44c6d06b4fffee.1694270165.git.liliana.prikler@gmail.com
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(+)

Toggle diff (15 lines)
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
L
L
Liliana Marie Prikler wrote on 10 Sep 2023 00:54
(address . control@debbugs.gnu.org)
e3231d5387c93983c039f4172364f743a23b1966.camel@gmail.com
block 65846 by 65841
thanks
A
A
Andrew Tropin wrote on 11 Sep 2023 11:54
(address . liliana.prikler@gmail.com)
875y4havcl.fsf@trop.in
On 2023-09-09 12:40, Liliana Marie Prikler wrote:

Toggle quote (17 lines)
> * 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"?

Toggle quote (18 lines)
> + (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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmT+48oACgkQIgjSCVjB
3rDu2w/+LU4zHYiU3tp0LTKsicBwn2ACCevYCHQKICWtZUxeHjQnvuVJbYRA9vNL
umEjlM/5Mb8F++geu3Lt7bFS/DF5v5JC1dANoYYSTfNDDdYaTNL99JFEbJ8AZCeX
KmTInI3n9bJeg15ap634q+jQv6as0EDHjrlnU4z9WAlVL3UoIWFNq0mDnUnbzrQ8
BZYz87TLzfoF6eJl8ob8wUe0aWaXKXxIiynlIqWfYsWcrvt+jGTZH8fGejWmkGPo
qIicehXJ49kDqwO7CYNOyPF26OZeyaJmDDfNlKAo8R8a0oQAqcPwZFON42Z4QEqe
SNkKxdwYTlKh5e5A+FwuKMo6EEh+mWtXQMa6vEeV3fjVczKyuDEQXwt4vAmyvA1f
woBU8ykalKqfWTHp7GENYC3U0+aJKOtdC/n10bEXF6qmPmFgD00Cs4wfdRKIOQN+
LlWpTwMgIeMi9jQLRn4DTXdHnTT+nyQXNlOidbS0dn3VnNpQb2Jqxz3+6BT2vcP7
bKlWFxWCRagX+J4rPh1SwDVybuYAuxbWoCzsPbc5sQqoDvOd5FPbr5nHesOHbCQQ
ZoDetfQczlHEc3cbPsQtv/kQ8bCpqaqqwRd340ozx/ffHN6KsX9wN0iX6rhZjefb
2HQP9yxTSgvMC2ozpk2NhOGt9cim4YeFpcxmPS6PFT4ODWL/Ri4=
=LegQ
-----END PGP SIGNATURE-----

A
A
Andrew Tropin wrote on 11 Sep 2023 11:57
Re: [bug#65841] [PATCH emacs-team 5/5] gnu: Add emacs-next-tree-sitter.
(address . liliana.prikler@gmail.com)
8734zlav80.fsf@trop.in
On 2023-09-09 16:33, Liliana Marie Prikler wrote:

Toggle quote (5 lines)
> 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 ?

Toggle quote (20 lines)
>
> * 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmT+5G8ACgkQIgjSCVjB
3rAglA/8D1+mHftGCvoLhcN7BUO8wXZqpp8KKKkBrAkCDtiMfoBYDBCh9MSSXstl
jcuMdlgYsGofansJWLLGc1wJIvonV4zP48u8gSfyQUxhSyB7GyyH2Ma+AB6GOzUf
C84jja92N6UR2QK5SIqJ/29NxKRL++5wBPdM0WF6v7bDjqER7WZ1NY5njITEXS7A
+d8A8aAwskuvZL+Vv46aNtdRK3Zy9c7kY0lRuXG4qeI4bSqdqcADMlgu/BaVH16J
FA/sHi+xCHptkusfbTJxe0bH6nzDpypBhoxDxoEy4OAioWJdx9G1ioFzhv5zT+7s
prs0GwpYHkfocTknEI9PyLqM78dY7anru/TpFXFF6I0XbqQYli0wWIo7CiyXNpzL
yOXT8JBlsNQloU8vuYYe8IDhCdH9ZJgkZodd2xDAmf1h55ljY/1FoV42iN6OHsuG
VYgyH5wAyj2S43ZusIRP8mPlNzeZKS63nyQZeU1qvIk3R9EjY8trLQ/QhuWge832
5l3fAeCPwNZXPGNSyiTWeODGPgkIj+ghzbgwp1h6f+1xsMtHqoSkfQmxu9bsosK6
drWy3w9QtqvEZl+fbu/UvTPMf2EeBy9+V15p0jq1uEF90LAZvS8kia/rjd15s14I
Ai02n5ptIebn/vorl+eSzS25wOeE4sE/kNayJvh9IU3pW876DOU=
=PZX8
-----END PGP SIGNATURE-----

A
A
Andrew Tropin wrote on 11 Sep 2023 11:59
Re: [bug#65841] [PATCH emacs-team 0/5] Add emacs-next (generalized)
(address . liliana.prikler@gmail.com)
871qf5av4c.fsf@trop.in
On 2023-09-09 16:36, Liliana Marie Prikler wrote:

Toggle quote (21 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmT+5PMACgkQIgjSCVjB
3rC+7g/9G6wQrQm+o9UaxKBxL7pQ6Ciew0Ti6NGYfLB7AzP9wJpcsN1n2zE1x906
q7mRYwJuv+ry9XM+bqJCEYUhnV2sWdUP8SQ7bE6OdIYnT5pBn6AZLQ/Uwst7/+Nf
QAWlE9weGh9XQc3SAk2NObD7e4D4ICfrKp6rf9kwuGPb+c84nrXdbsOgtMwMZ5OH
rR32Rz3E02Tgt95ugoM3xMCSM36xuKcX5faq5mQ4sM5KrhU/3CHNxtptNo55Jcp+
YldXeUTEo+URWAQKyW/WD0LAvMzKtb6j0EawbXS5CdPgd+h0Eon1iq09akND9DM9
IHI4VnqkOVgCVrfPPbdq+tH+d6dHyxGBs5qpRc4qJ7iXfKpmE5dV/BKGF9sBjT0J
Z7ztNQk7A3YX1VYjoEpNq9YU6Jk0HTyMLPJamG6wXUi8LM5teeYdTmhtz3YNJOeZ
5qTKxN2BETerRADSTb4AGO0d0t0HXtRd3dRWCFf8XGp7f86lUCwSZnKK+B3AKutz
DowfR6clSIzP6C7/EHbUdoRyu67qG5GL0yPnodbuCZR3esWZ1olZ8YwG09RNwyAI
DB42epv5i1eEvVRrRpcErF1crllJ0lkimJOSIWVcuhT0YqaRjROwLFkb4OZguV11
U5PimStCkOHmDml9cRrMZolqHuMj3pbpFDTs69kI97c/AUKD3Lc=
=sAAG
-----END PGP SIGNATURE-----

L
L
Liliana Marie Prikler wrote on 16 Sep 2023 18:10
Re: [bug#65841] [PATCH emacs-team 1/5] gnu: Add emacs-next-minimal.
ff60d5d2cbb881851f90e4b889dcc4a5ed83545a.camel@gmail.com
Am Montag, dem 11.09.2023 um 13:54 +0400 schrieb Andrew Tropin:
Toggle quote (20 lines)
> 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
L
L
Liliana Marie Prikler wrote on 16 Sep 2023 18:11
Re: [bug#65841] [PATCH emacs-team 0/5] Add emacs-next (generalized)
589894613ccdd0e529bc518ebf45c8d8b4654771.camel@gmail.com
Am Montag, dem 11.09.2023 um 13:59 +0400 schrieb Andrew Tropin:
Toggle quote (25 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 65841@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 65841
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch