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

Previous Next

Package: guix-patches;

Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Date: Thu, 18 May 2023 12:05:01 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to andrew <at> trop.in, guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Thu, 18 May 2023 12:05:01 GMT) Full text and rfc822 format available.
Acknowledgement sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
New bug report received and forwarded. Copy sent to andrew <at> trop.in, guix-patches <at> gnu.org. (Thu, 18 May 2023 12:05:02 GMT) Full text and rfc822 format available.

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 0/2] Update emacs-next to 29.0.91
Date: Thu, 18 May 2023 12:39:25 +0200

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
Information forwarded to andrew <at> trop.in, guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Thu, 18 May 2023 12:28:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 63568 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.
Date: Thu, 18 May 2023 12:37:51 +0200

* 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
Information forwarded to andrew <at> trop.in, guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Thu, 18 May 2023 12:28:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 63568 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: emacs-next: Update to 29.0.91.
Date: Thu, 18 May 2023 12:06:58 +0200

* 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
Information forwarded to guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Sat, 20 May 2023 07:45:02 GMT) Full text and rfc822 format available.

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

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 63568 <at> debbugs.gnu.org
Subject: Re: [bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter:
 "Downgrade" to 29.0.91.
Date: Sat, 20 May 2023 11:44:50 +0400

[Message part 1 (text/plain, inline)]
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

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Sat, 20 May 2023 16:32:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andrew Tropin <andrew <at> trop.in>, 63568 <at> debbugs.gnu.org
Subject: Re: [bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter:
 "Downgrade" to 29.0.91.
Date: Sat, 20 May 2023 18:30:54 +0200

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
Information forwarded to guix-patches <at> gnu.org:
bug#63568; Package guix-patches. (Sun, 21 May 2023 06:09:01 GMT) Full text and rfc822 format available.

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

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 63568 <at> debbugs.gnu.org
Subject: Re: [bug#63568] [PATCH 2/2] gnu: emacs-next-tree-sitter:
 "Downgrade" to 29.0.91.
Date: Sun, 21 May 2023 10:07:59 +0400

[Message part 1 (text/plain, inline)]
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

[signature.asc (application/pgp-signature, inline)]
Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sun, 28 May 2023 21:18:01 GMT) Full text and rfc822 format available.
Notification sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
bug acknowledged by developer. (Sun, 28 May 2023 21:18:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 63568-done <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.
Date: Sun, 28 May 2023 23:17:33 +0200

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.
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 26 Jun 2023 11:24:08 GMT) Full text and rfc822 format available.
This bug report was last modified 1 year and 320 days ago.

Previous Next

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