GNU bug report logs - #61139
[PATCH] gnu: emacs-next: Enable tree-sitter support.

Previous Next

Package: guix-patches;

Reported by: Declan Tsien <declantsien <at> riseup.net>

Date: Sun, 29 Jan 2023 06:12:01 UTC

Severity: normal

Tags: patch

Done: Andrew Tropin <andrew <at> trop.in>

Bug is archived. No further changes may be made.

Full log


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

From: Declan Tsien <declantsien <at> riseup.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: emacs-next: Enable tree-sitter support.
Date: Sun, 29 Jan 2023 14:10:50 +0800
[0001-gnu-emacs-next-Enable-tree-sitter-support.patch (text/x-patch, inline)]
From d51a7e7812beec431e79164efe9d7cb87341674e Mon Sep 17 00:00:00 2001
From: Declan Tsien <declantsien <at> riseup.net>
Date: Sun, 29 Jan 2023 13:34:03 +0800
Subject: [PATCH] gnu: emacs-next: Enable tree-sitter support.

* gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-1.2bd0b94.
* gnu/packages/emacs.scm (emacs-next)[propagated-inputs]: Add tree-sitter.
---
 gnu/packages/emacs.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 299ab5e992..ed62f6ec8b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2020 Jack Hill <jackhill <at> jackhill.us>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2022 Declan Tsien <declantsien <at> riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,6 +76,7 @@ (define-module (gnu packages emacs)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages text-editors) ; for tree-sitter
   #:use-module (gnu packages web)       ; for jansson
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml)
@@ -381,12 +383,12 @@ (define* (emacs-byte-compile-directory dir)
     (license license:gpl3+)))
 
 (define-public emacs-next
-  (let ((commit "6adc193ad66445acd84caba6973424ecbd21da26")
-        (revision "4"))
+  (let ((commit "2bd0b9475384adfb4dd2cc794bbe1d8621546717")
+        (revision "1"))
     (package
       (inherit emacs)
       (name "emacs-next")
-      (version (git-version "29.0.50" revision commit))
+      (version (git-version "29.0.60" revision commit))
       (source
        (origin
          (inherit (package-source emacs))
@@ -401,10 +403,13 @@ (define-public emacs-next
                                   "emacs-native-comp-driver-options.patch"))
          (sha256
           (base32
-           "0b48qg9w7fzvhva78gzi3cs2m6asj11fk0kgys49fqhwskigzg1f"))))
+           "0pf2qlbfddpzp38x6rpz0qpadwa3vgrp3dik3a4wr3cdcby98cc3"))))
       (inputs
        (modify-inputs (package-inputs emacs)
          (prepend sqlite)))
+      (propagated-inputs
+       (modify-inputs (package-propagated-inputs emacs)
+         (prepend tree-sitter)))
       (native-inputs
        (modify-inputs (package-native-inputs emacs)
          (prepend autoconf))))))

base-commit: bea22409682f6d1947de7d92f264aad822c2e68c
-- 
2.39.1

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

This bug report was last modified 2 years and 171 days ago.

Previous Next


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