unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Declan Tsien <declantsien@riseup.net>
To: 61139@debbugs.gnu.org
Subject: [bug#61139] [PATCH] gnu: emacs-next: Enable tree-sitter support.
Date: Sun, 29 Jan 2023 14:10:50 +0800	[thread overview]
Message-ID: <87a6217tw5.fsf@riseup.net> (raw)


[-- Attachment #1.1: Enable tree-sitter support. --]
[-- Type: text/x-patch, Size: 2574 bytes --]

From d51a7e7812beec431e79164efe9d7cb87341674e Mon Sep 17 00:00:00 2001
From: Declan Tsien <declantsien@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@jackhill.us>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Declan Tsien <declantsien@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


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

             reply	other threads:[~2023-01-29  6:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-29  6:10 Declan Tsien [this message]
2023-01-29 15:26 ` [bug#61139] [PATCH] gnu: emacs-next: Enable tree-sitter support Luis Henrique Gomes Higino
2023-01-29 16:17   ` [bug#61139] Subject: [PATCH v2] " Declan Tsien
2023-01-29 17:47     ` Luis Henrique Gomes Higino
2023-01-30  2:02       ` [bug#61139] [PATCH v3] " Declan Tsien
2023-02-04  4:51 ` Andrew Tropin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87a6217tw5.fsf@riseup.net \
    --to=declantsien@riseup.net \
    --cc=61139@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).