Message ID | 0a4c2da5d3755521710031f094936794a584dc9d.1684406365.git.liliana.prikler@gmail.com |
---|---|
State | New |
Headers | show |
Series | Update emacs-next to 29.0.91 | expand |
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.
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
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
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.
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