[bug#63568] [PATCH 0/2] Update emacs-next to 29.0.91

[bug#63568] [PATCH 0/2] Update emacs-next to 29.0.91

[Liliana Marie Prikler]

Hi Guix,

this series updates emacs-next to 29.0.91 and also rebases
emacs-next-tree-sitter on top of it.  After going through with this
change, I think we in the Emacs team ought to start making preparations
for the release of 29.1, including all the build-system fixes etc.
we plan for this cycle.

Cheers

Liliana Marie Prikler (2):
  gnu: emacs-next: Update to 29.0.91.
  gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

 gnu/packages/emacs.scm | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)


base-commit: 5b700945fb0b33eec410de8979cae2fbf0d4f118
-- 
2.40.1

[bug#63568] [PATCH 1/2] gnu: emacs-next: Update to 29.0.91.

[Liliana Marie Prikler]

* gnu/packages/emacs.scm (emacs-next): Update to 29.0.91.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index abd62af75a..31009ac4d9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -394,7 +394,7 @@ (define-public emacs-next
   (package
     (inherit emacs)
     (name "emacs-next")
-    (version "29.0.90")
+    (version "29.0.91")
     (source
      (origin
        (inherit (package-source emacs))
@@ -409,7 +409,7 @@ (define-public emacs-next
                                 "emacs-native-comp-driver-options.patch"))
        (sha256
         (base32
-         "1lmw3fa6c5w5d6cvk8vdqvqn67hm5lcxy9xykmvcgx258vs7x975"))))
+         "09jm1q5pvd1dc0xq5rhn66v1j235zlr72kwv5i27xigvi9nfqkv1"))))
     (inputs
      (modify-inputs (package-inputs emacs)
        (prepend sqlite)))
-- 
2.40.1

[bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

[Liliana Marie Prikler]

* gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]: Inherit
fields from emacs-next.
---
 gnu/packages/emacs.scm | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 31009ac4d9..7831a24922 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -418,28 +418,14 @@ (define-public emacs-next
        (prepend autoconf)))))
 
 (define-public emacs-next-tree-sitter
-  (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
-        (revision "0"))
-    (package
-      (inherit emacs-next)
-      (name "emacs-next-tree-sitter")
-      (version (git-version "30.0.50" revision commit))
-      (source
-       (origin
-         (inherit (package-source emacs-next))
-         (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
-           "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
-      (inputs
-       (modify-inputs (package-inputs emacs-next)
-         (prepend sqlite tree-sitter)))
-      (synopsis "Emacs text editor with @code{tree-sitter} support")
-      (description "This Emacs build supports tree-sitter."))))
+  (package
+    (inherit emacs-next)
+    (name "emacs-next-tree-sitter")
+    (inputs
+     (modify-inputs (package-inputs emacs-next)
+       (prepend sqlite tree-sitter)))
+    (synopsis "Emacs text editor with @code{tree-sitter} support")
+    (description "This Emacs build supports tree-sitter.")))
 
 (define-public emacs-next-pgtk
   (package
-- 
2.40.1

[bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 2228 bytes --]

On 2023-05-18 12:37, Liliana Marie Prikler wrote:

> * gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]: Inherit
> fields from emacs-next.
> ---
>  gnu/packages/emacs.scm | 30 ++++++++----------------------
>  1 file changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 31009ac4d9..7831a24922 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -418,28 +418,14 @@ (define-public emacs-next
>         (prepend autoconf)))))
>  
>  (define-public emacs-next-tree-sitter
> -  (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
> -        (revision "0"))
> -    (package
> -      (inherit emacs-next)
> -      (name "emacs-next-tree-sitter")
> -      (version (git-version "30.0.50" revision commit))
> -      (source
> -       (origin
> -         (inherit (package-source emacs-next))
> -         (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
> -           "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
> -      (inputs
> -       (modify-inputs (package-inputs emacs-next)
> -         (prepend sqlite tree-sitter)))
> -      (synopsis "Emacs text editor with @code{tree-sitter} support")
> -      (description "This Emacs build supports tree-sitter."))))
> +  (package
> +    (inherit emacs-next)
> +    (name "emacs-next-tree-sitter")
> +    (inputs
> +     (modify-inputs (package-inputs emacs-next)
> +       (prepend sqlite tree-sitter)))
> +    (synopsis "Emacs text editor with @code{tree-sitter} support")
> +    (description "This Emacs build supports tree-sitter.")))
>  
>  (define-public emacs-next-pgtk
>    (package

Hi Liliana,

What do you think about moving everything from emacs-next-tree-sitter to
emacs-next and making emacs-next-tree-sitter to be just an alias to
emacs-next and later removing emacs-next-tree-sitter at all?

IMHO, shipping tree-sitter with emacs by default make much sense.

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

[Liliana Marie Prikler]

Am Samstag, dem 20.05.2023 um 11:44 +0400 schrieb Andrew Tropin:
> On 2023-05-18 12:37, Liliana Marie Prikler wrote:
> 
> > * gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]:
> > Inherit
> > fields from emacs-next.
> > ---
> >  gnu/packages/emacs.scm | 30 ++++++++----------------------
> >  1 file changed, 8 insertions(+), 22 deletions(-)
> > 
> > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> > index 31009ac4d9..7831a24922 100644
> > --- a/gnu/packages/emacs.scm
> > +++ b/gnu/packages/emacs.scm
> > @@ -418,28 +418,14 @@ (define-public emacs-next
> >         (prepend autoconf)))))
> >  
> >  (define-public emacs-next-tree-sitter
> > -  (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
> > -        (revision "0"))
> > -    (package
> > -      (inherit emacs-next)
> > -      (name "emacs-next-tree-sitter")
> > -      (version (git-version "30.0.50" revision commit))
> > -      (source
> > -       (origin
> > -         (inherit (package-source emacs-next))
> > -         (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
> > -          
> > "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
> > -      (inputs
> > -       (modify-inputs (package-inputs emacs-next)
> > -         (prepend sqlite tree-sitter)))
> > -      (synopsis "Emacs text editor with @code{tree-sitter}
> > support")
> > -      (description "This Emacs build supports tree-sitter."))))
> > +  (package
> > +    (inherit emacs-next)
> > +    (name "emacs-next-tree-sitter")
> > +    (inputs
> > +     (modify-inputs (package-inputs emacs-next)
> > +       (prepend sqlite tree-sitter)))
> > +    (synopsis "Emacs text editor with @code{tree-sitter} support")
> > +    (description "This Emacs build supports tree-sitter.")))
> >  
> >  (define-public emacs-next-pgtk
> >    (package
> 
> Hi Liliana,
> 
> What do you think about moving everything from emacs-next-tree-sitter
> to emacs-next and making emacs-next-tree-sitter to be just an alias
> to emacs-next and later removing emacs-next-tree-sitter at all?
I agree modulo checking supported systems for tree-sitter, but I'd like
to do this on the emacs-team branch rather than master for now.

Cheers

[bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 2849 bytes --]

On 2023-05-20 18:30, Liliana Marie Prikler wrote:

> Am Samstag, dem 20.05.2023 um 11:44 +0400 schrieb Andrew Tropin:
>> On 2023-05-18 12:37, Liliana Marie Prikler wrote:
>> 
>> > * gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]:
>> > Inherit
>> > fields from emacs-next.
>> > ---
>> >  gnu/packages/emacs.scm | 30 ++++++++----------------------
>> >  1 file changed, 8 insertions(+), 22 deletions(-)
>> > 
>> > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
>> > index 31009ac4d9..7831a24922 100644
>> > --- a/gnu/packages/emacs.scm
>> > +++ b/gnu/packages/emacs.scm
>> > @@ -418,28 +418,14 @@ (define-public emacs-next
>> >         (prepend autoconf)))))
>> >  
>> >  (define-public emacs-next-tree-sitter
>> > -  (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
>> > -        (revision "0"))
>> > -    (package
>> > -      (inherit emacs-next)
>> > -      (name "emacs-next-tree-sitter")
>> > -      (version (git-version "30.0.50" revision commit))
>> > -      (source
>> > -       (origin
>> > -         (inherit (package-source emacs-next))
>> > -         (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
>> > -          
>> > "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
>> > -      (inputs
>> > -       (modify-inputs (package-inputs emacs-next)
>> > -         (prepend sqlite tree-sitter)))
>> > -      (synopsis "Emacs text editor with @code{tree-sitter}
>> > support")
>> > -      (description "This Emacs build supports tree-sitter."))))
>> > +  (package
>> > +    (inherit emacs-next)
>> > +    (name "emacs-next-tree-sitter")
>> > +    (inputs
>> > +     (modify-inputs (package-inputs emacs-next)
>> > +       (prepend sqlite tree-sitter)))
>> > +    (synopsis "Emacs text editor with @code{tree-sitter} support")
>> > +    (description "This Emacs build supports tree-sitter.")))
>> >  
>> >  (define-public emacs-next-pgtk
>> >    (package
>> 
>> Hi Liliana,
>> 
>> What do you think about moving everything from emacs-next-tree-sitter
>> to emacs-next and making emacs-next-tree-sitter to be just an alias
>> to emacs-next and later removing emacs-next-tree-sitter at all?
> I agree modulo checking supported systems for tree-sitter, but I'd like
> to do this on the emacs-team branch rather than master for now.
>
> Cheers
>

Agree :)

The patches LGTM.

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#63568: [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.

[Liliana Marie Prikler]

Am Donnerstag, dem 18.05.2023 um 12:37 +0200 schrieb Liliana Marie
Prikler:
> * gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]:
> Inherit
> fields from emacs-next.
> ---
Pushed.