From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4OuyJmIl12NCeQAAbAwnHQ (envelope-from ) for ; Mon, 30 Jan 2023 03:03:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CA7OJWIl12Nx2QAAG6o9tA (envelope-from ) for ; Mon, 30 Jan 2023 03:03:14 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6757521C73 for ; Mon, 30 Jan 2023 03:03:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMJVh-0008Aj-AT; Sun, 29 Jan 2023 21:03: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 1pMJVe-0008A9-Fe for guix-patches@gnu.org; Sun, 29 Jan 2023 21:03: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 1pMJVe-0004cA-78 for guix-patches@gnu.org; Sun, 29 Jan 2023 21:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMJVe-0001Ec-2R for guix-patches@gnu.org; Sun, 29 Jan 2023 21:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61139] [PATCH v3] gnu: emacs-next: Enable tree-sitter support. Resent-From: Declan Tsien Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 02:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61139@debbugs.gnu.org, Luis Henrique Gomes Higino Received: via spool by 61139-submit@debbugs.gnu.org id=B61139.16750441724731 (code B ref 61139); Mon, 30 Jan 2023 02:03:02 +0000 Received: (at 61139) by debbugs.gnu.org; 30 Jan 2023 02:02:52 +0000 Received: from localhost ([127.0.0.1]:45678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMJVU-0001EF-8X for submit@debbugs.gnu.org; Sun, 29 Jan 2023 21:02:52 -0500 Received: from mx1.riseup.net ([198.252.153.129]:58656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMJVS-0001E0-1P for 61139@debbugs.gnu.org; Sun, 29 Jan 2023 21:02:50 -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 mx1.riseup.net (Postfix) with ESMTPS id 4P4rzY25PZzDqP6; Mon, 30 Jan 2023 02:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1675044164; bh=3yYQE0bu8C429iD4DY1DbkK5lE0CAC2WSGjEkwP2Aoo=; h=From:To:Subject:In-Reply-To:References:Date:From; b=D7ApOL8JyQQJhM8McIgOIxnPCzgBa+Gy7yAcIoApTwJyHG0UQRfie0I8Gt1vLtxcd lPXcFchySOeJyk6EEcRRsiRFJRVVyN9r3cIlSqxtRnJ0/t09rDqdPgRWcJd1+AE6d1 yk7IKwI9vrB12Fzt7w9Lb3Ytz8hDrtCqCu83wOIw= X-Riseup-User-ID: E881C3F5C2E30AE7AAF3049A0BF25711A92CDC632BF4E18112E3527BBD964F39 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4P4rzX4sMMz5vXV; Mon, 30 Jan 2023 02:02:32 +0000 (UTC) From: Declan Tsien In-Reply-To: <878rhldyay.fsf@gmail.com> References: <87fsbte4ds.fsf@gmail.com> <87ilgpuxg3.fsf@riseup.net> <878rhldyay.fsf@gmail.com> Date: Mon, 30 Jan 2023 10:02:26 +0800 Message-ID: <87fsbsvky5.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675044194; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=ZbDSwVOMcINAkLZZ8h+MovJenVej2g1gZHN+B10txsQ=; b=J/8qLPlkdPXAsZLUTsSp1HfnW003VFrvH56ISfI7etqkUme/4QIoPLY4VpAZBpkWkufWLl PZMphTXx8KAQ3f9nGmDcdVJ8v2IH08jeTXXVCS7GIqryWkUgbaBRcF24KrZdbAKonRZ27I Ue/dvmw5sXgAguIP/jfcUS9IomXU5KYDlPbgT38CRvDezkXcqSp5BJYg2GdCh8QEvmG0qv x3gTQnOJjQimyrHWeyClr63u1bucGvQmSGybkYbpycxsNlbb7sUXmL10k2T7ASCT2z7rNp Ayh2U9dco74sXjUlY1X5Eik9H3geAkmOpICJIktpd06fkvrfyVCMDmbOwsG02w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=D7ApOL8J; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675044194; a=rsa-sha256; cv=none; b=jfLlsVh8/iBmarI6kLXNp4ZkULNPw1EjeaM0i8OcsmevePbGIMqTZKG48dyeK9+PDQRAai FuGUxjpvTUE1gTR8+mks73IJMXY48AX5mrtbPixTnoYQR5IIQwGEU/cjUJZzuHpn7ZYvDo b4GdysKWvmo8dA4QM7zo9aj2dXiVH6G8A+NNZGYo4ZAtxHVxgUACKm7jny+pSJfItCSmBJ 0U2URbhIwj9AYkrKMjtp/AsfgssI8ezl1Il6jmse9MpJuP+OOB5cjgbTwp9G6rLgo26bc4 rqzz9X7PrkCi++rP2/fJIvB7LZQLuXiYR7fjdTw3r5/Ia4ifE+wAsDos3nbAuw== X-Spam-Score: 3.72 X-Migadu-Spam-Score: 3.72 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=D7ApOL8J; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6757521C73 X-Migadu-Scanner: scn1.migadu.com X-TUID: kYZQfN41KDO1 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hey Luis, Luis Henrique Gomes Higino writes: > Hi Declan, > > tried your newest patch and it LGTM. The only problem I see now is=20 > that your copyright's year is wrong haha. > > Regards, > --=20 > Luis H. Higino Whops, fixed the year. Regards, Declan --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-emacs-next-Enable-tree-sitter-support.patch Content-Transfer-Encoding: quoted-printable Content-Description: Enable tree-sitter support for emacs-next From=208ffd29a3fb7d07630a3971d47feb765e9f99ee4d 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-0.2bd0b94. * gnu/packages/emacs.scm (emacs-next)[inputs]: Add tree-sitter. =2D-- gnu/packages/emacs.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 299ab5e992..e21d6f7954 100644 =2D-- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -23,6 +23,7 @@ ;;; Copyright =C2=A9 2020 Jack Hill ;;; Copyright =C2=A9 2020 Morgan Smith ;;; Copyright =C2=A9 2022 Zhu Zihao +;;; Copyright =C2=A9 2023 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+))) =20 (define-public emacs-next =2D (let ((commit "6adc193ad66445acd84caba6973424ecbd21da26") =2D (revision "4")) + (let ((commit "2bd0b9475384adfb4dd2cc794bbe1d8621546717") + (revision "0")) (package (inherit emacs) (name "emacs-next") =2D (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,10 @@ (define-public emacs-next "emacs-native-comp-driver-options.patch"= )) (sha256 (base32 =2D "0b48qg9w7fzvhva78gzi3cs2m6asj11fk0kgys49fqhwskigzg1f")))) + "0pf2qlbfddpzp38x6rpz0qpadwa3vgrp3dik3a4wr3cdcby98cc3")))) (inputs (modify-inputs (package-inputs emacs) =2D (prepend sqlite))) + (prepend sqlite tree-sitter))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf)))))) base-commit: bea22409682f6d1947de7d92f264aad822c2e68c =2D-=20 2.39.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmPXJTIXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vXZSQwAyzItrdweKjdZcWptuVHF2lhM dZyvFt7YloTzNT275yO6+cOnYRBnGcJZxsLvW5MI/ndn+DWvK81z7h6/HtgtbinS k5Wdxej2Iu4FPpUcA4APYq5pKJwv0LWnRYYI6qOrT5NU7uWS7GjR42cjtkrIEBdc /HDEUnP4QwGtK2mgZ6VbvMAv94L9JdnTzwKa65howMTCCsjikcYfrwaAuxyBC3gp oc9yuGVG6kRn+7+Ay/gCo7T8WVUfAKOocVyZIoEgJFGvWiSIOq47ZKb2pZiuuY7T lecV8MNSATezc3aBMgD5t6IwbPaiEU09DCvTw9qnvPJxZz+HSoYMusMim1lWKnUM WjyzeyUxc4O0AlOC++QjZRloyN1VOvWznv0fxBB+LIl8MSdMLQlWj4JuIDS53ibC QBPnS/l9sxaDsBNg7+Ue+fnuSwqKgNklEZsiu6QC4IoanRZg0PWHHXMLxxKVw92m KsEHAObJLa6xbhUhzoszubJgqtsfc5L+NKmvmgNr =FlTX -----END PGP SIGNATURE----- --==-=-=--