From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QB8REjpIgWIydQEAbAwnHQ (envelope-from ) for ; Sun, 15 May 2022 20:36:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UPkOETpIgWKaSAEAG6o9tA (envelope-from ) for ; Sun, 15 May 2022 20:36:42 +0200 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 D8EE8A79A for ; Sun, 15 May 2022 20:36:41 +0200 (CEST) Received: from localhost ([::1]:40476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ6e-0000zg-Jw for larch@yhetil.org; Sun, 15 May 2022 14:36:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ61-0000zF-Uy for guix-patches@gnu.org; Sun, 15 May 2022 14:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ61-0008Ev-Ly for guix-patches@gnu.org; Sun, 15 May 2022 14:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ61-0006TM-Ju for guix-patches@gnu.org; Sun, 15 May 2022 14:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 00/27] gnu: Add tree-sitter for emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.165263975224864 (code B ref 49946); Sun, 15 May 2022 18:36:01 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:35:52 +0000 Received: from localhost ([127.0.0.1]:50624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ5r-0006Sy-MC for submit@debbugs.gnu.org; Sun, 15 May 2022 14:35:52 -0400 Received: from mout.gmx.net ([212.227.17.21]:53373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ5o-0006SY-Jb for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:35:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639742; bh=YOxGyJXU9ED4qspWlvbb5OiLUn3i9zJXiXImC3rff5A=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=jTjl8C5oYY4O/xgfSaafj0P9yHUsGsgwQT/7nNlVVJLlyhMrAd1aeCIiuI1n3OHtb Ko6q87iHfaByS8s90tBr6Iq71N1svH9KOqAtP7rnn4/nNpL922X1WZ7FR40w02L10T yUtPIPQgAnFYCes1jvRaXtkU1ZwYWrwSTiyFMqQg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MD9XF-1nyrfD0GvJ-0097Gg; Sun, 15 May 2022 20:35:42 +0200 References: <877d9s2qa9.fsf@gmx.com> <20220329194318.6106-1-pierre.langlois@gmx.com> User-agent: mu4e 1.6.10; emacs 28.1 From: Pierre Langlois Date: Sun, 15 May 2022 19:28:29 +0100 In-reply-to: <20220329194318.6106-1-pierre.langlois@gmx.com> Message-ID: <87mtfi63ut.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:D4PIDqsWx/sM1A0nVDoTHel4B/KmTCtIUEv49lF1Hh2dFsMDMl+ GmkMXNTkoAzth0IJ+W+mWTKktiMqQlMOXeDReEzaFeJpFUJFuuFl13LN50imyaMt72U8oka iiYa2+rg48Qa6TLsqQSlLqBf661s/P5f97aS1YRMcUgQ7Eb1GJx93lsKxCuZri4hEvZFJwJ vzz9O180aqoRTvDIW9bzw== X-UI-Out-Filterresults: notjunk:1;V03:K0:t2q/AgD2ga4=:jVUK+seK0G7HMdzyXESR1i 7ktG3skuwUO6Df7b0K+ioPukETGcGKccMUDZoNZl5WJiKjzdZD9tp/TGgt7IcLCex5GVxfT7s Nh/tiA/M3iopJcYjxgK6yxIrwTLJUfykkW0zX9Oqv/7EZCMm6vcokbeaJJxKlkfO59fbWS52i DBiIARbCK5W/mCEA8VnHsLjbiciezBEbqp+GXpIk4EVwXm6teuhC/ydc9B44ErZKu+okQOECL GhiwvnzG4C9xficeqsAFFq+ysfF4/BCi6szcuzO3/taXXCnzborv0BQCu1CgtyY166pyLbR6D uQkIsDhR9pEDgpRNxjEegE2xmT5v09B+BmKzuCGOfCw5IG+jipMM5a1oQys1OewVEB3QFVMrr ZFpRY0QFi55nJrTYeeASB2ekhsfRh+T1Xrkuv9t6gD8IHLZXu0jMit4cJqS6EBT/QAI6JOfOD aKjDcMt/aGuHd8anyphGu2hU7rNaBZ6OHJlBF3mLZUaPvcykjD2MzBurPLLHK0TPxL/QJ7cEB Hq8sCXUFO7lVKXBzDJ0MdFE00tcXup+UbmAHq6fxvDYBWerT/7uGqIsfWzCSKc7gbVEqAq0rd 8Mnebnzyb7LDrAEE0uHocdLKH0uSryDbgoSqq24sLmttZPs0hSYd6TABVsr+CSObV0c7Pkd6/ P4oFu8kJhUXo4oxWRCM7FOfMwy7yEAwRyuTEkfvoeHjkyScZEDDSNIwNatFO2ZClmYTlGECb9 e7w6c3tpvhwybkAShF1Rn+ofkLrG6yssd+ESzbqAyAdq0y3DIVYqHZhIAUAvs464m5cf0I3yH Hv4M4tnaMiY5IXsmJMWOWEaa895xbvznzb2NUZEnfwMCuWgzDMWEV91m0hW+pjKkxcYNlTjSA cjYlvLnlXu26nRqCXq586nDxruE0X1zD9rEuk9R8LAfRqwOqp57eNyRBjhV/S1ho1pPJczTVd CAFutpY+1JS2Kdgt7sbTQatx18ZeYvFJeiGXED3Vlu4k+T7dEGIAdygR2MzaYVZgIDp71ktMM 4k8oQJd+BqGf0hX1W2ytvRBa7/8jK65K19GzOjkGZG+sGp1LrmUzTBv5Z+23pAblV7okKfTpD xGdOdd+nC63eM3piHZlclmCcVcNmeXsPW9ajIzfLipg//+NFf9c6t1cHQ== 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652639802; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ABAL+vzIPJMqXQmqJktBog+GbJn5dO4ksZ6WSAry4MU=; b=qOIhPVWQDQAEZ7ep0qOpjqsN83SiG2iDr74HrI5MrabsmpmW0z0zvffKfUAhShUWpsMcVX 0NvNtZ9e8ODDfL+RFbbygdI+Dbuwd2r/XQJJOssMKKeyXNXMfYW+GJjXBpTXOE8RTrlz7A 7j0D4aGThggJmbv/Edyt1buHk2dl/txd3qxiE0Evnpl/DdKWuXpTBNGwlUv2ohdBXJeIiz QsSYVT8LB+9UOYeZM8NvbzdGCLpmMsxSDplYcUj6AQGVV6+bxE7fJ0XIPXT/zR8J/QkIkm wu27cP9VjZfI61TwN+Rl9GHh+D1Ga9MRcs1EAYRvKcXhVFEFYFsqKKz8uMrfFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652639802; a=rsa-sha256; cv=none; b=h4YMSKNRQwGL+ZAf6YALkRl/+pXRt79wJdv/+4BP4fV1vFG+1FBXFGkiJkJ3vKXTpys8jr WpHEvdLfpvYm9E/0N4LDgemzLCoWKc/yMydR8PFNBcV9l0gx/G9P02he2UrxRBBknxfcp8 jWQ69Zx5UZ0PlYzigD8QXI/lO5Wz/lXPhsBPOaFVHyC5tPIERli06xjr0hC/xwr4T1FN/l e6JHN4P9zFAFtcMA301LIfWUOnVDXQJPL0IN25LvgtUgG+k9Rtln+oIfdyNSBoL6g59RWt xGWRAnczteyGHfp+5+D+n2W4bBLEyiKs4X9Pit/Tbtfz+K+ZLRg7s8p7mCVoQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=jTjl8C5o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (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-Spam-Score: 3.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=jTjl8C5o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (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: D8EE8A79A X-Spam-Score: 3.97 X-Migadu-Scanner: scn0.migadu.com X-TUID: JnVRGAkVyBbu --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Guix! Here's a v6 of the tree-sitter for emacs series. Changes are: =2D Rebased on master. =2D Updated typescript grammar to 0.20.1. =2D Remove code that downloads binaries from emacs-tree-sitter and emacs-tree-sitter-langs. It's no longer possible to change the source of grammars used by the package, and will now only use Guix-provided ones. Given this behaviour is different from upstream, we also emit a message when grammars are loaded: =2D-8<---------------cut here---------------start------------->8--- tree-sitter-langs: Grammar bundle already installed via Guix. Installing external grammars via this function isn't supported, if a language you need is missing please report a bug at bug-guix@gnu.org. =2D-8<---------------cut here---------------end--------------->8--- I also pushed this series to a branch on https://gitlab.com/planglois/guix/-/tree/emacs-tree-sitter in case that's useful for testing.=20 Thanks! Pierre Pierre Langlois (27): gnu: tree-sitter: Move to its own module. gnu: Add tree-sitter-cli. build-system: Add tree-sitter-build-system. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-bash. gnu: Add tree-sitter-css. gnu: Add tree-sitter-c-sharp. gnu: Add tree-sitter-elixir. gnu: Add tree-sitter-elm. gnu: Add tree-sitter-go. gnu: Add tree-sitter-html. gnu: Add tree-sitter-java. gnu: Add tree-sitter-javascript. gnu: Add tree-sitter-json. gnu: Add tree-sitter-julia. gnu: Add tree-sitter-ocaml. gnu: Add tree-sitter-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-ruby. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. gnu: Add rust-tree-sitter. gnu: Add rust-tree-sitter-for-emacs. gnu: Add emacs-tree-sitter-core. gnu: Add emacs-tree-sitter. gnu: Add emacs-tree-sitter-langs. Makefile.am | 2 + doc/guix.texi | 21 +- gnu/local.mk | 2 + .../rust-tree-sitter-text-provider-fix.patch | 98 ++ gnu/packages/text-editors.scm | 52 - gnu/packages/tree-sitter.scm | 947 ++++++++++++++++++ gnu/packages/vim.scm | 1 + guix/build-system/tree-sitter.scm | 190 ++++ guix/build/tree-sitter-build-system.scm | 153 +++ 9 files changed, 1413 insertions(+), 53 deletions(-) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix= .patch create mode 100644 gnu/packages/tree-sitter.scm create mode 100644 guix/build-system/tree-sitter.scm create mode 100644 guix/build/tree-sitter-build-system.scm =2D-=20 2.36.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKBR/oYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UCIwH+gKSBEStZ9vr7i3FJN+93nl2 mrqSpvXfFYpJM+VQpYUrCzk63x6drKwt72rB5AYFXEAKVC0uLGNwJII1jMpFqpQP nM279qo4xGYsapRCqWvHnu61RaFIrgRkJANOOBCc14w+AXn5HsT8tz+75cVL7kwE DtpVRBb/espvDyVH43mbiRpc91L7d6XzgAlgZqzKJlpnSX9VDTP6vooRvXeumQ4T UqdCCQru8aIJIoQvqBcwmz3SCP0zS0g690a8YCHYK3gB7eUP8h+EU2r/0LSz5yXG n/UzswwVn3x93CnoWkFB42eSrfQkI1xFusJZlBEBQkOv5XJD0DfzqO0O15zlz5U= =+zvP -----END PGP SIGNATURE----- --=-=-=--