From patchwork Sun Jan 29 16:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Declan Tsien X-Patchwork-Id: 9521 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 3003F27BBEB; Sun, 29 Jan 2023 16:19:31 +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 30C0927BBE9 for ; Sun, 29 Jan 2023 16:19:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMAOX-0008V7-0F; Sun, 29 Jan 2023 11:19: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 1pMAOU-0008Ud-Ax for guix-patches@gnu.org; Sun, 29 Jan 2023 11:19:02 -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 1pMAOU-0003gM-3K for guix-patches@gnu.org; Sun, 29 Jan 2023 11:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMAOT-0003Ag-N1 for guix-patches@gnu.org; Sun, 29 Jan 2023 11:19:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61139] Subject: [PATCH v2] 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 16:19:01 +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.167500908412122 (code B ref 61139); Sun, 29 Jan 2023 16:19:01 +0000 Received: (at 61139) by debbugs.gnu.org; 29 Jan 2023 16:18:04 +0000 Received: from localhost ([127.0.0.1]:45280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMANX-00039S-Uo for submit@debbugs.gnu.org; Sun, 29 Jan 2023 11:18:04 -0500 Received: from mx0.riseup.net ([198.252.153.6]:51400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMANV-00038x-Qm for 61139@debbugs.gnu.org; Sun, 29 Jan 2023 11:18: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 4P4c0z5x7bz9tN6; Sun, 29 Jan 2023 16:17:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1675009075; bh=5guWN8zJ3s5waljgxwkYEV6ODtpNJB3mc583DuWQRFs=; h=From:To:Subject:In-Reply-To:References:Date:From; b=brpWhilt9FlEo7WMgptsI05BGW5u2LWvQITDN4HoZQjiIioDE43MbajzVco6M4mdj Q7kQktF4BuXmiDC52PF9GBUlvQGf9auy1ztv6AzBCL8ksAum98UgcRj59Pm8DrbDEh YHICacemkmOeIKiPhc59xkZiYeH2rjw/Nqc6Rf5g= X-Riseup-User-ID: 02C23518323548C6A03CEE20D2957AA05A4391A932738744641AA609943D6011 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4P4c0z1lDSz5vXJ; Sun, 29 Jan 2023 16:17:55 +0000 (UTC) From: Declan Tsien In-Reply-To: <87fsbte4ds.fsf@gmail.com> References: <87fsbte4ds.fsf@gmail.com> Date: Mon, 30 Jan 2023 00:17:48 +0800 Message-ID: <87ilgpuxg3.fsf@riseup.net> MIME-Version: 1.0 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 Hey Luis > > Revision numbers start at 0 if I'm not mistaken. > Good to know. Thanks. > > Is there any reason for tree-sitter to be added as a propagated > input? It does not provide any binaries and I tested changing it > to a normal input and c-ts-mode worked fine. > Wired. I tried to put it in the =inputs= earlier today, Emacs failed to find tree-sitter. But it works now. I guess I did something wrong before. Regards, Declan From 1d91c374a325ad8be799cadeb77b4b976b8fbce9 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. --- 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..03182d233b 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 "0")) (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,10 @@ (define-public emacs-next "emacs-native-comp-driver-options.patch")) (sha256 (base32 - "0b48qg9w7fzvhva78gzi3cs2m6asj11fk0kgys49fqhwskigzg1f")))) + "0pf2qlbfddpzp38x6rpz0qpadwa3vgrp3dik3a4wr3cdcby98cc3")))) (inputs (modify-inputs (package-inputs emacs) - (prepend sqlite))) + (prepend sqlite tree-sitter))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf)))))) base-commit: bea22409682f6d1947de7d92f264aad822c2e68c -- 2.39.1