From patchwork Sun Jan 29 06:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Declan Tsien X-Patchwork-Id: 46505 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B238527BBEB; Sun, 29 Jan 2023 06:12:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1B22C27BBE9 for ; Sun, 29 Jan 2023 06:12:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pM0v9-000661-5E; Sun, 29 Jan 2023 01:12:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pM0v4-00065Y-Nz for guix-patches@gnu.org; Sun, 29 Jan 2023 01:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pM0v4-00043n-FH for guix-patches@gnu.org; Sun, 29 Jan 2023 01:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pM0v4-0003n1-6n for guix-patches@gnu.org; Sun, 29 Jan 2023 01:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61139] [PATCH] gnu: emacs-next: Enable tree-sitter support. Resent-From: Declan Tsien Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Jan 2023 06:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61139@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167497266714365 (code B ref -1); Sun, 29 Jan 2023 06:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jan 2023 06:11:07 +0000 Received: from localhost ([127.0.0.1]:42008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM0uA-0003jd-Qm for submit@debbugs.gnu.org; Sun, 29 Jan 2023 01:11:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:37002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM0u6-0003jR-Ki for submit@debbugs.gnu.org; Sun, 29 Jan 2023 01:11:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pM0u6-00061Y-Dn for guix-patches@gnu.org; Sun, 29 Jan 2023 01:11:02 -0500 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pM0u4-0003xL-Eq for guix-patches@gnu.org; Sun, 29 Jan 2023 01:11:02 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4P4LXd5Wktz9rxg for ; Sun, 29 Jan 2023 06:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1674972657; bh=tBwGAzucwFweYFEouxCK+74N+GlJJ1fwdtJNdFU0glI=; h=From:To:Subject:Date:From; b=HPu0BkZKdq1gKjbx9vO4WQ67O2abHepmtp9hJXAMXAGRqNFFq/rl50V+J51tFpj+y 5L0PDi+JM00D688J6qvvADD3NPuGJjtUyy2JzmcRcpzkOC9Gr4B2VwDwUWFYAky9It IERoaBTmPNUrCdwYFsVf4i/ycSOiXSzONMzUFdkA= X-Riseup-User-ID: 62A521012D4AFB42EABA24BB9361D7AEA2A2B3465B89A9C6AB2DAB76EF1867BD Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4P4LXd2Tsqz5vRK for ; Sun, 29 Jan 2023 06:10:57 +0000 (UTC) From: Declan Tsien Content-Description: Enable tree-sitter support. Date: Sun, 29 Jan 2023 14:10:50 +0800 Message-ID: <87a6217tw5.fsf@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.6; envelope-from=declantsien@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From d51a7e7812beec431e79164efe9d7cb87341674e Mon Sep 17 00:00:00 2001 From: Declan Tsien 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 ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Declan Tsien ;;; ;;; 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