GNU bug report logs - #49946
[PATCH 00/31] Tree-sitter, node-gyp addon support and emacs-tree-sitter
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches;
Reported by: Pierre Langlois <pierre.langlois@HIDDEN>;
Keywords: patch; dated Sun, 8 Aug 2021 23:27:01 UTC;
Maintainer for guix-patches is
guix-patches@HIDDEN.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 12:29:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 07:29:36 2023
Received: from localhost ([127.0.0.1]:44284 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pRBU7-0000Bo-Og
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:29:36 -0500
Received: from mout.gmx.net ([212.227.17.20]:38875)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pRBU6-0000BO-8h
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:29:34 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MzhnN-1oepza017R-00vfTl; Sun, 12
Feb 2023 13:29:27 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87fsbdo34v.fsf@HIDDEN> <87h6vrfldq.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Sun, 12 Feb 2023 12:29:09 +0000
In-reply-to: <87h6vrfldq.fsf@HIDDEN>
Message-ID: <87mt5jkqxq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:zH2QhKvNQIoClZFbEwA76gR9bvdzJxxK4vzgoY3RfIC7cUfqlsI
uRz41ROZPQpR1r43agLYKXaLKTeezv6cPcDtJ0s29tGQ2UEzRu49sQxUMvRxcLAfiQ+j3vz
vDnh6UD7Umzf7yrImZNDAB5HRKsxVJF0+zZs2jQ8oWiMUvYxW0Jk/nSJF7Ag/7kOGTHxibL
2mzIp+7UM+FLIYc+cxdvw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:efCNzefh5rc=;tUhPzMtd4QND90LSeNUARgVL4pD
hlamvk0TUzZ0b47kYF1+uwqYN3uky4s7ESxRuaAiTOESf77nD2x/cHFwqE+cOavNf3Y3gH9jo
R+WEclD2fCJVM8hqfs8YO7SD3Nnyg3Km7lQc5Gv1da69rW8EE39pOkQEVTclGARfwlfPzggc2
tZRoPq9cLHGcsa4pvoDsBAt2i6Pa/RsjNA0OV3YtRl7TOX9rtJUUUqjptigdPyi65MFztMIci
eM5VyybuqggG//AAVUUnKC9CWmnYIhljNbTMaMFoGFJZ0cfvAwrItZh8p7WzyeeaDRfUdeGpu
rdBT1dEoq481TCgmvmFp4EhKvupnNzTHG/cHNpbMq1zX11nmCZjcZXUYLn6LMP9iuYSc1+P/6
C9/Cilo7u+uRtwRIwsD4Nrbxp8C1WcXjlyk7sI4fRxSiPyzKf3LEtS7nPc1qAC4KQAh+JnUmg
J9CUWD+vYJASocAJHMHGTZsIskSF9axT+PEqgGDi5ADr3sfE06+pyroRUPX9KHNxuMXM8PkYN
jebYu8SHOOEwqvIkqUZaw466GXEIAIx9q2VvNzk2IKFhGvf+V996I3a77H8HNU/ek3CVlyoSO
5Mcl+HHBGjbYVAPc+4ORFkoTkF1a+jo+0rNQyvR+dUXSCKMfr4feN8PbhOzBJLf2Ilhll9hmb
zY8CDnozvMiAoi06tqlFUd60h/9+Licnk9Dn5nH9qKoF2AqNyCzj9N31ZDi/qzA4EhyVaWtfT
Bfock7JcnuLwRiZT+hdk8c/4RtoUn8BRd88Xu+t2IRjZWHtgy0X1w8TBta+5bcqIvJHe7fsgI
FOuUJw1ngHW2kuF+h/VDgbNmrhL0AWzrOGX9rhBWTbCCzzktnSAIxB5z5OXIhf53CGIgcnWxH
cWQFVbAOiSBnd0mHRjPtq6dU05WnZun5lhQgiC+4kmWRD69QKoZY6SzV8a7KajE+kzDe1iwEG
ItBhDhRo9Jvjpa2cDMkk1+kT9fM=
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2023-02-10 17:04, Pierre Langlois wrote:
>
>> Hi,
>>
>> Andrew Tropin <andrew@HIDDEN> writes:
>>
>>> [[PGP Signed Part:Undecided]]
>>> On 2023-02-09 13:39, zimoun wrote:
>>>
>>>> Hi,
>>>>
>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>
>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>
>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>> right?
>>>>
>>>>
>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>
>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>
>>>> Leaving out all the others, right?
>>>
>>> Merged first 5 patches from 01 to 05, also added one more commit, which
>>> addresses some things from reviews and one commit, which adds html
>>> grammar.
>>
>> I had also started rebasing addressing comments on the tree-sitter-cli
>> package, and had a few extra changes left that haven't been pushed.
>>
>> I realised we could remove a now redundant comment, and while enabling
>> *some* tests, I realized we should directly depend on node and dot, so
>> that people may use the `tree-sitter' command, without needing them in
>> the same profile.
>
> Sounds very valid! :)
>
>>
>> What do you think of the following two patches?
>>
>
> I applied them locally and tested, LGTM. Will push them a little later
> with the rest of tree-sitter related changes.
Cool, thanks!
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPo26EYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31Ud0oH/Avlqm9XpD6494RX98u1sdtJ
AAvvQlySa6IDncVeI6PpeFsMDs3F9IcskzmPLcd5N/pTLSMTIjIguImVwWC7wfiB
Vz/KKWwTq9gMx4lBRPQweULp+M7ATP+Y7fHj8u8/KZCrAVr49T6LrfP2ZVc+VktP
sM2nJkzVozVxQdoJt4B5lXHvrSHnSNptrdpbwzC+ZjI3jNLRN2ewAMr9CrurJWS6
wcQojyw8E+84/DD7bfajAwMzjOFH4BN4tsL86Z0eIRcsvQRPldWJiyGag4AWhRS3
G2G6XwVKRvYgB7N6PqDHUwyflBYPcvcJ8Cm/T2fYbkdXR1tmFOv172+zvqxIQsY=
=557e
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 12:28:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 07:28:07 2023
Received: from localhost ([127.0.0.1]:44280 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pRBSg-00009J-NX
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:28:07 -0500
Received: from mout.gmx.net ([212.227.17.21]:42841)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pRBSd-00008o-Kf
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:28:05 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MF3HU-1pKapQ0rcm-00FSJS; Sun, 12
Feb 2023 13:27:56 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN> <87o7q1qzol.fsf@HIDDEN>
<87v8k9o3iz.fsf@HIDDEN> <87k00nfmfp.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Sun, 12 Feb 2023 12:24:33 +0000
In-reply-to: <87k00nfmfp.fsf@HIDDEN>
Message-ID: <87r0uvkr06.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:HtMH5cDPER3o9U8m/dVKXrYIj+1ZjR0H6ysx/JRn1/DQRYEe95n
n6vLzNL2v0aa7/7Vqn3hT988Z6Zp4SvJiw5haUqj2mrQNF9lG95vBfRHVUEvHTso3KKVW8n
ArdO2hxiKlqn6WsLgN4wHhdtUb6aRwIEbW18ageXpiMgqeIuJh2m+vKFdPXS/lJRe/NX4Gp
jJbnzKEzhNyiltWfsvp/g==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:Loy5wRglIBk=;yn2LsiSSEDmjvinjZRwnO0cAX7N
tc1fZBEMHuuXnWSfbAavueeXUCAbW7ksrXnQVLk8ezwR8pPu9CV2ZcpwMCK0BNZ5KjJuFwhR0
WU+60vHB/qUQvwYEFwVDlb1fL7Ux2jG3jtEjGx9wtC0QeGXQf/l/E4iZ0eg/ppTBqnYDLfuwM
eQySKgyqFijbYF0JHFsn5ZMlIDaVwS5dKJpAJA4fLS3WIl8D201g+NpzH64EmM0tF6i2aU2Gt
YHSZ2g69OO+d6KKFVVno4nyeuaTHWQTT5uazsCdXnBMIsYrIHxx0Nba35XdWFeWvfHrL+CwHF
Xj27ORlTRSymYk7CEdh98WKsBKze/kIpE32zx0gTtwjQ3DXAepeOfFQQIMMJI2b7Je8PjVPeb
O+OoIZua+UyLK2HUH+llSG2MzTSVGEs8So910IlzAODRA+HDewXDXznP5d6ilklRF6EDteMLA
WkwtW8KRbCEHTz+5F9auKK+nLbM5BBbGS6bl+c0gCxIPD93HognzOlVQ28qQ0rcbpzvevApw8
VTAFMNbWKDR1RcGBmLsbDBp5A066Gdqz2E1/YPTcnyR0P94d/kL/9KW/6cc5kYejP+gOdefsM
AKAxwHriJKJe9FKqmo5f/1+aa8c8hpu8w/Qb02FzfmxZr4XNLRTsgKbH+EufvISrt5rRN2swK
6Xo8es8Sir0MgGDf+xmnFbCiLA0Lq8/VnD4WFPfv4FgO1cBEIMK116qec/Y/WCDfopLEqgXMv
6fjzzwrNOioWQsAmjNg5OYDlXYIsjqlhCC/52vosOd66tr/68UAe2ajqh+Omhvo76xfBObZgl
j1KCxVkrmc0b9THYQF3xm2I2+/d+okM+qsdT8biu8l7GztYBdWXpnTYY7ZLLRTCbUglTwEAb7
ihx7ELzRVXFFUYCE0tiiecQgl2XtknyNQjTntiqBUHpbdIMIYeKcY/Oh1mUNH6CNdjzDPuI2z
LcyF4mOCMj9waok6e4VXoUfLodE=
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2023-02-10 17:02, Pierre Langlois wrote:
>
>> Pierre Langlois <pierre.langlois@HIDDEN> writes:
>>
>>> [[PGP Signed Part:Undecided]]
>>> Hi Andrew, thanks for pushing this along! It's great to see things
>>> getting merged.
>>>
>>> Andrew Tropin <andrew@HIDDEN> writes:
>>>
>>>> [[PGP Signed Part:Undecided]]
>>>> On 2023-02-09 18:04, Andrew Tropin wrote:
>>>>
>>>>> On 2023-02-09 13:39, zimoun wrote:
>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>>>
>>>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>>>
>>>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>>>> right?
>>>>>>
>>>>>>
>>>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langl=
ois@HIDDEN
>>>>>>
>>>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langl=
ois@HIDDEN
>>>>>>
>>>>>> Leaving out all the others, right?
>>>>>
>>>>> Merged first 5 patches from 01 to 05, also added one more commit, whi=
ch
>>>>> addresses some things from reviews and one commit, which adds html
>>>>> grammar.
>>>>>
>>>>> The html grammar is added for the testing purposes. It relies on
>>>>> generated parser.c and scanner.c and we will need to repackage it usi=
ng
>>>>> grammar.js instead. I'm not sure if a separate build system is needed
>>>>> for this, I guess we can just rewrite tree-sitter-grammar function,
>>>>> which generates packages as in example with tree-sitter-grammar-html:
>>>>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sit=
ter.scm?h=3D53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>>>>
>>>>> Anyway, I only skimmed tree-sitter-build-system source code, and plan=
to
>>>>> read it carefully, evaluate and either introduce new build system or
>>>>> just move all needed parts to tree-sitter-grammar function. WDYT?
>>>>> After we done with it we can package all other grammars.
>>>>
>>>> Ok, I realized that the proper build process for tree-sitter grammars =
is
>>>> a little harder than I expected, tree-sitter-build system make sense. =
I
>>>> reviewed it, made a small change:
>>>
>>> Ah great, I was going to comment to try and push for us to keep the
>>> build system. I originally went with a template package and inheritance,
>>> but Maxime suggested moving to a build-system which ended up making the
>>> package definitions a *lot* nicer IMO (see previous discussion here
>>> https://issues.guix.gnu.org/49946#144). It also allows us to deal with
>>> grammars that depend on each other more nicely I think.
>>>
>>>>
>>>> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
>>>> ;; Commentary:
>>>> ;;
>>>> ;; Build procedures for tree-sitter grammar packages. This is the
>>>> -;; builder-side code, which builds on top fo the node build-system.
>>>> +;; builder-side code, which builds on top of the node build-system.
>>>> ;;
>>>> ;; Tree-sitter grammars are written in JavaScript and compiled to a n=
ative
>>>> ;; shared object. The `tree-sitter generate' command invokes `node' =
in order
>>>> @@ -114,7 +114,7 @@ (define (compile-language dir)
>>>> "-fno-exceptions"
>>>> "-O2"
>>>> "-g"
>>>> - "-o" ,(string-append lib "/" lang ".so")
>>>> + "-o" ,(string-append lib "/libtree-sitter-" lang "=
.so")
>>>> ;; An additional `scanner.{c,cc}' file is sometimes
>>>> ;; provided.
>>>> ,@(cond
>>>>
>>>>
>>>> rewrote html grammar to use this build system and made it work with
>>>> built-in treesit package. Also, tried examples of c and cpp grammars
>>>> from patches in this thread.
>>>>
>>>> If you ok with it, I'll push the build system to master and update the
>>>> html grammar accordingly.
>>
>> Oh, I forgot to say, this change to the build system LGTM! I'm really
>> happy to see it merged soon :-). The path change will probably break the
>> emacs-28-based tree-sitter support, but that's OK, it's better for the
>> build-system to be made to target emacs 29's builtin support. I'm sure I
>> can work around for emacs 28.
>
> Actually, I think we can build grammars with both names, just providing
> two .so files instead of one. If you won't find a better workaround we
> can go this way.
That's no problem, I was able to work-around it quite easily. The
emacs-tree-sitter-langs package expects all the grammars supported to be
in a single directory, so we have to bundle them. So we can quite
easily create symlinks from the bundle with the expected names,
something like:
=2D-8<---------------cut here---------------start------------->8---
(define-public emacs-tree-sitter-langs-grammar-bundle
(package
(name "emacs-tree-sitter-langs-grammar-bundle")
(source #f)
(version (package-version tree-sitter))
(build-system trivial-build-system)
(inputs
;; FIXME: Support for some languages is still left to package.
(list tree-sitter-bash
tree-sitter-c
tree-sitter-c-sharp
tree-sitter-cpp
tree-sitter-css
tree-sitter-elixir
tree-sitter-elm
tree-sitter-go
tree-sitter-haskell
tree-sitter-html
tree-sitter-java
tree-sitter-javascript
tree-sitter-json
tree-sitter-julia
tree-sitter-lua
tree-sitter-ocaml
tree-sitter-php
tree-sitter-python
tree-sitter-r
tree-sitter-rust
tree-sitter-ruby
tree-sitter-typescript))
(arguments
(list #:builder
(with-imported-modules '((guix build union)
(guix build utils))
#~(begin
(use-modules (ice-9 match)
(srfi srfi-1)
(guix build union)
(guix build utils))
(mkdir-p #$output)
(for-each
(lambda (lib)
(symlink lib
(string-append #$output "/"
(substring (basename lib)
(string-length "libt=
ree-sitter-")))))
(append-map (match-lambda
((name directory)
(find-files directory "libtree-sitter-.*\\=
.so$")))
'#$(package-inputs this-package)))))))
(synopsis #f)
(description #f)
(home-page #f)
(license #f)))
=2D-8<---------------cut here---------------end--------------->8---
Giving us:
=2D-8<---------------cut here---------------start------------->8---
/gnu/store/fr9h59wgn55ilfifvm5df7xzxfwh38pc-emacs-tree-sitter-langs-grammar=
-bundle-0.20.7
=E2=94=9C=E2=94=80=E2=94=80 bash.so -> /gnu/store/9qzvcdlpryjl44klfq0i2liqf=
6lsp5jq-tree-sitter-bash-0.19.0/lib/tree-sitter/libtree-sitter-bash.so
=E2=94=9C=E2=94=80=E2=94=80 cpp.so -> /gnu/store/my02kq2dr6h48nmrl2dnfnm5rg=
gx837w-tree-sitter-cpp-0.20.0-1.5ead1e2/lib/tree-sitter/libtree-sitter-cpp.=
so
=E2=94=9C=E2=94=80=E2=94=80 c_sharp.so -> /gnu/store/mp8jvbhx5xlgj5bxa52zhm=
k5x8i7md5h-tree-sitter-c-sharp-0.19.1/lib/tree-sitter/libtree-sitter-c_shar=
p.so
=E2=94=9C=E2=94=80=E2=94=80 c.so -> /gnu/store/y9ln76yx68q495vx8bnqdy87x7k8=
ihy5-tree-sitter-c-0.20.2/lib/tree-sitter/libtree-sitter-c.so
=E2=94=9C=E2=94=80=E2=94=80 css.so -> /gnu/store/fwji59sdwvqpqyb94m55qw1ak9=
2cmys9-tree-sitter-css-0.19.0/lib/tree-sitter/libtree-sitter-css.so
=E2=94=9C=E2=94=80=E2=94=80 elixir.so -> /gnu/store/f6ismnxf7hlh1sq87zzarw5=
6avvrzsl9-tree-sitter-elixir-0.19.0-1.de20391/lib/tree-sitter/libtree-sitte=
r-elixir.so
=E2=94=9C=E2=94=80=E2=94=80 elm.so -> /gnu/store/56zjl2ljvba3z1j6zfmpfa8mq1=
9a3g3a-tree-sitter-elm-5.6.3/lib/tree-sitter/libtree-sitter-elm.so
=E2=94=9C=E2=94=80=E2=94=80 go.so -> /gnu/store/qfy5sw6za96wkszbi21adxbxzgg=
vjz3g-tree-sitter-go-0.19.1-1.05900fa/lib/tree-sitter/libtree-sitter-go.so
=E2=94=9C=E2=94=80=E2=94=80 haskell.so -> /gnu/store/cq3chmqcb8g1nf5mzb6yhz=
dd6x9gvg1v-tree-sitter-haskell-0.14.0-1.e30bdfd/lib/tree-sitter/libtree-sit=
ter-haskell.so
=E2=94=9C=E2=94=80=E2=94=80 html.so -> /gnu/store/5pqfyjrg3yyvxaxidk690ffls=
3yb7wbi-tree-sitter-html-0.19.0/lib/tree-sitter/libtree-sitter-html.so
=E2=94=9C=E2=94=80=E2=94=80 javascript.so -> /gnu/store/28s09v3dfb1c9bdkq27=
91z9abxnih66p-tree-sitter-javascript-0.20.0/lib/tree-sitter/libtree-sitter-=
javascript.so
=E2=94=9C=E2=94=80=E2=94=80 java.so -> /gnu/store/i7jlqf5hbv0rhlkp4qlyc2d5n=
dw69dx4-tree-sitter-java-0.20.1/lib/tree-sitter/libtree-sitter-java.so
=E2=94=9C=E2=94=80=E2=94=80 json.so -> /gnu/store/5dv4r74p6gd9w2ncs6pjrhz5h=
bw47262-tree-sitter-json-0.19.0/lib/tree-sitter/libtree-sitter-json.so
=E2=94=9C=E2=94=80=E2=94=80 julia.so -> /gnu/store/5k37g1sdsllgh64p0w6ggabs=
ni6jqlkr-tree-sitter-julia-0.19.0/lib/tree-sitter/libtree-sitter-julia.so
=E2=94=9C=E2=94=80=E2=94=80 lua.so -> /gnu/store/nqzn4a6kgb2rx4y44pxdm4sqf3=
pzcpz1-tree-sitter-lua-0.0.14/lib/tree-sitter/libtree-sitter-lua.so
=E2=94=9C=E2=94=80=E2=94=80 ocaml_interface.so -> /gnu/store/3h7krcj3xxclir=
b8afxh65ipabw1821l-tree-sitter-ocaml-0.19.0-1.0348562/lib/tree-sitter/libtr=
ee-sitter-ocaml_interface.so
=E2=94=9C=E2=94=80=E2=94=80 ocaml.so -> /gnu/store/3h7krcj3xxclirb8afxh65ip=
abw1821l-tree-sitter-ocaml-0.19.0-1.0348562/lib/tree-sitter/libtree-sitter-=
ocaml.so
=E2=94=9C=E2=94=80=E2=94=80 php.so -> /gnu/store/ymxf5m8jhihbrag7v2pghgydj3=
byp7wh-tree-sitter-php-0.19.0-1.435fa00/lib/tree-sitter/libtree-sitter-php.=
so
=E2=94=9C=E2=94=80=E2=94=80 python.so -> /gnu/store/ggmzicwfxb7gz1rr9lfkx8c=
ak62bfw7v-tree-sitter-python-0.19.1-1.ed0fe62/lib/tree-sitter/libtree-sitte=
r-python.so
=E2=94=9C=E2=94=80=E2=94=80 r.so -> /gnu/store/y9dxbnbb5dyf0rq3kpar7ip4w3lq=
6sb9-tree-sitter-r-0.0.1-1.80efda5/lib/tree-sitter/libtree-sitter-r.so
=E2=94=9C=E2=94=80=E2=94=80 ruby.so -> /gnu/store/ky8n30dw16ck6byaqnhbf9ib7=
xp7j0yw-tree-sitter-ruby-0.20.0/lib/tree-sitter/libtree-sitter-ruby.so
=E2=94=9C=E2=94=80=E2=94=80 rust.so -> /gnu/store/25zdpwrgq1xibhv7xpg64i4g7=
1xah6g1-tree-sitter-rust-0.20.1/lib/tree-sitter/libtree-sitter-rust.so
=E2=94=9C=E2=94=80=E2=94=80 tsx.so -> /gnu/store/wqpcphz855yjrginwqrymd3xzz=
xb8k8l-tree-sitter-typescript-0.20.1/lib/tree-sitter/libtree-sitter-tsx.so
=E2=94=94=E2=94=80=E2=94=80 typescript.so -> /gnu/store/wqpcphz855yjrginwqr=
ymd3xzzxb8k8l-tree-sitter-typescript-0.20.1/lib/tree-sitter/libtree-sitter-=
typescript.so
=2D-8<---------------cut here---------------end--------------->8---
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPo20kYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UcoMIAI+yOPj9qsXR35dX5JAx+Ny1
I/xsUxUzjvFTuF5FDfMfmW8vhLxBIYjU+YS0SZ1lsXSevWkcX740Zlc/WkwsYBFF
/6wvqyFLQexh6ZKTCHcwHaYiuJjJCvdUf28/erdXMdsTb/PKwC2/yuRC/6ZLNwba
Qy7rhEZ0uAxUzst5RPR9mOQO64leNZx7Oftsc6fyjxkQ3LoHyn97yVvDS8MOSTux
aoKaVvUZ6ka31BkHhzRzr47FpBxJSc3jBWkVepbhTVO4Noa07GnrWaMhdHTLa4nC
vOD2EyGsicDVt/U4MGtAl+d6m5hgRWrj/RUDAADE9Kc4dfuNhfM05NNQxCPOWJQ=
=aR2f
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 12:24:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 07:24:38 2023
Received: from localhost ([127.0.0.1]:44275 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pRBPJ-0008V4-Me
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:24:38 -0500
Received: from mout.gmx.net ([212.227.17.20]:37235)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pRBPH-0008Uq-4a
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 07:24:36 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MZTqg-1p6mh50yEY-00Wa1l; Sun, 12
Feb 2023 13:24:25 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN> <87o7q1qzol.fsf@HIDDEN>
<87mt5jfmvl.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Sun, 12 Feb 2023 12:07:27 +0000
In-reply-to: <87mt5jfmvl.fsf@HIDDEN>
Message-ID: <871qmvm5qh.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:wcl8aDuvBMut0XAlLHTfdy/hrogDkPVe89XyPNmY5v1IGiNZYSV
yCf/lTRkvC9thsR/Q/05+DvVGCvyVX9NH+X+AlGf/ied3U+J+dqTA4n4i7EsM3b0MjizFiA
KPu7S5BbKeeYM4vt/BdpKwLsOtOdg1XouD8yGm+/zmXrTrM3MPubqyqYMAoy/5oOJURjlz3
hXLGMnSXXjxGyzQO9oPNQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:4zGSbKBpz88=;eWenBOq0qVt8fc8/iTqzqwyeHso
WKAizmu5OrzY2cNfFpf5JuhEKWL7nLKPLC6o58s+3E6uMAJi1tRGIjZtpvuKz4crxRAn8nqpd
1hGUAvxBOQymvfHU8v0uOf93GsYMl0ImEnzGw0Ud8AccVxNM1q6Ng2EUgh4knXyYbFKSQGjtA
SdvSDNur3rLNJrAdDqk2TDoyODDBrHm/XURrT1AkGN3yNQ4N7305deyDJF5iqG5IREwW225Qe
44ALi9YUr3XYlmXMi1Gv/P+KYROVUimR2jtcr/ejSE5oocQLn5B0qr36YiO5uboySpV6zP3d1
Zws/Zf4h8wl+8fY8+k+/jepDX6dMOrB6336t+Lgl6OhA/PkGsm6+ZNfclODz7zpRm/qKtmQaY
FP8MvGMeqI3mkIDtQexJF8aXQ3CAhImwHqLfJ1xR6DbZS8x1HEEsNuD25pxrPIWnuq+xNfEZk
Z4C9QH94u1g+7BWt886+vOH1c4uZghVMGbIDfS2VwQA7kqP+Spng1uo/tOva9PwNPQMt7H6e6
sdQLqnTM12Zeh1/4S3HNmPUzKoRugW0eiMN1ETDlw6oIPawAg8iyrbcs1BM+oXfUpS/UWbic/
1OtOFy3Nu6vanxWHUHBJUk7HMuo6bPQFn92Dy4lokhSVj5ryxGi6t/n0XwcQp8nVg41qPZPGD
vWYrFsBUx9JHiJp685tLMjbGOFZ2xpeMIQ5JBBoumYOihg0W4RxYEYEbvPbzmIPxws502RTLl
qLZSMAPJkzPz2JPkpodN7LYFJ+qZDE5XfcGdEoyHCXqIjmrkvMv4xQx2DdjkHf/z/OwgnCS53
1dKaRL231rE0yQlRZ7jIGiiQ/nKp2qOSi3U4MJShYJ9UupCnMS7MAz99IZTubhSEy1LUYAjly
naBcM7S4Xmappia1fSIpDdkt71GYMJAidAEVbyPFraz2n4mKLHl1V8cojFdmkPd599BEY5AKj
8qmnSUsMe6b7JSYNAaTqcEiIUc4=
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Hi,
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2023-02-10 15:48, Pierre Langlois wrote:
>
>> Hi Andrew, thanks for pushing this along! It's great to see things
>> getting merged.
>>
>> Andrew Tropin <andrew@HIDDEN> writes:
>>
>>> [[PGP Signed Part:Undecided]]
>>> On 2023-02-09 18:04, Andrew Tropin wrote:
>>>
>>>> On 2023-02-09 13:39, zimoun wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>>
>>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>>
>>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>>> right?
>>>>>
>>>>>
>>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>>
>>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>>
>>>>> Leaving out all the others, right?
>>>>
>>>> Merged first 5 patches from 01 to 05, also added one more commit, which
>>>> addresses some things from reviews and one commit, which adds html
>>>> grammar.
>>>>
>>>> The html grammar is added for the testing purposes. It relies on
>>>> generated parser.c and scanner.c and we will need to repackage it using
>>>> grammar.js instead. I'm not sure if a separate build system is needed
>>>> for this, I guess we can just rewrite tree-sitter-grammar function,
>>>> which generates packages as in example with tree-sitter-grammar-html:
>>>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitter.scm?h=53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>>>
>>>> Anyway, I only skimmed tree-sitter-build-system source code, and plan to
>>>> read it carefully, evaluate and either introduce new build system or
>>>> just move all needed parts to tree-sitter-grammar function. WDYT?
>>>> After we done with it we can package all other grammars.
>>>
>>> Ok, I realized that the proper build process for tree-sitter grammars is
>>> a little harder than I expected, tree-sitter-build system make sense. I
>>> reviewed it, made a small change:
>>
>> Ah great, I was going to comment to try and push for us to keep the
>> build system. I originally went with a template package and inheritance,
>> but Maxime suggested moving to a build-system which ended up making the
>> package definitions a *lot* nicer IMO (see previous discussion here
>> https://issues.guix.gnu.org/49946#144). It also allows us to deal with
>> grammars that depend on each other more nicely I think.
>>
>>>
>>> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
>>> ;; Commentary:
>>> ;;
>>> ;; Build procedures for tree-sitter grammar packages. This is the
>>> -;; builder-side code, which builds on top fo the node build-system.
>>> +;; builder-side code, which builds on top of the node build-system.
>>> ;;
>>> ;; Tree-sitter grammars are written in JavaScript and compiled to a native
>>> ;; shared object. The `tree-sitter generate' command invokes `node' in order
>>> @@ -114,7 +114,7 @@ (define (compile-language dir)
>>> "-fno-exceptions"
>>> "-O2"
>>> "-g"
>>> - "-o" ,(string-append lib "/" lang ".so")
>>> + "-o" ,(string-append lib "/libtree-sitter-" lang ".so")
>>> ;; An additional `scanner.{c,cc}' file is sometimes
>>> ;; provided.
>>> ,@(cond
>>>
>>>
>>> rewrote html grammar to use this build system and made it work with
>>> built-in treesit package. Also, tried examples of c and cpp grammars
>>> from patches in this thread.
>>>
>>> If you ok with it, I'll push the build system to master and update the
>>> html grammar accordingly.
>>>
>>> The final result will look like this:
>>>
>>> (define tree-sitter-delete-generated-files
>>> #~(begin
>>> (delete-file "binding.gyp")
>>> (delete-file-recursively "bindings")
>>> (delete-file "src/grammar.json")
>>> (delete-file "src/node-types.json")
>>> (delete-file "src/parser.c")
>>> (delete-file-recursively "src/tree_sitter")))
>>>
>>> (define* (tree-sitter-grammar
>>> language language-for-synopsis version commit hash
>>> #:key
>>> (repository-url
>>> (format #f "https://github.com/tree-sitter/tree-sitter-~a" language))
>>> (inputs '()))
>>> (let ((synopsis (string-append language-for-synopsis
>>> " grammar for tree-sitter"))
>>> (name (string-append "tree-sitter-grammar-" language)))
>>> (package
>>> (name name)
>>> (version version)
>>> (home-page repository-url)
>>> (source (origin
>>> (method git-fetch)
>>> (uri (git-reference
>>> (url repository-url)
>>> (commit commit)))
>>> (file-name (git-file-name name version))
>>> (sha256 (base32 hash))
>>> (modules '((guix build utils)))
>>> (snippet tree-sitter-delete-generated-files)))
>>> (build-system tree-sitter-build-system)
>>> (inputs inputs)
>>> (synopsis synopsis)
>>> (description (string-append synopsis "."))
>>> (license license:expat))))
>>>
>>> (define-public tree-sitter-grammar-html
>>> (tree-sitter-grammar
>>> "html" "HTML"
>>> "0.19.0" "v0.19.0"
>>> "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
>>>
>>> After that we can bring the rest of the grammars.
>>
>> I would suggest to rmeove the `tree-sitter-grammar' function, and keep
>> grammars as "regular" package records, even though it's a little bit
>> more verbose:
>>
>> --8<---------------cut here---------------start------------->8---
>> (define-public tree-sitter-html
>> (package
>> (name "tree-sitter-html")
>
> It seems tree-sitter-html mimics upstream package name and probably make
> more sense than tree-sitter-grammar-html used by me.
Yeah, at some point I think I had named the packages with "grammar" as
well, but thought it was a bit of a mouthful. I'm also thinking one day
we may build language bindings as part of the build system (Rust and
NodeJS I think ATM), so those packages could do more than ship the
grammar in the future (although we don't know if we'll ever really need
that).
>
>> (version "0.19.0")
>> (source (origin
>> (method git-fetch)
>> (uri (git-reference
>> (url "https://github.com/tree-sitter/tree-sitter-html")
>> (commit (string-append "v" version))))
>> (file-name (git-file-name name version))
>> (sha256
>> (base32
>> "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
>> (modules '((guix build utils)))
>> (snippet tree-sitter-delete-generated-files)))
>> (build-system tree-sitter-build-system)
>> (home-page "https://github.com/tree-sitter/tree-sitter-html")
>> (synopsis "Tree-sitter HTML grammar")
>> (description
>> "This package provides a HTML grammar for the Tree-sitter library.")
>> (license license:expat)))
>> --8<---------------cut here---------------end--------------->8---
>>
>> This way, they look like any other package in Guix, which makes it
>> easier for us to apply automatic changes in the future if needed (for
>> example like how the input format could be automically updated for all
>> "simple" package definitions, but had to be manual whenever custom code
>> refactoring was done). Does this make sense?
>
> Make sense, but on the other hand we already have hunspell, aspell
> dictionaries and probably a few more others, which are very similiar in
> spirit and we already have to keep in mind their existence on such
> automatic code updates.
>
> It looks that the packages differ only in url for the source code, lang
> name and sometimes in inputs. Having template package function can make
> management of shared parts more centralized, reduce possibility of
> copy-paste mistakes, when the description wasn't updated and so on and
> can reduce the amount of the code overall (which also reduces the change
> of introducing an error).
>
> I don't have a strong opinion on this topic, but leaning towards the
> template function slightly more, however I'm completely ok with the
> standalone package definitions as well. WDYT?
I can think of both cost/benefits to the template so I don't have a
strong opinion either :-).
I do like the template to make sure people don't forget to delete
generated files, that's quite important as it seems upstream packages
often check-in the generated C code. Although, we could probably assert
that with in the build-system phase? I'll think about that.
On the other hand, I wonder how the template works for packages that
provide multiple grammars (see ocaml and typescript for example). I
guess we could use the template for trivial packages, and standalone
definitions for more complex ones? In general, if we keep the template
interface really simple, then I'm happy with it.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPo2nYYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UEu4H/28hYTTd7UXk3XP09t/L9LAK
J6ZU8tN0dghON14h5vy/KhMGXhbBDpqHLTPmMPcyjRiQbkcGhh7bPaUDtoQ1P916
Ytmfgc9vpqjznFL2YmqcUzAW6pklnhvTJt8wz3RVEwg/7DO7piMSkW9zW7eM7S43
+EhhIHfC+My3+hQKaKjTxIzCo+J51cFFYALnrY+eaoxOOb3/zg6RFdEVjj/fxOYc
tX3T1MTeAOtgQIShKjQj6TF9qUGLvT5B2t6WNDH9OE+zsXCLtsMbXnfCsWOjvwUl
ARug7+XwQKVVMjlCPbqVkGRQoUwRqwIZBljWCeDyJzrF17Vp6st2UHRpA2kLN38=
=4Eku
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 07:42:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 02:42:42 2023
Received: from localhost ([127.0.0.1]:43933 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pR70T-0006Ne-9H
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 02:42:42 -0500
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:47889)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pR70O-0006NQ-Rh
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 02:42:39 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 6F54620003;
Sun, 12 Feb 2023 07:42:27 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676187750;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=FY63GfRrlSNdqIg692f9ZoPcfoFSssfzyhdKn/Pgpmw=;
b=BcoGPhqcbNX7YCppQ2u2JolhZ/rv6H19ScuTQSWF4/8zMmc2YObjCc4p5WmiWJPFCHmycZ
c19XG+CxjpeP2zCUmeVj/myC263JziCSj0MTzQFe/0ea81IRpM+D/zOTQvjUmvWjiMxrkF
kzfcaCAjt7wkKRGq9k1b116HqjHLRho9ZjiTPKyZBBVpujboZVsxYzvtL47LPkJSfJA+SC
V36QYtVV7mA6oyYX9sACsCejTJMmpLUt/4GSbacyxZcIyB+BTHT7Cn9vlkwl8efQ24DIIp
PIkbXIEo421ZGrOEvSySv46iHnqDr9xv1O15h/dmBGC+9JAS8pfUJT2KYkap0w==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Subject: Re: [bug#49946] [PATCH v7 06/32] build-system: Add
tree-sitter-build-system.
In-Reply-To: <87r0xrcpei.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-7-pierre.langlois@HIDDEN> <87r0xrcpei.fsf@HIDDEN>
Date: Sun, 12 Feb 2023 11:42:24 +0400
Message-ID: <87edqvfhy7.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2022-11-25 01:57, Pierre Langlois wrote:
> It appears this email is making it through, so here it is as an
> attachment:
>
> From 4a3c1fff8460a03bfb7c1aada9863205cd6f22fd Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@HIDDEN>
> Date: Tue, 29 Mar 2022 20:13:34 +0100
> Subject: [PATCH v7 06/32] build-system: Add tree-sitter-build-system.
>
> * guix/build-system/tree-sitter.scm: New module.
> * guix/build/tree-sitter-build-system.scm: Likewise.
> * Makefile.am (MODULES): Add them.
> * doc/guix.texi: Document it.
> ---
> Makefile.am | 2 +
> doc/guix.texi | 21 ++-
> guix/build-system/tree-sitter.scm | 190 ++++++++++++++++++++++++
> guix/build/tree-sitter-build-system.scm | 153 +++++++++++++++++++
> 4 files changed, 365 insertions(+), 1 deletion(-)
> create mode 100644 guix/build-system/tree-sitter.scm
> create mode 100644 guix/build/tree-sitter-build-system.scm
>
> diff --git a/Makefile.am b/Makefile.am
> index c3af23b68e..a16c4fcd7e 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -178,6 +178,7 @@ MODULES =3D \
> guix/build-system/ruby.scm \
> guix/build-system/scons.scm \
> guix/build-system/texlive.scm \
> + guix/build-system/tree-sitter.scm \
> guix/build-system/trivial.scm \
> guix/ftp-client.scm \
> guix/http-client.scm \
> @@ -234,6 +235,7 @@ MODULES =3D \
> guix/build/ruby-build-system.scm \
> guix/build/scons-build-system.scm \
> guix/build/texlive-build-system.scm \
> + guix/build/tree-sitter-build-system.scm \
> guix/build/waf-build-system.scm \
> guix/build/haskell-build-system.scm \
> guix/build/julia-build-system.scm \
> diff --git a/doc/guix.texi b/doc/guix.texi
> index e547d469f4..4e997f7176 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@*
> Copyright @copyright{} 2020 Naga Malleswari@*
> Copyright @copyright{} 2020, 2021 Brice Waegeneire@*
> Copyright @copyright{} 2020 R Veera Kumar@*
> -Copyright @copyright{} 2020, 2021 Pierre Langlois@*
> +Copyright @copyright{} 2020, 2021, 2022 Pierre Langlois@*
> Copyright @copyright{} 2020 pinoaffe@*
> Copyright @copyright{} 2020 Andr=C3=A9 Batista@*
> Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@*
> @@ -9732,6 +9732,25 @@ be specified with the @code{#:node} parameter whic=
h defaults to
> @code{node}.
> @end defvr
>=20=20
> +@defvr {Scheme Variable} tree-sitter-build-system
> +
> +This variable is exported by @code{(guix build-system tree-sitter)}. It
> +implements procedures to compile grammars for the
> +@url{https://tree-sitter.github.io/tree-sitter/, Tree-sitter} parsing
> +library. It essentially runs @code{tree-sitter generate} to translate
> +@code{grammar.js} grammars to JSON and then to C. Which it then
> +compiles to native code.
> +
> +Tree-sitter packages may support multiple grammars, so this build system
> +supports a @code{#:grammar-directories} keyword to specify a list of
> +locations where a @code{grammar.js} file may be found.
> +
> +Grammars sometimes depend on each other, such as C++ depending on C and
> +TypeScript depending on JavaScript. You may use inputs to declare such
> +dependencies.
> +
> +@end defvr
> +
> Lastly, for packages that do not need anything as sophisticated, a
> ``trivial'' build system is provided. It is trivial in the sense that
> it provides basically no support: it does not pull any implicit inputs,
> diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-s=
itter.scm
> new file mode 100644
> index 0000000000..aeb96e3ef5
> --- /dev/null
> +++ b/guix/build-system/tree-sitter.scm
> @@ -0,0 +1,190 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (guix build-system tree-sitter)
> + #:use-module (guix store)
> + #:use-module (guix utils)
> + #:use-module (guix packages)
> + #:use-module (guix gexp)
> + #:use-module (guix monads)
> + #:use-module (guix search-paths)
> + #:use-module (guix build-system)
> + #:use-module (guix build-system gnu)
> + #:use-module (guix build-system node)
> + #:use-module (ice-9 match)
> + #:export (%tree-sitter-build-system-modules
> + tree-sitter-build
> + tree-sitter-build-system))
> +
> +(define %tree-sitter-build-system-modules
> + ;; Build-side modules imported by default.
> + `((guix build tree-sitter-build-system)
> + ,@%node-build-system-modules))
> +
> +(define* (lower name
> + #:key source inputs native-inputs outputs system target
> + #:allow-other-keys
> + #:rest arguments)
> + "Return a bag for NAME from the given arguments."
> + (define private-keywords
> + `(#:inputs #:native-inputs #:outputs ,@(if target
> + '()
> + '(#:target))))
> + (define node
> + (module-ref (resolve-interface '(gnu packages node))
> + 'node-lts))
> + (define tree-sitter
> + (module-ref (resolve-interface '(gnu packages tree-sitter))
> + 'tree-sitter))
> + (define tree-sitter-cli
> + (module-ref (resolve-interface '(gnu packages tree-sitter))
> + 'tree-sitter-cli))
> + ;; Grammars depend on each other via JS modules, which we package into=
a
> + ;; dedicated js output.
> + (define grammar-inputs
> + (map (match-lambda
> + ((name package)
> + `(,name ,package "js")))
> + inputs))
> + (bag
> + (name name)
> + (system system) (target target)
> + (build-inputs `(,@(if source
> + `(("source" ,source))
> + '())
> + ("node" ,node)
> + ("tree-sitter-cli" ,tree-sitter-cli)
> + ,@native-inputs
> + ,@(if target '() grammar-inputs)
> + ;; Keep the standard inputs of 'gnu-build-system'.
> + ,@(if target
> + (standard-cross-packages target 'host)
> + '())
> + ,@(standard-packages)))
> + (host-inputs `(("tree-sitter" ,tree-sitter)
> + ,@(if target grammar-inputs '())))
> + ;; Keep the standard inputs of 'gnu-buid-system'.
> + (target-inputs (if target
> + (standard-cross-packages target 'target)
> + '()))
> + ;; XXX: this is a hack to get around issue #41569.
> + (outputs (match outputs
> + (("out") (cons "js" outputs))
> + (_ outputs)))
> + (build (if target tree-sitter-cross-build tree-sitter-build))
> + (arguments (strip-keyword-arguments private-keywords arguments))))
> +
> +(define* (tree-sitter-build name inputs
> + #:key
> + source
> + (phases '%standard-phases)
> + (grammar-directories '("."))
> + (tests? #t)
> + (outputs '("out" "js"))
> + (search-paths '())
> + (system (%current-system))
> + (guile #f)
> + (imported-modules %tree-sitter-build-system-=
modules)
> + (modules '((guix build utils)
> + (guix build tree-sitter-build-sys=
tem))))
> + (define builder
> + (with-imported-modules imported-modules
> + #~(begin
> + (use-modules #$@(sexp->gexp modules))
> + (tree-sitter-build #:name #$name
> + #:source #+source
> + #:system #$system
> + #:phases #$phases
> + #:tests? #$tests?
> + #:grammar-directories '#$grammar-directories
> + #:outputs #$(outputs->gexp outputs)
> + #:search-paths '#$(sexp->gexp
> + (map search-path-specifi=
cation->sexp
> + search-paths))
> + #:inputs #$(input-tuples->gexp inputs)))))
> +
> + (mlet %store-monad ((guile (package->derivation (or guile (default-gui=
le))
> + system #:graft? #f)))
> + (gexp->derivation name builder
> + #:system system
> + #:guile-for-build guile)))
> +
> +(define* (tree-sitter-cross-build name
> + #:key
> + target
> + build-inputs target-inputs host-inputs
> + guile source
> + (phases '%standard-phases)
> + (grammar-directories '("."))
> + (tests? #t)
> + (outputs '("out" "js"))
> + (search-paths '())
> + (native-search-paths '())
> + (system (%current-system))
> + (build (nix-system->gnu-triplet system=
))
> + (imported-modules %tree-sitter-build-s=
ystem-modules)
> + (modules '((guix build utils)
> + (guix build tree-sitter-bui=
ld-system))))
> + (define builder
> + (with-imported-modules imported-modules
> + #~(begin
> + (use-modules #$@(sexp->gexp modules))
> +
> + (define %build-host-inputs
> + #+(input-tuples->gexp build-inputs))
> +
> + (define %build-target-inputs
> + (append #$(input-tuples->gexp host-inputs)
> + #+(input-tuples->gexp target-inputs)))
> +
> + (define %build-inputs
> + (append %build-host-inputs %build-target-inputs))
> +
> + (tree-sitter-build #:name #$name
> + #:source #+source
> + #:system #$system
> + #:build #$build
> + #:target #$target
> + #:phases #$phases
> + #:tests? #$tests?
> + #:grammar-directories '#$grammar-directories
> + #:outputs #$(outputs->gexp outputs)
> + #:inputs %build-target-inputs
> + #:native-inputs %build-host-inputs
> + #:search-paths '#$(sexp->gexp
> + (map search-path-specifi=
cation->sexp
> + search-paths))
> + #:native-search-paths '#$(sexp->gexp
> + (map
> + search-path-spec=
ification->sexp
> + native-search-pa=
ths))))))
> +
> + (mlet %store-monad ((guile (package->derivation (or guile (default-gui=
le))
> + system #:graft? #f)))
> + (gexp->derivation name builder
> + #:system system
> + #:target target
> + #:guile-for-build guile)))
> +
> +(define tree-sitter-build-system
> + (build-system
> + (name 'tree-sitter)
> + (description "The Tree-sitter grammar build system")
> + (lower lower)))
> +
> +;;; tree-sitter.scm ends here
> diff --git a/guix/build/tree-sitter-build-system.scm b/guix/build/tree-si=
tter-build-system.scm
> new file mode 100644
> index 0000000000..574b0f2a1c
> --- /dev/null
> +++ b/guix/build/tree-sitter-build-system.scm
> @@ -0,0 +1,153 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (guix build tree-sitter-build-system)
> + #:use-module ((guix build node-build-system) #:prefix node:)
> + #:use-module (guix build json)
> + #:use-module (guix build utils)
> + #:use-module (ice-9 match)
> + #:use-module (ice-9 regex)
> + #:use-module (srfi srfi-1)
> + #:export (%standard-phases
> + tree-sitter-build))
> +
> +;; Commentary:
> +;;
> +;; Build procedures for tree-sitter grammar packages. This is the
> +;; builder-side code, which builds on top fo the node build-system.
> +;;
> +;; Tree-sitter grammars are written in JavaScript and compiled to a nati=
ve
> +;; shared object. The `tree-sitter generate' command invokes `node' in =
order
> +;; to evaluate the grammar.js into a grammar.json file, which is then
> +;; translated into C code. We then compile the C code ourselves. Packa=
ges
> +;; also sometimes add extra manually written C/C++ code.
> +;;
> +;; In order to support grammars depending on each other, such as C and C=
++,
> +;; JavaScript and TypeScript, this build-system installs the source of t=
he
> +;; node module in a dedicated "js" output.
> +;;
> +;; Code:
> +
> +(define* (patch-dependencies #:key inputs #:allow-other-keys)
> + "Rewrite dependencies in 'package.json'. We remove all runtime depend=
encies
> +and replace development dependencies with tree-sitter grammar node modul=
es."
> +
> + (define (rewrite package.json)
> + (map (match-lambda
> + (("dependencies" @ . _)
> + '("dependencies" @))
> + (("devDependencies" @ . _)
> + `("devDependencies" @
> + ,@(filter-map (match-lambda
> + ((key . directory)
> + (let ((node-module
> + (string-append directory
> + "/lib/node_modules/"
> + key)))
> + (and (directory-exists? node-module)
> + `(,key . ,node-module)))))
> + (alist-delete "node" inputs))))
> + (other other))
> + package.json))
> +
> + (node:with-atomic-json-file-replacement "package.json"
> + (match-lambda
> + (('@ . package.json)
> + (cons '@ (rewrite package.json))))))
> +
> +;; FIXME: The node build-system's configure phase does not support
> +;; cross-compiling so we re-define it.
> +(define* (configure #:key native-inputs inputs #:allow-other-keys)
> + (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
> + "--offline" "--ignore-scripts" "install"))
> +
> +(define* (build #:key grammar-directories #:allow-other-keys)
> + (for-each (lambda (dir)
> + (with-directory-excursion dir
> + ;; Avoid generating binding code for other languages, we=
do
> + ;; not support this use-case yet and it relies on running
> + ;; `node-gyp' to build native addons.
> + (invoke "tree-sitter" "generate" "--no-bindings")))
> + grammar-directories))
> +
> +(define* (check #:key grammar-directories tests? #:allow-other-keys)
> + (when tests?
> + (for-each (lambda (dir)
> + (with-directory-excursion dir
> + (invoke "tree-sitter" "test")))
> + grammar-directories)))
> +
> +(define* (install #:key target grammar-directories outputs #:allow-other=
-keys)
> + (let ((lib (string-append (assoc-ref outputs "out")
> + "/lib/tree-sitter")))
> + (mkdir-p lib)
> + (define (compile-language dir)
> + (with-directory-excursion dir
> + (let ((lang (assoc-ref (call-with-input-file "src/grammar.json"
> + read-json)
> + "name"))
> + (source-file (lambda (path)
> + (if (file-exists? path)
> + path
> + #f))))
> + (apply invoke
> + `(,(if target
> + (string-append target "-g++")
> + "g++")
> + "-shared"
> + "-fPIC"
> + "-fno-exceptions"
> + "-O2"
> + "-g"
> + "-o" ,(string-append lib "/" lang ".so")
> + ;; An additional `scanner.{c,cc}' file is sometimes
> + ;; provided.
> + ,@(cond
> + ((source-file "src/scanner.c")
> + =3D> (lambda (file) (list "-xc" "-std=3Dc99" file=
)))
> + ((source-file "src/scanner.cc")
> + =3D> (lambda (file) (list file)))
> + (else '()))
> + "-xc" "src/parser.c")))))
> + (for-each compile-language grammar-directories)))
> +
> +(define* (install-js #:key native-inputs inputs outputs #:allow-other-ke=
ys)
> + (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
> + "--prefix" (assoc-ref outputs "js")
> + "--global"
> + "--offline"
> + "--loglevel" "info"
> + "--production"
> + ;; Skip scripts to prevent building bindings via GYP.
> + "--ignore-scripts"
> + "install" "../package.tgz"))
> +
> +(define %standard-phases
> + (modify-phases node:%standard-phases
> + (replace 'patch-dependencies patch-dependencies)
> + (replace 'configure configure)
> + (replace 'build build)
> + (replace 'check check)
> + (replace 'install install)
> + (add-after 'install 'install-js install-js)))
> +
> +(define* (tree-sitter-build #:key inputs (phases %standard-phases)
> + #:allow-other-keys #:rest args)
> + (apply node:node-build #:inputs inputs #:phases phases args))
> +
> +;;; tree-sitter-build-system.scm ends here
Applied, slightly reformatted, pushed as
dbd4d2d0707b486f1e2c8659e94e1d3b15e4351e
Also, migrated tree-sitter-grammar fn to this build system.
I still try to get the taste of packaging grammars with
tree-sitter-grammar helper and just as plain packages and try to
understand how good/bad template function idea is in this case and if we
want to keep it or not.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPomGAACgkQIgjSCVjB
3rBNCg/+MLQ2JZC58PmhThF3IiJ8y2w/elM/me0Nlr1MT47sR7+y3lYAvSDSy8fN
Sl0KEgobI3VhXieJysH0WQAlh7+f2JnVrr4kFOG6Gw2VSKIW2/EjaBdIKgYbf4Tc
VkTd+vi6m1WuJj+rYG+CwdmnQpnXTMYa9tMhV2aNA7H+v/RyXuxbFWzz+6XUuIi0
BIXNt/3X+TqtdaH4c/WkZFOSFrWsJh2k9bj6w/rKDumKD7EdyVDlI6nR0COkD1Ua
Datz/POOcruXrj/EYqBas4phSOHWmP9uxkIv6mA/6+7yxS6jKEagTBJyUtRSQXPJ
NQombe3oEZQWBhxSyQTSjbUL0FmQYKBjF5SBCV6xWK9Hbis1HiaAhUNsQaauazzl
n6GN4pH8kkAAAmdTn97Q0gJKZTr0dUCVkJfIxCJq2FLK9qqn1F7zAVDuNcA2Z3ga
ylu38/ue92e5MlFO3rgUpP8TcwvXs2uahWdMkqjglCXPcXq3YytMb9KN/ihFN/VV
OQW4ul4a/6P0sHGYfCUwipGEEr+OD9p20aK0eH/fRNy/YbZ9rms15FBgZ+fecknr
qrmJnQgcA9jC2rA0ieNB6UcDDxdtDxU8ieeePZbnYWoK9TaMQtAm8+xwQjFVG4wl
u56wQZN9vEphzPoqAPk5HsTL766UAGetQeQBy1x7sRmn3MAfjMo=
=uq1j
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 06:28:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 01:28:34 2023
Received: from localhost ([127.0.0.1]:43883 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pR5qj-0004D6-HA
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 01:28:34 -0500
Received: from relay8-d.mail.gandi.net ([217.70.183.201]:54811)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pR5qf-0004Cq-TV
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 01:28:31 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 1DAAE1BF207;
Sun, 12 Feb 2023 06:28:20 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676183303;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=eKSaulW4ECeG34p8b0lIjZSldFXQjWTsBCaeaGkhnOE=;
b=DH2kUdLyRLpirSLR5dtDUibri3DYtRKXomdxUpKvPgvZmf42Emh29wio7JsJhA1dr8oI6M
c1Ym0eJKKKlzBeyDST1uw3MBLLYKjMwgEIbQFDgR22pNlL/FX0IhvPurNx63/Ah3p1uCnC
bxkQPgYKnIH1nH4ub+aQBCwdItKJxWpaXesDMKnCtojMsd6vywPzvu/u00bX/an3MIkvCR
Mxzy3eP7X5AVmLfp75WWZuL7QCWOASme8Go7eFH7g5yXmxWGQH7otBBDahJRTVA+oumDU0
FqW/SGsuswzOHSicsR/nRhB3OuGmh6zomywrSpvMCLNb51hqmt/X/mNU5e1G0Q==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87fsbdo34v.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87fsbdo34v.fsf@HIDDEN>
Date: Sun, 12 Feb 2023 10:28:17 +0400
Message-ID: <87h6vrfldq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-10 17:04, Pierre Langlois wrote:
> Hi,
>
> Andrew Tropin <andrew@HIDDEN> writes:
>
>> [[PGP Signed Part:Undecided]]
>> On 2023-02-09 13:39, zimoun wrote:
>>
>>> Hi,
>>>
>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>
>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>
>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>> right?
>>>
>>>
>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois=
@gmx.com
>>>
>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois=
@gmx.com
>>>
>>> Leaving out all the others, right?
>>
>> Merged first 5 patches from 01 to 05, also added one more commit, which
>> addresses some things from reviews and one commit, which adds html
>> grammar.
>
> I had also started rebasing addressing comments on the tree-sitter-cli
> package, and had a few extra changes left that haven't been pushed.
>
> I realised we could remove a now redundant comment, and while enabling
> *some* tests, I realized we should directly depend on node and dot, so
> that people may use the `tree-sitter' command, without needing them in
> the same profile.
Sounds very valid! :)
>
> What do you think of the following two patches?
>
I applied them locally and tested, LGTM. Will push them a little later
with the rest of tree-sitter related changes.
> From b24b04015261cfea2143be63671877c9c2c8d458 Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@HIDDEN> Date: Fri, 10 Feb 2023
> 16:10:25 +0000 Subject: [PATCH 1/2] gnu: Remove tree-sitter comment
> from emacs.scm imports.
>
> * gnu/packages/emacs.scm: Remove tree-sitter comment.
> ---
> gnu/packages/emacs.scm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 4ce41deb88..4791570d12 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -76,7 +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 tree-sitter) ; for tree-sitter
> + #:use-module (gnu packages tree-sitter)
> #:use-module (gnu packages web) ; for jansson
> #:use-module (gnu packages webkit)
> #:use-module (gnu packages xml)
> --=20
> 2.39.1
>
> From 8225d51edeb528c51d30ad0f225eb96be5586a37 Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@HIDDEN>
> Date: Tue, 29 Mar 2022 20:13:11 +0100
> Subject: [PATCH 2/2] gnu: tree-sitter-cli: Enable some tests and add node=
and
> dot.
>
> * gnu/packages/tree-sitter.scm (tree-sitter-cli)[inputs]: Add graphviz and
> node-lts.
> [arguments]<#:cargo-test-flags>: Skip tests that require downloading gram=
mars.
> <#:phases>: Add 'patch-node and 'patch-dot phases. Tweak install phase.
> ---
> gnu/packages/tree-sitter.scm | 49 ++++++++++++++++++++++++++++--------
> 1 file changed, 39 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 2e44339ca2..4331ffdd97 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -24,7 +24,9 @@ (define-module (gnu packages tree-sitter)
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (gnu packages crates-graphics)
> #:use-module (gnu packages crates-io)
> + #:use-module (gnu packages graphviz)
> #:use-module (gnu packages icu4c)
> + #:use-module (gnu packages node)
> #:use-module (guix build-system cargo)
> #:use-module (guix build-system gnu)
> #:use-module (guix gexp)
> @@ -96,13 +98,30 @@ (define-public tree-sitter-cli
> println!(\"cargo:rustc-link-lib=3Dtree-sit=
ter\");~@
> }~%")))))))
> (build-system cargo-build-system)
> - (inputs (list tree-sitter))
> + (inputs
> + (list tree-sitter graphviz node-lts))
> (arguments
> (list
> - ;; Running test requires downloading fixtures, see the
> - ;; script/fetch-fixtures script, which fetches grammars. Maybe it=
make
> - ;; sence to run tests in the grammar's packages?
> - #:tests? #f
> + #:cargo-test-flags
> + ''("--release" "--"
> + ;; Skip tests which rely on downloading grammar fixtures. It is
> + ;; difficult to support such tests given upstream does not enco=
de
> + ;; which version of the grammars are expected.
> + ;; Instead, we do run some tests for each grammar in the tree-s=
itter
> + ;; build-system, by running `tree-sitter test'. This isn't as
> + ;; complete as running all tests from tree-sitter-cli, but it's=
a
> + ;; good compromise compared to maintaining two different sets of
> + ;; grammars (Guix packages vs test fixtures).
> + "--skip=3Dtests::corpus_test"
> + "--skip=3Dtests::highlight_test"
> + "--skip=3Dtests::node_test"
> + "--skip=3Dtests::parser_test"
> + "--skip=3Dtests::pathological_test"
> + "--skip=3Dtests::query_test"
> + "--skip=3Dtests::tags_test"
> + "--skip=3Dtests::test_highlight_test"
> + "--skip=3Dtests::test_tags_test"
> + "--skip=3Dtests::tree_test")
> ;; We're only packaging the CLI program so we do not need to insta=
ll
> ;; sources.
> #:install-source? #f
> @@ -132,11 +151,21 @@ (define-public tree-sitter-cli
> (add-after 'unpack 'delete-cargo-lock
> (lambda _
> (delete-file "Cargo.lock")))
> - (replace 'install
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let ((bin (string-append #$output "/bin")))
> - (mkdir-p bin)
> - (install-file "target/release/tree-sitter" bin)))))))
> + (add-after 'unpack 'patch-node
> + (lambda _
> + (substitute* "cli/src/generate/mod.rs"
> + (("Command::new\\(\"node\"\\)")
> + (string-append "Command::new(\"" #$node-lts "/bin/node\=
")")))))
> + (add-after 'unpack 'patch-dot
> + (lambda _
> + (substitute* "cli/src/util.rs"
> + (("Command::new\\(\"dot\"\\)")
> + (string-append "Command::new(\"" #$graphviz "/bin/dot\"=
)")))))
> + (replace 'install
> + (lambda _
> + (let ((bin (string-append #$output "/bin")))
> + (mkdir-p bin)
> + (install-file "target/release/tree-sitter" bin)))))))
> (description "Tree-sitter is a parser generator tool and an incremen=
tal
> parsing library. It can build a concrete syntax tree for a source file =
and
> efficiently update the syntax tree as the source file is edited.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPohwEACgkQIgjSCVjB
3rDX8Q//fq1bUPBoBeQsdHaLPP9tiNPlptv9SBf3kR8etAwXfbM4p3+AZxmnUbwV
/JyHMqoNegDfpEya+7lGXkQ4vVGGgXx7HEK5DJ24wbXOWzUAOWAmAcXia5ssbKHx
bsbxbFiq4lBrtx7rj6Zbd4cXkgNXso/aMqH5EKZ+f0aXiLE7EkkB6K+gq8Hh2J0k
HrZg2+OrMxVP1xIub8MwqVbLpJLL5GSBlvh+DJ7HYW8ZTM6CI5tTkW7ai4fWXAJA
/2iXpm/kLBMeTTApcCzdWt7/jpDXNtNq7SXLPWHdAe5K0yHD30zk2SpaMyaJzW/5
LjUQrtuW8oLG6+FhzQCV7o37lIQesewHYdCExHayEjjpv56wlLUogkl8YJGDjFmr
se12rvlSKMEj07pdy3Z3aM6Wm9ci40ptBarK61SdNgWJI9vZExWnNwwVm7lviNm4
l3GdU2UuaWPiF/Ckp9JdODjmdKhA9q6qBkvUckoqxGuRmtszq89saI2UuzEuIclT
bTKxuhAaCPxbKK6ybYSJQj3RdtDaoqP9OPffVN95XUeXKoBvQKyPQZNEIeFbz7iv
/JmrJfCutSJfuDYsC3tmn/i6IWCghiB0SZAiQCxv5CdqNsS6dDNikFtksD0NtJvY
zfT9K42b77KseaN/YH7rZ5eXwutL8GVQ1KNd4hEyfUlGUuZdpWM=
=3LwD
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 06:05:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 01:05:48 2023
Received: from localhost ([127.0.0.1]:43862 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pR5Uh-0003W6-MO
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 01:05:48 -0500
Received: from relay9-d.mail.gandi.net ([217.70.183.199]:51549)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pR5Ud-0003Vr-IG
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 01:05:46 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 01F28FF802;
Sun, 12 Feb 2023 06:05:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676181937;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=wkEvLKtZWpHLOWaNK/6v9q86ICJe/M4LUsjsGtWsfP8=;
b=bYdGV9A0QQwH6JMT5ugHfn0YedAdcZEH+11A/zJ5Rx8VpEAeGuP883YmRVfa51lGsmvWZB
CDSv9s0cAb7Kmmu/pKhuaRQN63oqJhvDkpXdvYbhqG8VV2XRFVBYlNYt+nftwPBVg90IKQ
IQrrtOFRlsxGN5QIH8yhOJ7hqU8EM87s77r2msrrbt6FmKRTm91k8wzjpCxHKsp8hhD1fQ
21Og7aw/xrt0pi/XsXBCXFhJ2lsFymXn4siRYOKD23i/b6DzYG9P8ttTkBhK6YYInJ/Vn8
/oQiSi2oI6fb1di20tv/tNeIbQ4U8u1hqV+nn9Y3pDfhThtQ58rYPncmGg+mLQ==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87v8k9o3iz.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN> <87o7q1qzol.fsf@HIDDEN>
<87v8k9o3iz.fsf@HIDDEN>
Date: Sun, 12 Feb 2023 10:05:30 +0400
Message-ID: <87k00nfmfp.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-10 17:02, Pierre Langlois wrote:
> Pierre Langlois <pierre.langlois@HIDDEN> writes:
>
>> [[PGP Signed Part:Undecided]]
>> Hi Andrew, thanks for pushing this along! It's great to see things
>> getting merged.
>>
>> Andrew Tropin <andrew@HIDDEN> writes:
>>
>>> [[PGP Signed Part:Undecided]]
>>> On 2023-02-09 18:04, Andrew Tropin wrote:
>>>
>>>> On 2023-02-09 13:39, zimoun wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>>
>>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>>
>>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>>> right?
>>>>>
>>>>>
>>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlo=
is@HIDDEN
>>>>>
>>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlo=
is@HIDDEN
>>>>>
>>>>> Leaving out all the others, right?
>>>>
>>>> Merged first 5 patches from 01 to 05, also added one more commit, which
>>>> addresses some things from reviews and one commit, which adds html
>>>> grammar.
>>>>
>>>> The html grammar is added for the testing purposes. It relies on
>>>> generated parser.c and scanner.c and we will need to repackage it using
>>>> grammar.js instead. I'm not sure if a separate build system is needed
>>>> for this, I guess we can just rewrite tree-sitter-grammar function,
>>>> which generates packages as in example with tree-sitter-grammar-html:
>>>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitt=
er.scm?h=3D53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>>>
>>>> Anyway, I only skimmed tree-sitter-build-system source code, and plan =
to
>>>> read it carefully, evaluate and either introduce new build system or
>>>> just move all needed parts to tree-sitter-grammar function. WDYT?
>>>> After we done with it we can package all other grammars.
>>>
>>> Ok, I realized that the proper build process for tree-sitter grammars is
>>> a little harder than I expected, tree-sitter-build system make sense. I
>>> reviewed it, made a small change:
>>
>> Ah great, I was going to comment to try and push for us to keep the
>> build system. I originally went with a template package and inheritance,
>> but Maxime suggested moving to a build-system which ended up making the
>> package definitions a *lot* nicer IMO (see previous discussion here
>> https://issues.guix.gnu.org/49946#144). It also allows us to deal with
>> grammars that depend on each other more nicely I think.
>>
>>>
>>> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
>>> ;; Commentary:
>>> ;;
>>> ;; Build procedures for tree-sitter grammar packages. This is the
>>> -;; builder-side code, which builds on top fo the node build-system.
>>> +;; builder-side code, which builds on top of the node build-system.
>>> ;;
>>> ;; Tree-sitter grammars are written in JavaScript and compiled to a na=
tive
>>> ;; shared object. The `tree-sitter generate' command invokes `node' i=
n order
>>> @@ -114,7 +114,7 @@ (define (compile-language dir)
>>> "-fno-exceptions"
>>> "-O2"
>>> "-g"
>>> - "-o" ,(string-append lib "/" lang ".so")
>>> + "-o" ,(string-append lib "/libtree-sitter-" lang ".=
so")
>>> ;; An additional `scanner.{c,cc}' file is sometimes
>>> ;; provided.
>>> ,@(cond
>>>
>>>
>>> rewrote html grammar to use this build system and made it work with
>>> built-in treesit package. Also, tried examples of c and cpp grammars
>>> from patches in this thread.
>>>
>>> If you ok with it, I'll push the build system to master and update the
>>> html grammar accordingly.
>
> Oh, I forgot to say, this change to the build system LGTM! I'm really
> happy to see it merged soon :-). The path change will probably break the
> emacs-28-based tree-sitter support, but that's OK, it's better for the
> build-system to be made to target emacs 29's builtin support. I'm sure I
> can work around for emacs 28.
Actually, I think we can build grammars with both names, just providing
two .so files instead of one. If you won't find a better workaround we
can go this way.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPogaoACgkQIgjSCVjB
3rCzYhAAhapiaBqqMI9uquCvZGkU4uQMxNu5pOQwndhO6o7tqdta1BI2N0new05f
G5STYsZWqap5hT/lFaUf6zvJhQx8ypAxnWGYRVUOuwqWbx3ryu+2uIGcueO0Dp57
sh8lnB3SrmrJKrtm3iDZBi+14kpPC+HG4rHDyva87MyPUpuc3O6pwKrTT+mbxbam
Ym3dj1M9+HJIU+/1/yj6ch5JxhgVKCiDdFZwRQCtdmXCEW3QnCdxjAzYfso6dxl8
fOsCWsCl5JdssfHwA+k4dlyyK5ljNDEWJpqc9uW7SvYGukQsi6UuXchUFcU9JFRj
9bC0txaMNh/B8c/Of6cQ+gub87htVLW7A7ylZcOJobkPqPwZutnOOvNfVt6yzIwg
vaEDrBPfg8rXSpiP1sr3/2OI5KQp6mEGXSEYMRlYrhD3Pe8KMYJgo4Q/yK7cSvVX
7OciKztHrnH79Uvx72ZOUagIkANM3eaeXYrYd5cnAIBtE/gfbE6iTxr995oFZc+x
iMTdbqgu2ha1KcAERsSDtRKvye+s3MTNay9ldqt6oIZhZ1QeCP2GRVt69FU6Jfd/
s7FYB2+FE/GD+aHvJaneZ+vTzSI00PFavOjPhmscNLAV3zENqpo6sbTzHcC2opE3
SLA4V2TIQRS2IoGLiPUKXpmeg9FmTmmXih/kk0NrkRpJEbgdTDg=
=vT2W
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 12 Feb 2023 05:56:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 12 00:56:17 2023
Received: from localhost ([127.0.0.1]:43851 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pR5LU-0003GN-QA
for submit <at> debbugs.gnu.org; Sun, 12 Feb 2023 00:56:17 -0500
Received: from relay6-d.mail.gandi.net ([217.70.183.198]:39791)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pR5LQ-0003Fz-2y
for 49946 <at> debbugs.gnu.org; Sun, 12 Feb 2023 00:56:15 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 08C18C0003;
Sun, 12 Feb 2023 05:56:01 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676181364;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=i9dmPnWeEXB+LGcV9Wf7uQtXdlkwJdxd9UJzLC7Hp5k=;
b=erLixOVU3NzyMp/4I8pKPNsFC1b3E5NetCBG980jW+asswrx8VIT95LM+G3SrBsvVHnR+f
f570mFHZJ1PHGrDw79rO87LdnRwUAEdSOXYxyWrvt49VSWfgFDkmO8UMQ7WDoWzFZkM+dv
a5jCuITM8Sov6ugUk1u0xk5p4IknNoVuHQ9NbJ8EFDUujNBIo3m2zBNvX8BaLyIvnFWr5k
48GV7oddOqSe9G8wCZ1iycF9+DcO16pMHsmmSPkLDKd5Y8SOKS+Zh744C3s3OFYpOQjOY2
8qnVV/U2ESlUMGQyitJWCMBe+Edlr14XIEXe0dXxtjcmtiQdad0ZF9OUZRegfw==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87o7q1qzol.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN> <87o7q1qzol.fsf@HIDDEN>
Date: Sun, 12 Feb 2023 09:55:58 +0400
Message-ID: <87mt5jfmvl.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-10 15:48, Pierre Langlois wrote:
> Hi Andrew, thanks for pushing this along! It's great to see things
> getting merged.
>
> Andrew Tropin <andrew@HIDDEN> writes:
>
>> [[PGP Signed Part:Undecided]]
>> On 2023-02-09 18:04, Andrew Tropin wrote:
>>
>>> On 2023-02-09 13:39, zimoun wrote:
>>>
>>>> Hi,
>>>>
>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>
>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>
>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>> right?
>>>>
>>>>
>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langloi=
s@HIDDEN
>>>>
>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langloi=
s@HIDDEN
>>>>
>>>> Leaving out all the others, right?
>>>
>>> Merged first 5 patches from 01 to 05, also added one more commit, which
>>> addresses some things from reviews and one commit, which adds html
>>> grammar.
>>>
>>> The html grammar is added for the testing purposes. It relies on
>>> generated parser.c and scanner.c and we will need to repackage it using
>>> grammar.js instead. I'm not sure if a separate build system is needed
>>> for this, I guess we can just rewrite tree-sitter-grammar function,
>>> which generates packages as in example with tree-sitter-grammar-html:
>>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitte=
r.scm?h=3D53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>>
>>> Anyway, I only skimmed tree-sitter-build-system source code, and plan to
>>> read it carefully, evaluate and either introduce new build system or
>>> just move all needed parts to tree-sitter-grammar function. WDYT?
>>> After we done with it we can package all other grammars.
>>
>> Ok, I realized that the proper build process for tree-sitter grammars is
>> a little harder than I expected, tree-sitter-build system make sense. I
>> reviewed it, made a small change:
>
> Ah great, I was going to comment to try and push for us to keep the
> build system. I originally went with a template package and inheritance,
> but Maxime suggested moving to a build-system which ended up making the
> package definitions a *lot* nicer IMO (see previous discussion here
> https://issues.guix.gnu.org/49946#144). It also allows us to deal with
> grammars that depend on each other more nicely I think.
>
>>
>> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
>> ;; Commentary:
>> ;;
>> ;; Build procedures for tree-sitter grammar packages. This is the
>> -;; builder-side code, which builds on top fo the node build-system.
>> +;; builder-side code, which builds on top of the node build-system.
>> ;;
>> ;; Tree-sitter grammars are written in JavaScript and compiled to a nat=
ive
>> ;; shared object. The `tree-sitter generate' command invokes `node' in=
order
>> @@ -114,7 +114,7 @@ (define (compile-language dir)
>> "-fno-exceptions"
>> "-O2"
>> "-g"
>> - "-o" ,(string-append lib "/" lang ".so")
>> + "-o" ,(string-append lib "/libtree-sitter-" lang ".s=
o")
>> ;; An additional `scanner.{c,cc}' file is sometimes
>> ;; provided.
>> ,@(cond
>>
>>
>> rewrote html grammar to use this build system and made it work with
>> built-in treesit package. Also, tried examples of c and cpp grammars
>> from patches in this thread.
>>
>> If you ok with it, I'll push the build system to master and update the
>> html grammar accordingly.
>>
>> The final result will look like this:
>>
>> (define tree-sitter-delete-generated-files
>> #~(begin
>> (delete-file "binding.gyp")
>> (delete-file-recursively "bindings")
>> (delete-file "src/grammar.json")
>> (delete-file "src/node-types.json")
>> (delete-file "src/parser.c")
>> (delete-file-recursively "src/tree_sitter")))
>>
>> (define* (tree-sitter-grammar
>> language language-for-synopsis version commit hash
>> #:key
>> (repository-url
>> (format #f "https://github.com/tree-sitter/tree-sitter-~a" la=
nguage))
>> (inputs '()))
>> (let ((synopsis (string-append language-for-synopsis
>> " grammar for tree-sitter"))
>> (name (string-append "tree-sitter-grammar-" language)))
>> (package
>> (name name)
>> (version version)
>> (home-page repository-url)
>> (source (origin
>> (method git-fetch)
>> (uri (git-reference
>> (url repository-url)
>> (commit commit)))
>> (file-name (git-file-name name version))
>> (sha256 (base32 hash))
>> (modules '((guix build utils)))
>> (snippet tree-sitter-delete-generated-files)))
>> (build-system tree-sitter-build-system)
>> (inputs inputs)
>> (synopsis synopsis)
>> (description (string-append synopsis "."))
>> (license license:expat))))
>>
>> (define-public tree-sitter-grammar-html
>> (tree-sitter-grammar
>> "html" "HTML"
>> "0.19.0" "v0.19.0"
>> "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
>>
>> After that we can bring the rest of the grammars.
>
> I would suggest to rmeove the `tree-sitter-grammar' function, and keep
> grammars as "regular" package records, even though it's a little bit
> more verbose:
>
> --8<---------------cut here---------------start------------->8---
> (define-public tree-sitter-html
> (package
> (name "tree-sitter-html")
It seems tree-sitter-html mimics upstream package name and probably make
more sense than tree-sitter-grammar-html used by me.
> (version "0.19.0")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> (url "https://github.com/tree-sitter/tree-sitter-html=
")
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> (base32
> "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
> (modules '((guix build utils)))
> (snippet tree-sitter-delete-generated-files)))
> (build-system tree-sitter-build-system)
> (home-page "https://github.com/tree-sitter/tree-sitter-html")
> (synopsis "Tree-sitter HTML grammar")
> (description
> "This package provides a HTML grammar for the Tree-sitter library.")
> (license license:expat)))
> --8<---------------cut here---------------end--------------->8---
>
> This way, they look like any other package in Guix, which makes it
> easier for us to apply automatic changes in the future if needed (for
> example like how the input format could be automically updated for all
> "simple" package definitions, but had to be manual whenever custom code
> refactoring was done). Does this make sense?
Make sense, but on the other hand we already have hunspell, aspell
dictionaries and probably a few more others, which are very similiar in
spirit and we already have to keep in mind their existence on such
automatic code updates.
It looks that the packages differ only in url for the source code, lang
name and sometimes in inputs. Having template package function can make
management of shared parts more centralized, reduce possibility of
copy-paste mistakes, when the description wasn't updated and so on and
can reduce the amount of the code overall (which also reduces the change
of introducing an error).
I don't have a strong opinion on this topic, but leaning towards the
template function slightly more, however I'm completely ok with the
standalone package definitions as well. WDYT?
>
>>
>>>
>>> According to emacs integration: I already have a working prototype on
>>> my local setup, which uses builtin treesit package, it's similiar to
>>> what Luis mentioned with search-paths. We just need to figure out a
>>> few minor details and I'll add it.
>>
>> I've sent a patch for emacs+tree-sitter integration in a different reply
>> in this thread.
>>
>> Thank you very much for all the work, it's really valuable!
>
> :-)
>
> Thanks,
> Pierre
>
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPof24ACgkQIgjSCVjB
3rDSmw/+Need86jXW8YJuPd3UOS/Hb6S7YGCi9Dibxf8EOGfSxd5+YRo5JYNKGlh
+xCPSfU6wEEbxH1zVY0AejsJkJxhizK0jDkTn4ACQImi/FpmWKrpf/UpiMIsMdhw
o7OUY20sZNs0Xb3WSLLb5azjCfj0teEzMEBT/vmL0pGnzFdEwDQb24aE4euQB3LJ
0Kyyh+V6RbV6AtQHbeAYVMdDlPSkzgBw7uAhvafmgLD+tObP+1G4oP/QTt+VaJCN
Sqtmwz8nzTzMkn4KaWux1w0/kxefM8VbIWe16XPZiGG2A2Tjtyovl+F8Y1NmfdBQ
6+Ljxr0OgBBMOh62UHR5CAMc0celSQEl2gGbon9Sk08YDi1xq4j1v3a3h/f8ZIR5
Pou0VI8wHJaU/2UFo8yDQkCotnHFQT0UcY8hdy1gPDYVf9U0hOwoKonjDBmPCmCK
srwwlEI6RyAfza14lCHd/i/HumD8BxmBZ6ZTRqkeqXFMFKl2XllyQfsqpoO1sfn5
0cDxnjKgfaJ9dVcXAKRnDbH0oTWmxIfbyF96MqRT+t/cZNWr1tQ5Tp1+ByHCY5S8
5ETp91rnSt9xR+IvKvZbbP33PwRTpTMay1QsJSYK1YJCjDMEZMguEAlO8hMNJrB/
ygQUnYs87q4R1GfyJF0a0eHb2HQyTI5acpSRx4b+Jg4+TlOc34A=
=WmHB
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 11 Feb 2023 08:12:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 11 03:12:39 2023
Received: from localhost ([127.0.0.1]:38580 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQkzu-0000mn-Ny
for submit <at> debbugs.gnu.org; Sat, 11 Feb 2023 03:12:38 -0500
Received: from relay4-d.mail.gandi.net ([217.70.183.196]:60017)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pQkzp-0000mK-LN
for 49946 <at> debbugs.gnu.org; Sat, 11 Feb 2023 03:12:37 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id ED938E0005;
Sat, 11 Feb 2023 08:12:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676103147;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=NwhgP/qkghRnFRNeznsxiL2oJRx3PZ/Z4/ZBYmG4VlM=;
b=Mx0gx2Aez8CLRTPOpCDrYZXXD1ljroejrU+a+3wMol2+UkEOV0473aQHTzDcd51WbKAMmv
06TgJ+fqCy2WOOYwvMMJMpWZe9l1NkKVpY18FcLmWXilhRKnpom40pBsRBDJdn+vzPYg86
jUyUjmH7iPv49oF9p3x6R5lEnjPdzcnjltyD8paJOiMXGc0upvS4l5PLO74kmp80xl8gDC
GLfUkhmocKPCIwLti745y3w3GmynA1eJ7+/mFEuTZvnMAo3gb6xzdqP55+VQG4HeNIgr0K
6kxWyOj+TXK08/n18dh1MI0sOevct83V/xybOAlkudZZnLMZjwdG5F0ka/lKNQ==
From: Andrew Tropin <andrew@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Subject: Re: [bug#49946] [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
In-Reply-To: <5759483f7ac184a50a316401a9cc2f67d1719506.camel@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN> <87edqxri41.fsf@HIDDEN>
<5759483f7ac184a50a316401a9cc2f67d1719506.camel@HIDDEN>
Date: Sat, 11 Feb 2023 12:12:20 +0400
Message-ID: <87357cipsr.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
Nicolas Goaziou <mail@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-10 19:02, Liliana Marie Prikler wrote:
> Am Freitag, dem 10.02.2023 um 13:21 +0400 schrieb Andrew Tropin:
>
>> + ;; tree-sitter support is not yet available in emacs 28,
>> but this
>> + ;; search path won't harm and also will be benifitial for
>> + ;; emacs-next and other emacs-* packages, which have
>> tree-sitter
>> + ;; support enabled. Please, remove this comment, when
>> emacs
>> + ;; package is updated to 29.
> IIRC it's "beneficial". Otherwise LGTM
Nice catch, thank you very much, pushed as
c77a3d4554175ee5320ccc713aa21b1ba3e6b8a3
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPnTeQACgkQIgjSCVjB
3rCZJQ//RH8pLMpK4PzGyyOrxNotwGD8OZUAI5GMbOFa30W7e+8B+HdPPsLqZFXK
iLDo9v1FH5llI6Mw35xT9OPchw+yHtrv6+a3sn9zavNP+tW5P/oqrI3djjiNHHET
Og8hYKC+ZjJ9jJFocW8hIyMFhcsc+YmNgTrSIhoZe2rzGCIJUPOik7oSHFg3nnji
Pp2ZjUMiocisCOZix0i3AhAwm+lx9xmlrObNyUFGyPs+Sv3LWkKBGsX28FzfoHaX
VBhVdwldUBGFHyS8htlDHDCScjz8ZbwJ9bBjX8C2yLkbajzqrHhvwIfwVM0mg6Bc
g4JH/J7XSI2LONvJRRmD3lOC00NiF9ko6Q0cPpj8Tg87Dsvh9bBrnEm56g6AjOYA
qzJ634kH2Ik7zKoFY4xiKzER/FCJR5Ci0zfLrX3udCM53UP7KkGolPB6RnIVBQiv
KyeEs3ZhF/Hkh9KwuuC+xIVRKO1tC/+cgwv5ldzLA2u4IFOmsbUfDYwMM1Qjztgm
FPl7p/drMH3qREOmrT5HUCplxs0wqLUKX3PlNBZy/uErJ5SKkiiU68xddu9DdtA9
2tG0g4SrVBGRjBis5DvGg9RtNee6apuJFjug+mOXZMNkO8O2WgtDE4OBVGXMoPlX
vPAdMdURrc2iBbrxIoQVQZ/4zMoyAxs2rS6OplCezewFA5M6yiw=
=EYYK
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 18:02:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 13:02:12 2023
Received: from localhost ([127.0.0.1]:38062 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQXiu-0003G6-1M
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 13:02:12 -0500
Received: from mail-ej1-f66.google.com ([209.85.218.66]:34309)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1pQXiq-0003Fr-8y
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 13:02:10 -0500
Received: by mail-ej1-f66.google.com with SMTP id qb15so15950835ejc.1
for <49946 <at> debbugs.gnu.org>; Fri, 10 Feb 2023 10:02:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject
:date:message-id:reply-to;
bh=Vyo1bs8SaES3iPCMlUIG7nDzBjlE9SIQwNUZS6OTJ+Q=;
b=SDiyw32c4cD5Uz1KU9vxzMAacg+mTghVE3R32ejGnALUudi4AMqLjT7D7thW+IGfuJ
Mxb+6gktCEYAtk/EhfBVWPWNPqvRB14T/nTl1dTHs/nx8WNWDeCrYXinBv8kJEwqYtN8
sZlYqAN/378/xuAlH5xvf/zJsCKXuK4WCzyDG1D04c6z8YYcX1qlfiD27yLFbK0VtgKy
MPb7OHjGknbD7RpFheX8SHwJcLsmmGBLulpd0FwmzIOGzMBVfc3ewxQrUWeNX0ekFzLF
hLfAtZr0KV5X4d6sVrso4kWTIBf+b9FGK62Ts9BUoz2fsCP5OPDsi+UrA3QGaG2+92cD
9zLA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=Vyo1bs8SaES3iPCMlUIG7nDzBjlE9SIQwNUZS6OTJ+Q=;
b=1pDvbDc9RCyj37M8pI4mLtj2QEPij3Qd+tYP789k6BDfejGgUbFQUzGKvzeyA+zXi1
g3AAF0Kuzgc+EFbPy6R2yMZah/43WYXyfnGMmp7JcdDixYYX4q7N3UbzaWXsMoE4Njvt
0yqRYFeq20NyWnog2oYwTsa2BJ3/mA+kwd4V0Phcl2qicbPKa8wOnI2irYfjJjxJ7fcF
3dO38TrLtpPCdusgRV/D1/PWyGlaDgvFeKfpuKuHDB6tdGgcf82RydfE8s5v4UflJ9zJ
vGaS1bD/td/8W/qq884ptAL0AhcprURdc7wGQuaccIYQ9Ptl0Ja6T1JynCSIXwmrqW+1
E7rA==
X-Gm-Message-State: AO0yUKWs0mDYXvQPcAp1XaNs3+11J4/Gb+DFmGl38/m9/LfhllZXvO/U
x3BIdvwGdW3c+NJU1qSh2M4=
X-Google-Smtp-Source: AK7set9ba6dkk269zoJh4zzvaaJWRGyxgdzqKasCgJsAVcSSSCs+SYESrgUYqZRJxfm5Vtr0IqWu3A==
X-Received: by 2002:a17:907:c683:b0:887:d0e6:fa28 with SMTP id
ue3-20020a170907c68300b00887d0e6fa28mr18228031ejc.1.1676052122383;
Fri, 10 Feb 2023 10:02:02 -0800 (PST)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
t26-20020a170906949a00b008778f177fbesm2741871ejx.11.2023.02.10.10.02.01
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 10 Feb 2023 10:02:01 -0800 (PST)
Message-ID: <5759483f7ac184a50a316401a9cc2f67d1719506.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Fri, 10 Feb 2023 19:02:00 +0100
In-Reply-To: <87edqxri41.fsf@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN> <87edqxri41.fsf@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.0
MIME-Version: 1.0
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Am Freitag,
dem 10.02.2023 um 13:21 +0400 schrieb Andrew Tropin:
> + ;; tree-sitter support is not yet available in emacs 28, > but this >
+ ; ; search path won't harm and also will be benifitial for > + ; ; emacs-next
and other emacs-* packages, which have > tree-si [...]
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (liliana.prikler[at]gmail.com)
1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL,
https://senderscore.org/blocklistlookup/
[209.85.218.66 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[209.85.218.66 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [209.85.218.66 listed in list.dnswl.org]
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
Nicolas Goaziou <mail@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
Am Freitag, dem 10.02.2023 um 13:21 +0400 schrieb Andrew Tropin:
> + ;; tree-sitter support is not yet available in emacs 28,
> but this
> + ;; search path won't harm and also will be benifitial for
> + ;; emacs-next and other emacs-* packages, which have
> tree-sitter
> + ;; support enabled. Please, remove this comment, when
> emacs
> + ;; package is updated to 29.
IIRC it's "beneficial". Otherwise LGTM
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 17:13:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 12:13:21 2023
Received: from localhost ([127.0.0.1]:38019 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQWxd-0001u6-75
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 12:13:21 -0500
Received: from mout.gmx.net ([212.227.15.15]:38525)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pQWxY-0001tr-Ua
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 12:13:19 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx005
[212.227.17.184]) with ESMTPSA (Nemesis) id 1MtOKi-1oaLZz0HMs-00upRQ; Fri, 10
Feb 2023 18:13:09 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Fri, 10 Feb 2023 17:04:58 +0000
In-reply-to: <87cz6jgcku.fsf@HIDDEN>
Message-ID: <87fsbdo34v.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:anvIUw9Z/UbdW6TwK8LuOGFHsIZcXZRXCA/WGvf0tBPeHJjjf0A
e2Jw2mgamro+50l5KzWf0xP6sGip2ZR/RTwygJtpUN4iZTW5+VT9QLZue+cSIBRlE2jY/l9
hCdWeBpASmmRXUtJr+Mq//IBOGSewVflnU64YaVMaQmIsf0J+8xrz4pCw6yLzyY9x+bi/kJ
RpzuplJJTlM3deuCTqwbg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:XRrxjxl9BYs=;eWhb9PQodraJsy5lmhX+Ja2b3mf
kJH4oP6+EMl6vLxW0eIbPH9Gba1J9GGb15Z2IPN9cPGkqZB0S9YtRffubtK6w3wjg5XCDXNnd
wHIweQ1G+dXMFQX85KJstEOHHTnawepIsNhS/MqdxFamCF7qQbpB4E8TDcP6inesRzGg8uyzA
M84aQtw5cUc6uwtdA06q8z0e8wgdmorNjZmBtCKJQm+lHb9nBZaM9WkAwNgiqC4Pqaz/R8HuT
tmhYrZRuZGETJJmvrCbIucGK3DMNyQHGLzzKizLEIbbZMNUILpB+aOyqualMSPokriGD90vbl
FeFDlRSleQVJoGSkLdt8Kc/22yZuwmwM+4ilsBROAr6uQ4WOJxunz6yEUVqVsN3uA5qZkIQvx
CVH0oNziGGf76bm2zG9wbZGIhMmoThhQedDuijZSZplMkSvN1zOo8hlo4+gaFfIg5vkCyTEN/
r/iKa9M4H4gO61E3kEVqRxqHXdrWj0A0yoFy6n1nNeVIcvj1tD0qJe5nTr8N2zudHKaxaalND
f/APstiBKNf+VvYw1GdUF3ZhNgGkRQljPw9cq3+M4Q4XPubk5aTz1CvcwgTttaNG7ivJeKCrX
r4MS64+o1px/6kun2YPb6NtQgauTC2OoAdXWzQGscTKWA5RZJWhuLeSUaQp9OWb5jz9ustMyt
aE80VFN0txFn76I/a5OZP12L5/pdMZlfVOnH6w/qncKp+oSsJDCfVcjMAs2gghU1yC7TOsooS
gnI8ik9NCbfFEq1++stm0FncNrCq2g4kSfFwZV5riCqVRoOangz78pJ+jTucN59228MgGel8C
+uNGGi8DrPw2FVvnMXtQgkJetqof6eTWSjOYbkNHFcMaabKRDNbGzQYjfPYuSXI/nYv6HBUH6
/d/x8rGdgCl4bm9LgZW5B5SbP5HlxBTuuSQsjQNyEv6h3n57PoKv9n2cmvIp7XAmArV1sCwMs
1R/COQ==
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain
Hi,
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2023-02-09 13:39, zimoun wrote:
>
>> Hi,
>>
>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>
>>> I applied tree-sitter and tree-sitter-cli patches,
>>
>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>> right?
>>
>>
>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
>>
>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
>>
>> Leaving out all the others, right?
>
> Merged first 5 patches from 01 to 05, also added one more commit, which
> addresses some things from reviews and one commit, which adds html
> grammar.
I had also started rebasing addressing comments on the tree-sitter-cli
package, and had a few extra changes left that haven't been pushed.
I realised we could remove a now redundant comment, and while enabling
*some* tests, I realized we should directly depend on node and dot, so
that people may use the `tree-sitter' command, without needing them in
the same profile.
What do you think of the following two patches?
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPmeyAYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UX5kIAIrZysgv8hWcXNW4Jsu5EcWn
wok8kyxdTQWA+WbISavEq142olVZSGNmrJhBLv/EvciUCyVnxBFH+U8ru50d00al
2kvqE1agfVRD7UwrZy19liPfH8rWGP1r8INRwuUR3SHiyIXv7ANhef1iFtTKMWNx
4mB8aVyPkV5jz1WQom6PIhpU/yx0xijSq6dL83qQTccPPdjcBARrjasv29ctNbOe
ilnUJdroSd+72lJApV6mieLbYTLSFMsiJIPctX/ZnSorLPcLdEjZXSBUD6RC0Qbw
2LnavQAHyOnQLNskpBg1w/9Qf2H6ia/wTkL0gWkNQYAcKDVKo7Rxa0LFZtsuLAA=
=753I
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0001-gnu-Remove-tree-sitter-comment-from-emacs.scm-import.patch
From b24b04015261cfea2143be63671877c9c2c8d458 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Fri, 10 Feb 2023 16:10:25 +0000
Subject: [PATCH 1/2] gnu: Remove tree-sitter comment from emacs.scm imports.
* gnu/packages/emacs.scm: Remove tree-sitter comment.
---
gnu/packages/emacs.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4ce41deb88..4791570d12 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -76,7 +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 tree-sitter) ; for tree-sitter
+ #:use-module (gnu packages tree-sitter)
#:use-module (gnu packages web) ; for jansson
#:use-module (gnu packages webkit)
#:use-module (gnu packages xml)
--
2.39.1
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0002-gnu-tree-sitter-cli-Enable-some-tests-and-add-node-a.patch
From 8225d51edeb528c51d30ad0f225eb96be5586a37 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Tue, 29 Mar 2022 20:13:11 +0100
Subject: [PATCH 2/2] gnu: tree-sitter-cli: Enable some tests and add node and
dot.
* gnu/packages/tree-sitter.scm (tree-sitter-cli)[inputs]: Add graphviz and
node-lts.
[arguments]<#:cargo-test-flags>: Skip tests that require downloading grammars.
<#:phases>: Add 'patch-node and 'patch-dot phases. Tweak install phase.
---
gnu/packages/tree-sitter.scm | 49 ++++++++++++++++++++++++++++--------
1 file changed, 39 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 2e44339ca2..4331ffdd97 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -24,7 +24,9 @@ (define-module (gnu packages tree-sitter)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
+ #:use-module (gnu packages graphviz)
#:use-module (gnu packages icu4c)
+ #:use-module (gnu packages node)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix gexp)
@@ -96,13 +98,30 @@ (define-public tree-sitter-cli
println!(\"cargo:rustc-link-lib=tree-sitter\");~@
}~%")))))))
(build-system cargo-build-system)
- (inputs (list tree-sitter))
+ (inputs
+ (list tree-sitter graphviz node-lts))
(arguments
(list
- ;; Running test requires downloading fixtures, see the
- ;; script/fetch-fixtures script, which fetches grammars. Maybe it make
- ;; sence to run tests in the grammar's packages?
- #:tests? #f
+ #:cargo-test-flags
+ ''("--release" "--"
+ ;; Skip tests which rely on downloading grammar fixtures. It is
+ ;; difficult to support such tests given upstream does not encode
+ ;; which version of the grammars are expected.
+ ;; Instead, we do run some tests for each grammar in the tree-sitter
+ ;; build-system, by running `tree-sitter test'. This isn't as
+ ;; complete as running all tests from tree-sitter-cli, but it's a
+ ;; good compromise compared to maintaining two different sets of
+ ;; grammars (Guix packages vs test fixtures).
+ "--skip=tests::corpus_test"
+ "--skip=tests::highlight_test"
+ "--skip=tests::node_test"
+ "--skip=tests::parser_test"
+ "--skip=tests::pathological_test"
+ "--skip=tests::query_test"
+ "--skip=tests::tags_test"
+ "--skip=tests::test_highlight_test"
+ "--skip=tests::test_tags_test"
+ "--skip=tests::tree_test")
;; We're only packaging the CLI program so we do not need to install
;; sources.
#:install-source? #f
@@ -132,11 +151,21 @@ (define-public tree-sitter-cli
(add-after 'unpack 'delete-cargo-lock
(lambda _
(delete-file "Cargo.lock")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((bin (string-append #$output "/bin")))
- (mkdir-p bin)
- (install-file "target/release/tree-sitter" bin)))))))
+ (add-after 'unpack 'patch-node
+ (lambda _
+ (substitute* "cli/src/generate/mod.rs"
+ (("Command::new\\(\"node\"\\)")
+ (string-append "Command::new(\"" #$node-lts "/bin/node\")")))))
+ (add-after 'unpack 'patch-dot
+ (lambda _
+ (substitute* "cli/src/util.rs"
+ (("Command::new\\(\"dot\"\\)")
+ (string-append "Command::new(\"" #$graphviz "/bin/dot\")")))))
+ (replace 'install
+ (lambda _
+ (let ((bin (string-append #$output "/bin")))
+ (mkdir-p bin)
+ (install-file "target/release/tree-sitter" bin)))))))
(description "Tree-sitter is a parser generator tool and an incremental
parsing library. It can build a concrete syntax tree for a source file and
efficiently update the syntax tree as the source file is edited.
--
2.39.1
--=-=-=
Content-Type: text/plain
Thanks,
Pierre
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 17:04:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 12:04:53 2023
Received: from localhost ([127.0.0.1]:38015 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQWpQ-0001h3-W1
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 12:04:53 -0500
Received: from mout.gmx.net ([212.227.17.20]:56999)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pQWpM-0001gn-47
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 12:04:51 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1Mq2nK-1omTAw1Q1K-00n9Ns; Fri, 10
Feb 2023 18:04:40 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN> <87o7q1qzol.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Fri, 10 Feb 2023 17:02:31 +0000
In-reply-to: <87o7q1qzol.fsf@HIDDEN>
Message-ID: <87v8k9o3iz.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:+HDhHRYd4DYq7tufCaRgop3taPG226GhYcov2K8HcpeETpKRry/
denIlAKbXMnQHPiib/07yoHbHy/1hLW5gcohIXMKJTLBfv5vi7knghVDmvp2joOXyyAmPnO
dAzueJVOs9x6AlQsYYRYHgnNKZtCCYk+a3aZ2mw6x2rKVF8X4ANm6qG473h6jlIB/ob02yY
uEM/bKuCf2Uvj/7w0tZdg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:1dFQtBRPy/w=;0t11VpNJ/grlWhwv4EWaQJlyJQJ
jzuPSMCO0TWsL8ZLp0Tz+g0smKpetlfnOHW3EQLh4ntd5ZMWQ0xC/X1LDiY3CK2VHYkbbJWuU
CmuBO2QsYLwKr8wsCOndFhdHNylJSjPgiH5H/LOsDM8lOZLisDlJjKtlJ9AX6Kj8kXvQTTyWe
BM+Nhi9Rnr6rbqGkGQj8hmH3TQqEJmY8Z+fk+uwrBVDVcSvELq0hCRLQ6cahGTjCAQNAvSDXv
gJ4b8+8EC23aplWFGYdSagBAhgvZFKdutQcmkCCZwCIc1H+sx+ajZr8cDefTS4YLXxSIn5pMr
yJ1j3qCH6asHoiZoSdMu/mgnisSMLaLkl67nlHucTCuJw9G51iXhBEsgl9oFKMEFc7YC6BZUR
+qyUHNJAwvtgcwf1qd1VWymFRsOYowvRd9C0uv5KVoAcLHFCFlmH9MEMna0s0V3iFJhzcQiQR
vHjcVucn0kutBrUDV4uNPh2kvRAnCARCFqwl1cHlpwdDFIMU8TOhT/ngtjS7tUX27peO+oAR1
p5/e9QH2BooL+ByQuBjLUQDMTm0QBlMAU2/IrbiNmeEqFiL2+eAx16xARSezXfduulYA8ksLU
djJ5mm6dAlcWu/iOOzNNODJxgno4HU2N3mQ0MDgYBwuOtFsZF6vW65Y4sBAzt8KsxGhCcUssB
mjewP80UK4iVcbIvWYKUaHrwYSMcBw4C9SPUcHO9J5Ji9/sHV7f0XCVKTBTF8CwdlihkZS+LA
Jua+JbdwCyALfVnzEdddEr1eb4fKQkCQIvV5VxDt1DKRFtBse0mJAL/VziiLSYNpV0CuI1s0X
gxzzG3K6asOYD8+ISIH2J2qgSrIV4bncVMBQDfFi8WsRMH2a3pFPpUbki5sz/tJMADTFYOugk
88NGnmlRKBdTeOQI3S1sDjeswW8gPovI0OlGh2Zc5on3P7w2av/8GMqC0zoTB6TBRZLZ9kR5S
xnVyD4GxPgnK4N7eF2iZggUx/lE=
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Pierre Langlois <pierre.langlois@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Hi Andrew, thanks for pushing this along! It's great to see things
> getting merged.
>
> Andrew Tropin <andrew@HIDDEN> writes:
>
>> [[PGP Signed Part:Undecided]]
>> On 2023-02-09 18:04, Andrew Tropin wrote:
>>
>>> On 2023-02-09 13:39, zimoun wrote:
>>>
>>>> Hi,
>>>>
>>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>>
>>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>>
>>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>>> right?
>>>>
>>>>
>>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
>>>>
>>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
>>>>
>>>> Leaving out all the others, right?
>>>
>>> Merged first 5 patches from 01 to 05, also added one more commit, which
>>> addresses some things from reviews and one commit, which adds html
>>> grammar.
>>>
>>> The html grammar is added for the testing purposes. It relies on
>>> generated parser.c and scanner.c and we will need to repackage it using
>>> grammar.js instead. I'm not sure if a separate build system is needed
>>> for this, I guess we can just rewrite tree-sitter-grammar function,
>>> which generates packages as in example with tree-sitter-grammar-html:
>>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitter.scm?h=53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>>
>>> Anyway, I only skimmed tree-sitter-build-system source code, and plan to
>>> read it carefully, evaluate and either introduce new build system or
>>> just move all needed parts to tree-sitter-grammar function. WDYT?
>>> After we done with it we can package all other grammars.
>>
>> Ok, I realized that the proper build process for tree-sitter grammars is
>> a little harder than I expected, tree-sitter-build system make sense. I
>> reviewed it, made a small change:
>
> Ah great, I was going to comment to try and push for us to keep the
> build system. I originally went with a template package and inheritance,
> but Maxime suggested moving to a build-system which ended up making the
> package definitions a *lot* nicer IMO (see previous discussion here
> https://issues.guix.gnu.org/49946#144). It also allows us to deal with
> grammars that depend on each other more nicely I think.
>
>>
>> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
>> ;; Commentary:
>> ;;
>> ;; Build procedures for tree-sitter grammar packages. This is the
>> -;; builder-side code, which builds on top fo the node build-system.
>> +;; builder-side code, which builds on top of the node build-system.
>> ;;
>> ;; Tree-sitter grammars are written in JavaScript and compiled to a native
>> ;; shared object. The `tree-sitter generate' command invokes `node' in order
>> @@ -114,7 +114,7 @@ (define (compile-language dir)
>> "-fno-exceptions"
>> "-O2"
>> "-g"
>> - "-o" ,(string-append lib "/" lang ".so")
>> + "-o" ,(string-append lib "/libtree-sitter-" lang ".so")
>> ;; An additional `scanner.{c,cc}' file is sometimes
>> ;; provided.
>> ,@(cond
>>
>>
>> rewrote html grammar to use this build system and made it work with
>> built-in treesit package. Also, tried examples of c and cpp grammars
>> from patches in this thread.
>>
>> If you ok with it, I'll push the build system to master and update the
>> html grammar accordingly.
Oh, I forgot to say, this change to the build system LGTM! I'm really
happy to see it merged soon :-). The path change will probably break the
emacs-28-based tree-sitter support, but that's OK, it's better for the
build-system to be made to target emacs 29's builtin support. I'm sure I
can work around for emacs 28.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPmeSQYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U2NMIAKtMcusAtlfJdTuxpVzNPJCK
SMiWLULheY6nGPuNqTrsLA8ZmKsD572JJwLVuT4DMB8Vsf4a2FaL9NPAblTiOgsj
Ho9WXtdnQ966/sTz6TQLX2YV/7EkfCCAavDTMYrYtpeMnph8XC50/6dRPf65XwsU
35iifeIO6hIb8anTv1SWVxUtBFlMb8K0AILBfiCCWfhHP4gl6CHEYtCzzXIZs3iP
uDq9bt0l34YhfXLeO4hbIv+bzF37JauhnlW0lxDY4sRcH83C66sVLVr7eUUNiuBu
fanpQKDZDFwWANN+lhbUWOxw95RmMGu4/Cr3CW77r7ip+QA7zrw9z+VXUqI3URo=
=beyk
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 16:38:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 11:38:42 2023
Received: from localhost ([127.0.0.1]:37970 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQWQ5-0000ut-IR
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 11:38:42 -0500
Received: from mout.gmx.net ([212.227.17.21]:55727)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pQWQ3-0000ue-9A
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 11:38:39 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1N79yG-1oWSMr0Cmi-017YO0; Fri, 10
Feb 2023 17:38:29 +0100
References: <87h7fztt60.fsf@HIDDEN> <87edqxri41.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
Date: Fri, 10 Feb 2023 16:22:07 +0000
In-reply-to: <87edqxri41.fsf@HIDDEN>
Message-ID: <87zg9lo4qq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:JIkHk2Iu9ykxbCuxmfJzy+acW4FH57WLf/Lm56K4p0v+R9ToaVM
3rRaye8LHGnUToN2GbRe6fq5/oQ5ht9otGTkQSYzOvTXg4j1PsTzl0wxInKuO6y1HkQvPsT
81jrHlxNv3G9bz1CkC6G38sAHxOAb7DOvHNRACcJEM8uhCen9f2wuL6fFoNshCqFdvJTeTq
gDO+CvT4jiBEmeb8ZKFCw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:5aHKQSAGjEQ=;lm9lbKBzqu8MlVT6jXmSSgRtpaU
cn9n1pBzKMgiAzrjsTq5Wmn56guN919Ozehib52LqxRTZJ511PVQIUqlHQAzJqdezRtaQtDBU
dwso2Q+d1u9J97YQqe1hZ+ccVOVfkALY3avDNcQJmJf7kIXBaCLKDHWrXT+SeaUd2RgQPvahG
ZIuDo/DoOE3EcO2Wuxd4qyRIeFFkpWanQGy5U8mEJdFIC20xv6nN2uhTRx5yxLDDhmq1sIXL/
0Knr05G6g6JTI4joiyrBVqqK4ndQ6FUGQti33xyhR/ODY16W+YhTDZwmNwt2Z80LQ38MRwl1A
c/QUn/VeduC+lenl3192S1+aJV+X42DRvKIaBTl8s6n5xA222ZlHotoMxDzmqZGHBVEAb6418
Iph7VN7WYcXiiYfUPR6/Oz/CWWd72iOG0WbiqFWZKquxW9U8Rbt07KTnMjzsmoOHbLV7DpcF/
FFlOnQBb9z7V58chp9CNk0jbUyhF4Ox4GMTZ/OgL3exqNlLF9Lk/5XBhLc9PZXuF8oJzsHqXO
0FnTnlnJT4WD/VTY59B6L5dNSt1jDPDN8kvOOmuQH1BGAweNUuOUrBrGVnGqEsERzZB2IsP7U
Ct6MyYjKSqpkJJK0KeOSeOqR6nMw/fdLCu6vBhyy97XBPkO/Q2TMCtN9R/yuS1OjrSK2D4Bvs
Q505X6Vtl0TIfqP3kF0ImPAEVZt9eqy5xtld4Surqre9k0Du04qR76rPMFmOl8tosMuJL8raO
jJk1SGLdPh9UeoRxuLiYSeQQOcAXeAZHKM2QUQz5xjqENBpCRQ9UED0EEjM6JlZv8TPckOOtx
3irkhy2l2Imv0u3sHUM+QKnpcrhpbhI9J5MHPUAbO87iSnxR1VW9E7NmaVw26oEOhqUl0QEeZ
6asi98Cb5eUPkP9xyXc/9Z5OU9+WQ4Tc2L4Fbw9sH21HtsDc9CE6Qymwepd1fX93jy1cx1wfY
Bs3uu2s/polfxhSoAObBHkVwpmM=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Nicolas Goaziou <mail@HIDDEN>,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hi,
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2021-08-08 23:29, Pierre Langlois wrote:
>
>> 4. Finally, emacs support!
>>
>> emacs-tree-sitter can be used for syntax highlighting, replacing
>> font-lock. The tree-sitter runtime library is built as a Rust crate
>> and exposed to emacs using a module thanks to the rust-emacs crate.
>>
>> Then emacs-tree-sitter-core provides just the core APIs as exposed by
>> the rust module, then emacs-tree-sitter integrates it with emacs'
>> syntax highlighting (and probably other things).
>>
>> Finally, we bundle together the various language grammars into a
>> single emacs-tree-sitter-langs package so that they can get loaded
>> along with their respective major modes. Note that there are grammars
>> left to support which I've not yet managed to package, but what we
>> have already is a good start I think :-). So far I've tested C++,
>> Rust, Python and JavaScript and JSON.
>>
>> * gnu: Add rust-bindgen@HIDDEN
>> * gnu: Add rust-tree-sitter.
>> * gnu: rust-emacs-module: Update to 0.16.
>> * gnu: rust-emacs-macros: Update to 0.17.
>> * gnu: rust-emacs: Update to 0.17.
>> * gnu: Add emacs-tree-sitter-core.
>> * gnu: Add emacs-tree-sitter.
>> * gnu: Add emacs-tree-sitter-langs.
>
> Hi Pierre!
>
> Implemented a loading of tree-sitter grammars in Emacs using guix
> native-search-paths and built-in treesit package. I did it for emacs
> package, but it will work only with Emacs 29 and greater (right now it's
> emacs-next and similiar packages), until emacs package updated to
> version 29 it won't take any effect on it except providing one more
> environment variable in guix profile.
>
> I tested it with emacs-next-pgtk, the patch is attached below, please
> let me know what do you think!
This is cool, thanks! I'm not familiar with how upstream emacs loads
grammars so I can't comment too much on the details. That being said, I
think it'd be good to get it to work with emacs 28 as well, I've been
using it for the past 6 months and it's working nicely. I'm happy to
take care of that part of the work though and let others focus on
emacs-next.
We have the following packages for emacs 28 support:
>> * gnu: Add rust-bindgen@HIDDEN
>> * gnu: Add rust-tree-sitter.
>> * gnu: rust-emacs-module: Update to 0.16.
>> * gnu: rust-emacs-macros: Update to 0.17.
>> * gnu: rust-emacs: Update to 0.17.
>> * gnu: Add emacs-tree-sitter-core.
>> * gnu: Add emacs-tree-sitter.
>> * gnu: Add emacs-tree-sitter-langs.
Most of those would eventually go away I think, except probably
emacs-tree-sitter-langs, which is really useful to provide basic
tree-sitter syntax highlighint support to many language modes that may
not need to be changed themselves.
For instance, there is a PR to eventually move over to using the core
emacs 29 treesit module: https://github.com/emacs-tree-sitter/tree-sitter-l=
angs/pull/157
>
> From b5ecd4e3734e9dd0bc76ebe95cab9c43aa85a3fe Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew@HIDDEN>
> Date: Fri, 10 Feb 2023 12:32:12 +0400
> Subject: [PATCH] gnu: emacs: Add TREE_SITTER_GRAMMAR_PATH support.
>
> gnu/packages/emacs.scm (emacs)[native-search-paths]: Add a search-path for
> tree-sitter grammars.
> gnu/packages/aux-files/emacs/guix-emacs.el: Add directories from
> TREE_SITTER_GRAMMAR_PATH to treesit-extra-load-path.
> ---
> gnu/packages/aux-files/emacs/guix-emacs.el | 7 +++++++
> gnu/packages/emacs.scm | 10 +++++++++-
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/au=
x-files/emacs/guix-emacs.el
> index 56dbcb8d67..708093267d 100644
> --- a/gnu/packages/aux-files/emacs/guix-emacs.el
> +++ b/gnu/packages/aux-files/emacs/guix-emacs.el
> @@ -76,6 +76,13 @@ The files in the list do not have extensions (.el, .el=
c)."
> (when (file-directory-p pkg-dir)
> (package-load-descriptor pkg-dir)))))))))))
>=20=20
> +;; If emacs built with tree-sitter, read the value of the environment va=
riable
> +;; to make tree-sitter grammars available in emacs out-of-the-box.
> +(with-eval-after-load 'treesit
> + (when-let ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH")))
> + (mapcar (lambda (x) (add-to-list 'treesit-extra-load-path x))
> + (split-string grammar-path ":"))))
> +
> (provide 'guix-emacs)
>=20=20
> ;;; guix-emacs.el ends here
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 4ce41deb88..a3cc9d2e22 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -367,7 +367,15 @@ (define* (emacs-byte-compile-directory dir)
> (files '("lib/emacs/native-site-lisp")))
> (search-path-specification
> (variable "INFOPATH")
> - (files '("share/info")))))
> + (files '("share/info")))
> + ;; tree-sitter support is not yet available in emacs 28, but =
this
> + ;; search path won't harm and also will be benifitial for
> + ;; emacs-next and other emacs-* packages, which have tree-sit=
ter
> + ;; support enabled. Please, remove this comment, when emacs
> + ;; package is updated to 29.
> + (search-path-specification
> + (variable "TREE_SITTER_GRAMMAR_PATH")
> + (files '("lib/tree-sitter")))))
>=20=20
> (home-page "https://www.gnu.org/software/emacs/")
> (synopsis "The extensible, customizable, self-documenting text edito=
r")
> --=20
> 2.39.1
LGTM!
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPmcv4YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UMH4H/0Ax9b3V09Wzp5u2bNaEMwNf
LIRZO79oReySOCO8+TRQdtpIZrPXIbK+XbyTsgw48luezLOOEf7sE32tap05SiFj
ZyfpPuEbxDglw8vHNx/vo72DpklF0RdCNEWRSk4MbswALWXb301XroeOy6/GUMJq
170hVM9zjkrtt1cNbiO7+cFUQK+eK2Z3z646Wv/dOYVMlOW1LBLDqcj3rEA1vn/m
koLZthidyeAIT4Inm0ze7rSyqyGLjjocpkT5VzL81El5B/Riqqrh3vuD6tCFB5uQ
/58Zu7PjhnVCcUskr/gwUNYFuIPggHWSIn4yOmI5wCuVB+sU9+6IDYyHjGvfkyI=
=nLvU
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 16:17:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 11:17:55 2023
Received: from localhost ([127.0.0.1]:37943 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQW5z-0000Nh-3k
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 11:17:55 -0500
Received: from mout.gmx.net ([212.227.17.20]:52213)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pQW5u-0000NR-Cn
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 11:17:53 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MAfYm-1pJsFR3gVM-00B3lH; Fri, 10
Feb 2023 17:17:42 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-7-pierre.langlois@HIDDEN> <87r0xrcpei.fsf@HIDDEN>
<864jrxogxt.fsf_-_@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: zimoun <zimon.toutoune@HIDDEN>
Subject: Re: bug#49946: [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
Date: Fri, 10 Feb 2023 16:14:38 +0000
In-reply-to: <864jrxogxt.fsf_-_@HIDDEN>
Message-ID: <87k00pqyu4.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:s3MaM2fmEw3MTJ3NGOOb7XBYlxzx/q6NAs5DJJH7s5zR1k2dadE
w6RHcg7nTtxidgYMBB7DVmBDMu8vYsZxlEFt92fc7KQB80ZhNHf1OhYYLK0xSOgoPm1ONaE
FerMp8TEsgHTTYb/P+UXLQsVuDQlCnIUawpqT9ngIu2a8W5mecypn8q3gH5CnGAYbWsGrqw
GF4z+jkw4DRRIB19lQ+gw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:UjaWpxbBpN8=;1FNfm0KwvakEw+gj64qt+EWG2Dy
CFQRIun/p/FOPMNEZk3ySXUwXignXKiIbhMZRrWGTa9pwbYXhe2+WUqXMbw5Kp69baoXBZGRz
3oUPTvQF45bMX9KR5AkcZJSqQ+Qu6XokYbiWcbmAvl8ovlQ9gzwWLHFiwE4wrafBAxm/eVV6U
VY075Lwk+RlA8HAROPI53VFduF+nANGrmc5WI+T3WF9gRQmv8B80yi8hhM12uTt7z4bq17KI5
ZKnYArP80RxrTbAnm7jWm1ijJi/l5CgnBviUP46hukWa+65krfXi7VGd2N9CZElls0otAhpya
CvDw9MwCH5KNbfzWFu5Y9NmOyrYGfsxiCypeAy7WUSgi5J75/hAv9dkpKqhUZ3ManZAkbc9M+
qGngBMYWUTFADmpcIPY6wk1irzVwPoE8gTZBO8KqJcFs7RZV9j0cX6ZZvjDBvRDbP7n/elpgM
iuRjZRv9DY2xGLUjH8jRtUQSaKBWE2pL0IJ8JbNoi0+FIP9/6MWjIFuHbASmw70pH5oNNmEGy
7QqNJ6VuJy/rUgcaAXQDqgMoeH13CwZVLYNU4L0EpoQjR3vCiqk5bIJ0MiV4wz54Bf2dm62yh
xK+5rqLErq7vn1JmL9AA8i/ltmiiDzczxI1ezXaifAYw+xp2TpbV8/cuCBy8T7dwJPZknAFYi
ze4WBfstLsFo/rKyWZpwf+ammBhNXO9hMzLlpW7x3J9p8/vZkVQeY851IHLiLJuWzMQ0f38fM
L696z6ypwYpVuuSiysb68MrFpYYaPC3pkhdqMayX5EsrhP/tsrSwiYqLtrDJb4HA0N7eZavts
k2kI3mRPZj4rZuHjGU2mzlDFkQWBSWnp82zTlHjEX+h/CIMlNSTKbzrEdalmmt2DlKOmyv5Ok
fmIF0ULAVVQfYwnsCgOHSzPrB9/qeFMwA+De+I0RNdFJsLNsK6Q1UjMzxiV8sKV/mQvORTaY3
F3Xc7MNVPKzNkLaWFT4VfImSlDmg7Y6+TAHyMJZoE7YyTyUQWxcNWfDD0L5GFPAnBuW5uw==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi!
zimoun <zimon.toutoune@HIDDEN> writes:
> Hi,
>
> Sorry, I have totally overlooked this tree-sitter story. :-) And I have
> not read all the patch versions and thread yet.
>
>
> On Fri, 25 Nov 2022 at 01:57, Pierre Langlois <pierre.langlois@HIDDEN> w=
rote:
>
>> +(define* (install #:key target grammar-directories outputs #:allow-othe=
r-keys)
>> + (let ((lib (string-append (assoc-ref outputs "out")
>> + "/lib/tree-sitter")))
>> + (mkdir-p lib)
>> + (define (compile-language dir)
>> + (with-directory-excursion dir
>> + (let ((lang (assoc-ref (call-with-input-file "src/grammar.json"
>> + read-json)
>> + "name"))
>> + (source-file (lambda (path)
>> + (if (file-exists? path)
>> + path
>> + #f))))
>> + (apply invoke
>> + `(,(if target
>> + (string-append target "-g++")
>> + "g++")
>
> Why is g++ required? Is gcc not enough? I thought from Tree-sitter
> documentation that it was only using C files and not C++; but=E2=80=A6
>
>> + "-shared"
>> + "-fPIC"
>> + "-fno-exceptions"
>> + "-O2"
>> + "-g"
>> + "-o" ,(string-append lib "/" lang ".so")
>> + ;; An additional `scanner.{c,cc}' file is sometimes
>> + ;; provided.
>> + ,@(cond
>> + ((source-file "src/scanner.c")
>> + =3D> (lambda (file) (list "-xc" "-std=3Dc99" fil=
e)))
>> + ((source-file "src/scanner.cc")
>
> =E2=80=A6apparently not.
Yeah this is a little strange. IIUC, the final code generated from the
grammar.js->grammar.json->grammar.c process is plain C, but grammar
packages may also provide some custom hand-written code in terms of a
scanner.{c,cc} file.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPmbiMYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31Ufh8H/2wXw3F0BZ1URGv+OtovTkzA
lD0M1W0RWrY/Qr0mkq0kRjsnpGVj0gFxAAJ3trN6Cq9lhS1A9eEqjiJdfbBf5RUi
eO0p7PhtQb8yxjyV08NRIGcvYw0Hv0d96z1B0SICIqluTHHiyvJUP0qTmehzLEsy
DBade3OhY30ApjxIITQdCxjBpIqUf5ZXC5XIWzIfUAncymAMUm9/hIDSgemGU5zL
mdTd3Z+XZL7bJ5e/eyQ0m2cWWwDcknZEPdDSac4qCEBqWdTUAJj+hjVKRA93CcZL
j0N0cMrLo+3b/CHqMjjMcmUQbS4KDGhwAxsApeQj/52sB9lBEki8GJNfCaDwCbc=
=FBLh
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 15:59:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 10:59:37 2023
Received: from localhost ([127.0.0.1]:37928 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQVoG-0008NO-Sk
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 10:59:37 -0500
Received: from mout.gmx.net ([212.227.17.22]:39505)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pQVoE-0008N9-Cx
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 10:59:35 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MRCKC-1pCAJO1sEW-00N9WA; Fri, 10
Feb 2023 16:59:26 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN> <87a61lr8cp.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Fri, 10 Feb 2023 15:48:46 +0000
In-reply-to: <87a61lr8cp.fsf@HIDDEN>
Message-ID: <87o7q1qzol.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:RDLMLiR7kEGD7IWso76iJf4ZM2MWc4d+d1x8uznjbdW5Bi/edUz
HiMyhAvgjRw3kKq4P89m9olDpjEGY1UtpzO7qb3+vartjihDiUd+mtOQgQTlyjF6Jy13qyF
yhpEUlPGpHQin67y9emKHc3BgRBXZ18z6dY7OPMChsTHQLkG5QLrKAayRu+v0ZUdfRZwfAW
dgyD3rYewA689ELY3XQ8w==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:X4J5wsg8c5Y=;r6yXaw0z3lVcMBcj8F6IEjfbI3C
QNQpwwp4JqjN6/mjY7o/d4F5RpEzAycxwRXTEyMf4G5F8LONmBR0YGufY3hVcGK+8rwuIawws
kK7DrQK05576XHNgQA5ErZzGpmC+/wM5wMd2aROuZWL/APJnOdFPlpC6jQuT4AZwh9QO5mVCE
kfQHTDvTPFTNhyWOHobATvWOryY6uEKZLVQIodJsYoDiUS+Yk1f2Zk24ty7TTLrEf+U2CdgpS
x4HJ1Nhx9j5/K822iwKAzTZcJGFXVN/dAUAtv/fBPKynweWcoQrLUjHOefV5wHGYWc8fgZSib
vpPW2F8jiObnzOp97hcf85jPqnd8f7HOIUQbhKtt8vHOmOwQAfnGI1osXJBZRNrS3N9dbtd7A
Qc9DilEefM/RrMYnZ+z4lTpQ/QQUwJA+LBlNhSUx3dnky1h8JZ7vANfAayu7aq5or0X61sEnc
uOz1yRkuG10ObVoGxbPp0Gvh4mtH8WGHx0U8CUbtgKOdltRq1JxFswC9u4tlnYd51dFmtiTif
VZzC5x03h++0xqI3/sDNydpPTV1+a8CrOQ/aaK60orxbWYODV8zjo8N7F9Iud9RP4WPSkYy0z
2/kmJ+VrAjFBwQlT9iKy2kyY3RwZqDlOJjgqrcMCQtx27zYqUwaEt29K26YMZzkAr/OkXkmaS
HEPOdDdvabmWTcd+2aRhL6Jrtm/hTwPPWjrb2gFUVAqUKXt0ioqFeZCO7rqkENwMx31SwHGg+
JZ4HxMaOoSRPA7LSLudi0Tuv2skQRa49ksm/gsy429OWQHn/PZ3qn0a+B6NxySxyApMhfsUQJ
tUrtdzWRa7jUG8iHkDkN1Tbjniifr6LBc7cU5DefxC3+/8eIEkaM4C6bfBpqeUW+FajLnXsUD
zHC5uLDRiDcy9xb9EqN3yWdd/pRSnYB5AAPUFMcqLJQsW+qDvo1o1FuL3J+pL73ezO9atDhhN
9e/BjgktJ5BX+fmjLhtj4dDEZcc=
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>, Pierre Langlois <pierre.langlois@HIDDEN>,
49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
zimoun <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Hi Andrew, thanks for pushing this along! It's great to see things
getting merged.
Andrew Tropin <andrew@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> On 2023-02-09 18:04, Andrew Tropin wrote:
>
>> On 2023-02-09 13:39, zimoun wrote:
>>
>>> Hi,
>>>
>>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>>
>>>> I applied tree-sitter and tree-sitter-cli patches,
>>>
>>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>>> right?
>>>
>>>
>>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
>>>
>>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
>>>
>>> Leaving out all the others, right?
>>
>> Merged first 5 patches from 01 to 05, also added one more commit, which
>> addresses some things from reviews and one commit, which adds html
>> grammar.
>>
>> The html grammar is added for the testing purposes. It relies on
>> generated parser.c and scanner.c and we will need to repackage it using
>> grammar.js instead. I'm not sure if a separate build system is needed
>> for this, I guess we can just rewrite tree-sitter-grammar function,
>> which generates packages as in example with tree-sitter-grammar-html:
>> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitter.scm?h=53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>>
>> Anyway, I only skimmed tree-sitter-build-system source code, and plan to
>> read it carefully, evaluate and either introduce new build system or
>> just move all needed parts to tree-sitter-grammar function. WDYT?
>> After we done with it we can package all other grammars.
>
> Ok, I realized that the proper build process for tree-sitter grammars is
> a little harder than I expected, tree-sitter-build system make sense. I
> reviewed it, made a small change:
Ah great, I was going to comment to try and push for us to keep the
build system. I originally went with a template package and inheritance,
but Maxime suggested moving to a build-system which ended up making the
package definitions a *lot* nicer IMO (see previous discussion here
https://issues.guix.gnu.org/49946#144). It also allows us to deal with
grammars that depend on each other more nicely I think.
>
> @@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
> ;; Commentary:
> ;;
> ;; Build procedures for tree-sitter grammar packages. This is the
> -;; builder-side code, which builds on top fo the node build-system.
> +;; builder-side code, which builds on top of the node build-system.
> ;;
> ;; Tree-sitter grammars are written in JavaScript and compiled to a native
> ;; shared object. The `tree-sitter generate' command invokes `node' in order
> @@ -114,7 +114,7 @@ (define (compile-language dir)
> "-fno-exceptions"
> "-O2"
> "-g"
> - "-o" ,(string-append lib "/" lang ".so")
> + "-o" ,(string-append lib "/libtree-sitter-" lang ".so")
> ;; An additional `scanner.{c,cc}' file is sometimes
> ;; provided.
> ,@(cond
>
>
> rewrote html grammar to use this build system and made it work with
> built-in treesit package. Also, tried examples of c and cpp grammars
> from patches in this thread.
>
> If you ok with it, I'll push the build system to master and update the
> html grammar accordingly.
>
> The final result will look like this:
>
> (define tree-sitter-delete-generated-files
> #~(begin
> (delete-file "binding.gyp")
> (delete-file-recursively "bindings")
> (delete-file "src/grammar.json")
> (delete-file "src/node-types.json")
> (delete-file "src/parser.c")
> (delete-file-recursively "src/tree_sitter")))
>
> (define* (tree-sitter-grammar
> language language-for-synopsis version commit hash
> #:key
> (repository-url
> (format #f "https://github.com/tree-sitter/tree-sitter-~a" language))
> (inputs '()))
> (let ((synopsis (string-append language-for-synopsis
> " grammar for tree-sitter"))
> (name (string-append "tree-sitter-grammar-" language)))
> (package
> (name name)
> (version version)
> (home-page repository-url)
> (source (origin
> (method git-fetch)
> (uri (git-reference
> (url repository-url)
> (commit commit)))
> (file-name (git-file-name name version))
> (sha256 (base32 hash))
> (modules '((guix build utils)))
> (snippet tree-sitter-delete-generated-files)))
> (build-system tree-sitter-build-system)
> (inputs inputs)
> (synopsis synopsis)
> (description (string-append synopsis "."))
> (license license:expat))))
>
> (define-public tree-sitter-grammar-html
> (tree-sitter-grammar
> "html" "HTML"
> "0.19.0" "v0.19.0"
> "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
>
> After that we can bring the rest of the grammars.
I would suggest to rmeove the `tree-sitter-grammar' function, and keep
grammars as "regular" package records, even though it's a little bit
more verbose:
--8<---------------cut here---------------start------------->8---
(define-public tree-sitter-html
(package
(name "tree-sitter-html")
(version "0.19.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tree-sitter/tree-sitter-html")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
(build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-html")
(synopsis "Tree-sitter HTML grammar")
(description
"This package provides a HTML grammar for the Tree-sitter library.")
(license license:expat)))
--8<---------------cut here---------------end--------------->8---
This way, they look like any other package in Guix, which makes it
easier for us to apply automatic changes in the future if needed (for
example like how the input format could be automically updated for all
"simple" package definitions, but had to be manual whenever custom code
refactoring was done). Does this make sense?
>
>>
>> According to emacs integration: I already have a working prototype on
>> my local setup, which uses builtin treesit package, it's similiar to
>> what Luis mentioned with search-paths. We just need to figure out a
>> few minor details and I'll add it.
>
> I've sent a patch for emacs+tree-sitter integration in a different reply
> in this thread.
>
> Thank you very much for all the work, it's really valuable!
:-)
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmPmadoYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UcrMIAIoyUPydzsRC71FQXoR04D20
mLjtBKgsGhP+GNkZZFIyJgr8GmxdUE2fAW/CCegUgigVpfOLCdBkMphp8v1W9ij7
l8PQktmn+vPuRnu6gbitrvfUlz0Mfa2E3t0fO3xdEV8TUpHbJLomShL7cRjU1IIy
H1gaUrNDv8F5zEY1D5lEmMWzek+za8BewO9u7EPUR8AMv7i1fnyvWFIsqNJt3Mwl
Scm4drDAA2cEbergnh8tBrLO3k87W6DoHV2ullhzCKCWWoHNEgff+sAoRmGu59B7
P942Jg2kekzKy+Hc8rl+c/2yuv/lEo6VpF6AKXWJBNqlLFkM+TKrys8jvnR0YMc=
=5EOX
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 12:52:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 07:52:24 2023
Received: from localhost ([127.0.0.1]:34451 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQSt6-0002sL-0H
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 07:52:24 -0500
Received: from relay1-d.mail.gandi.net ([217.70.183.193]:53963)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pQSt0-0002s4-K9
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 07:52:22 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 64A08240008;
Fri, 10 Feb 2023 12:52:09 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676033532;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=POmQftHkfdNlhhcUDTyq6NfLS3TLfQPYnpAMOAPwXwc=;
b=L3e/6fg4djjdaz+xKQdci0B92qbz4Q3fHLmsCEkR64fJGwDYPeXAr0mfxlLZwXQCecgQ45
mkJTnIu5u2PADFQgGbvYmzfEpMQ1tzhVgGUCG/23iXpfkgIpdCpNqHalZJGBh0zT2ZQ3Ft
lgmWIkM7wOCtt+j+fgYOz0kaTslZjNnINqISSnqtj9sXr+sTpd7BhKtxsCgExKmy5xI30b
HMVnsqsYibFdzI8bVb6RNuA11aya2uUROywMQ+/bLElRj6KZDscFBrbIaRg8DoBL0VS0dW
prDubyIQQIgPHBhayrbzZnS48rnIYfaPD8ZSk6hO/xEiHZqebgjU4t+Hc9O8Zg==
From: Andrew Tropin <andrew@HIDDEN>
To: zimoun <zimon.toutoune@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>, "(" <paren@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87cz6jgcku.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
<87cz6jgcku.fsf@HIDDEN>
Date: Fri, 10 Feb 2023 16:52:06 +0400
Message-ID: <87a61lr8cp.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-09 18:04, Andrew Tropin wrote:
> On 2023-02-09 13:39, zimoun wrote:
>
>> Hi,
>>
>> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>>
>>> I applied tree-sitter and tree-sitter-cli patches,
>>
>> Just to be sure to understand, you have only applied 02/32 and 05/32,
>> right?
>>
>>
>> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
>> id:20221125012142.22579-3-pierre.langlois@HIDDEN
>> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@=
gmx.com
>>
>> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
>> id:20221125012142.22579-6-pierre.langlois@HIDDEN
>> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@=
gmx.com
>>
>> Leaving out all the others, right?
>
> Merged first 5 patches from 01 to 05, also added one more commit, which
> addresses some things from reviews and one commit, which adds html
> grammar.
>
> The html grammar is added for the testing purposes. It relies on
> generated parser.c and scanner.c and we will need to repackage it using
> grammar.js instead. I'm not sure if a separate build system is needed
> for this, I guess we can just rewrite tree-sitter-grammar function,
> which generates packages as in example with tree-sitter-grammar-html:
> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitter.=
scm?h=3D53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
>
> Anyway, I only skimmed tree-sitter-build-system source code, and plan to
> read it carefully, evaluate and either introduce new build system or
> just move all needed parts to tree-sitter-grammar function. WDYT?
> After we done with it we can package all other grammars.
Ok, I realized that the proper build process for tree-sitter grammars is
a little harder than I expected, tree-sitter-build system make sense. I
reviewed it, made a small change:
=2D-8<---------------cut here---------------start------------->8---
@@ -29,7 +29,7 @@ (define-module (guix build tree-sitter-build-system)
;; Commentary:
;;
;; Build procedures for tree-sitter grammar packages. This is the
=2D;; builder-side code, which builds on top fo the node build-system.
+;; builder-side code, which builds on top of the node build-system.
;;
;; Tree-sitter grammars are written in JavaScript and compiled to a native
;; shared object. The `tree-sitter generate' command invokes `node' in or=
der
@@ -114,7 +114,7 @@ (define (compile-language dir)
"-fno-exceptions"
"-O2"
"-g"
=2D "-o" ,(string-append lib "/" lang ".so")
+ "-o" ,(string-append lib "/libtree-sitter-" lang ".so")
;; An additional `scanner.{c,cc}' file is sometimes
;; provided.
,@(cond
=2D-8<---------------cut here---------------end--------------->8---
rewrote html grammar to use this build system and made it work with
built-in treesit package. Also, tried examples of c and cpp grammars
from patches in this thread.
If you ok with it, I'll push the build system to master and update the
html grammar accordingly.
The final result will look like this:
=2D-8<---------------cut here---------------start------------->8---
(define tree-sitter-delete-generated-files
#~(begin
(delete-file "binding.gyp")
(delete-file-recursively "bindings")
(delete-file "src/grammar.json")
(delete-file "src/node-types.json")
(delete-file "src/parser.c")
(delete-file-recursively "src/tree_sitter")))
(define* (tree-sitter-grammar
language language-for-synopsis version commit hash
#:key
(repository-url
(format #f "https://github.com/tree-sitter/tree-sitter-~a" langu=
age))
(inputs '()))
(let ((synopsis (string-append language-for-synopsis
" grammar for tree-sitter"))
(name (string-append "tree-sitter-grammar-" language)))
(package
(name name)
(version version)
(home-page repository-url)
(source (origin
(method git-fetch)
(uri (git-reference
(url repository-url)
(commit commit)))
(file-name (git-file-name name version))
(sha256 (base32 hash))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
(build-system tree-sitter-build-system)
(inputs inputs)
(synopsis synopsis)
(description (string-append synopsis "."))
(license license:expat))))
(define-public tree-sitter-grammar-html
(tree-sitter-grammar
"html" "HTML"
"0.19.0" "v0.19.0"
"1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
=2D-8<---------------cut here---------------end--------------->8---
After that we can bring the rest of the grammars.
>
> According to emacs integration: I already have a working prototype on
> my local setup, which uses builtin treesit package, it's similiar to
> what Luis mentioned with search-paths. We just need to figure out a
> few minor details and I'll add it.
I've sent a patch for emacs+tree-sitter integration in a different reply
in this thread.
Thank you very much for all the work, it's really valuable!
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPmPfYACgkQIgjSCVjB
3rBBlw/+JVj9+tV2fnaR8Sg7YKRiNtEEkun7gKRnvxm5JTewugn0334ZGowHdy0v
uUIoW2yZDibsXALRgJIb6LBFJ+oZ3S7i9xjOWaNK4u2GXQWjw7h6zjXBShLJeonU
CkhkcmpYrETAqUiYYkNCmD7GCYWarCuW6M59gVlfSkMHaWYw1Qze631kCOxDMXi6
ffmXBPyFqc7mk/tSTmOhyBQFsghnOi8o/64/bZUAviPvzfUnn/N27T4NoZXLEhjG
xlspWlkYCC090zfhc59APZv9f39hXgS2SmE7gS16nwdVQ7lMMTpryiCTczzbfAhr
OsjYzWhGqWrcile0m9+f/aY5bGUhwS2CgeYvao1N3CPYQrjqIKfjL4ZchWwNjGQd
DtGioV+ejMtF8A28b3Yqs50LFTntpbUyyNHF3lFoAmPMRXD1CQFk8uUfYn/ev+1f
qVlcI/rNZaFyxBUJfMPjah/s4Ea4IL/HkUzagdXHYpoYMVOWDXMncBv67PTFOMfT
cG3lvdsvNofFy9MD4XLtOxtgvJVTtA59XZxHaIG76qxN22fYS8Xw4qHJKbdb3PjP
wWWTyD1FoXXkU7aoRmTv1FeuPhTo3GlzkTCuJGO4UNE718raP/bA9CfhdDaAdJBu
BdMfT1zfGauSM4DfyxpJjrdr+DuPUNxPFXYTw1yPtRme1aCIy4s=
=WXQy
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2023 09:21:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 10 04:21:34 2023
Received: from localhost ([127.0.0.1]:34338 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQPb3-0002oX-VR
for submit <at> debbugs.gnu.org; Fri, 10 Feb 2023 04:21:34 -0500
Received: from relay2-d.mail.gandi.net ([217.70.183.194]:65311)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pQPb2-0002oK-1o
for 49946 <at> debbugs.gnu.org; Fri, 10 Feb 2023 04:21:33 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id C13BF4000F;
Fri, 10 Feb 2023 09:21:21 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1676020885;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=eOaGVJv5enI2rfT+Cg34JrgtSSTvEThp9JcVlAyaKx8=;
b=in+Lu2Pazr8DskMCgcH348KI7+QR2nqI15GIxEAeMvEGyb1sSB6qbCtKWR9mOt8bm2h9He
dP0WIHQGCFx5PRPCDbwy+XOL9zj/A1t7IdOIgpWdwqnLtdctnD+gdTeqT1qKfoiRrsHL0h
sxSfe6kqBmREPmsU5aufVJie3M3JHyWzAYOz0W478Ekz6YIXwG4hONMg9myEM+bTITw/zv
E/MiRfz9WREnNjLQU/zLHwVF6f53zYwhbcUP2T/hWFy2bXGCgriec/MBgNSLpRXJjRxW6p
rq8GUW9EXXnVgi9ccUHtakQr65++u1tZyMKpAcmIU1Vi4crTTEvEhs1eenA6TQ==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Subject: Re: [bug#49946] [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
In-Reply-To: <87h7fztt60.fsf@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
Date: Fri, 10 Feb 2023 13:21:18 +0400
Message-ID: <87edqxri41.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: "\(" <paren@HIDDEN>,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>,
Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Nicolas Goaziou <mail@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain
On 2021-08-08 23:29, Pierre Langlois wrote:
> 4. Finally, emacs support!
>
> emacs-tree-sitter can be used for syntax highlighting, replacing
> font-lock. The tree-sitter runtime library is built as a Rust crate
> and exposed to emacs using a module thanks to the rust-emacs crate.
>
> Then emacs-tree-sitter-core provides just the core APIs as exposed by
> the rust module, then emacs-tree-sitter integrates it with emacs'
> syntax highlighting (and probably other things).
>
> Finally, we bundle together the various language grammars into a
> single emacs-tree-sitter-langs package so that they can get loaded
> along with their respective major modes. Note that there are grammars
> left to support which I've not yet managed to package, but what we
> have already is a good start I think :-). So far I've tested C++,
> Rust, Python and JavaScript and JSON.
>
> * gnu: Add rust-bindgen@HIDDEN
> * gnu: Add rust-tree-sitter.
> * gnu: rust-emacs-module: Update to 0.16.
> * gnu: rust-emacs-macros: Update to 0.17.
> * gnu: rust-emacs: Update to 0.17.
> * gnu: Add emacs-tree-sitter-core.
> * gnu: Add emacs-tree-sitter.
> * gnu: Add emacs-tree-sitter-langs.
Hi Pierre!
Implemented a loading of tree-sitter grammars in Emacs using guix
native-search-paths and built-in treesit package. I did it for emacs
package, but it will work only with Emacs 29 and greater (right now it's
emacs-next and similiar packages), until emacs package updated to
version 29 it won't take any effect on it except providing one more
environment variable in guix profile.
I tested it with emacs-next-pgtk, the patch is attached below, please
let me know what do you think!
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0001-gnu-emacs-Add-TREE_SITTER_GRAMMAR_PATH-support.patch
Content-Transfer-Encoding: quoted-printable
From=20b5ecd4e3734e9dd0bc76ebe95cab9c43aa85a3fe Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@HIDDEN>
Date: Fri, 10 Feb 2023 12:32:12 +0400
Subject: [PATCH] gnu: emacs: Add TREE_SITTER_GRAMMAR_PATH support.
gnu/packages/emacs.scm (emacs)[native-search-paths]: Add a search-path for
tree-sitter grammars.
gnu/packages/aux-files/emacs/guix-emacs.el: Add directories from
TREE_SITTER_GRAMMAR_PATH to treesit-extra-load-path.
=2D--
gnu/packages/aux-files/emacs/guix-emacs.el | 7 +++++++
gnu/packages/emacs.scm | 10 +++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-=
files/emacs/guix-emacs.el
index 56dbcb8d67..708093267d 100644
=2D-- a/gnu/packages/aux-files/emacs/guix-emacs.el
+++ b/gnu/packages/aux-files/emacs/guix-emacs.el
@@ -76,6 +76,13 @@ The files in the list do not have extensions (.el, .elc)=
."
(when (file-directory-p pkg-dir)
(package-load-descriptor pkg-dir)))))))))))
=20
+;; If emacs built with tree-sitter, read the value of the environment vari=
able
+;; to make tree-sitter grammars available in emacs out-of-the-box.
+(with-eval-after-load 'treesit
+ (when-let ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH")))
+ (mapcar (lambda (x) (add-to-list 'treesit-extra-load-path x))
+ (split-string grammar-path ":"))))
+
(provide 'guix-emacs)
=20
;;; guix-emacs.el ends here
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4ce41deb88..a3cc9d2e22 100644
=2D-- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -367,7 +367,15 @@ (define* (emacs-byte-compile-directory dir)
(files '("lib/emacs/native-site-lisp")))
(search-path-specification
(variable "INFOPATH")
=2D (files '("share/info")))))
+ (files '("share/info")))
+ ;; tree-sitter support is not yet available in emacs 28, but th=
is
+ ;; search path won't harm and also will be benifitial for
+ ;; emacs-next and other emacs-* packages, which have tree-sitter
+ ;; support enabled. Please, remove this comment, when emacs
+ ;; package is updated to 29.
+ (search-path-specification
+ (variable "TREE_SITTER_GRAMMAR_PATH")
+ (files '("lib/tree-sitter")))))
=20
(home-page "https://www.gnu.org/software/emacs/")
(synopsis "The extensible, customizable, self-documenting text editor")
=2D-=20
2.39.1
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
=2D-=20
Best regards,
Andrew Tropin
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPmDI4ACgkQIgjSCVjB
3rAqMw/9EEOnkMMcWqA2434QvKazGX6eiN+bTLNcPz+5IZuVuKqbbU2k2F0tATEC
Vy05t+XPVvhELzizGJRk/gxYwsuMpULNqu6YIuO2+asP45iw4tnH5Vdvf6RLOHKW
WH+Fr+Fo6wDaEGztDCEY4ud/j1bsdtgrxxWgUmE6VgzBt7UJl1Y6LVJh0tSn/gNl
tseYkXcYHn1bQUCHBIA03w45WNZ8bQMxRXGzvmiNUEPWJhGbkluk3TQuGXXezKKn
O3tLuKwERxG4gRTC9Oj3uPWcv4RCxbQ2binNamT1KGFVpq1VdwA8WbDu41gp4Nk+
TIEw+G2JcbaxC3Om/p8oJsVsbYUaHtZlzysLhSjeg1mSQdqh6WanwuYif2cVFWQo
uUEt7+rcfZyiLeDqlgiUZO5gv86k+LyB3q4/wf4W0B0Ij8AblLMMNgAeUukamq5p
KfhuTRdAawL7ZijPCQ3QuDRJJ/x9OsK9s+WTNV2tITxfWwm6uQgtizwrpGwnUaPW
3gb/hwdhgdNjlsrICod9+8X++akY2bXcCJTfWKebeKsgzTj4fR5MIxIjeYDInd2E
asuVGsep6y5lxCsz4gN4bMEQcDjpj5B1Y6zsi6FiiMylkuqWeHvWZZet3/LAQJXD
ZxZRufLGz/zSpsW4W4nXKnr9LCgiY1HxthOYJHduveVpWIGFOz8=
=ohCg
-----END PGP SIGNATURE-----
--==-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 9 Feb 2023 14:04:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 09 09:04:15 2023
Received: from localhost ([127.0.0.1]:57972 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQ7X4-0005Hc-MP
for submit <at> debbugs.gnu.org; Thu, 09 Feb 2023 09:04:14 -0500
Received: from relay4-d.mail.gandi.net ([217.70.183.196]:34281)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pQ7X2-0005H1-Is
for 49946 <at> debbugs.gnu.org; Thu, 09 Feb 2023 09:04:13 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 9A56EE0018;
Thu, 9 Feb 2023 14:04:04 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1675951446;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=cLkehAt6FazKDzzj01xUGgmryhLrbSXFK5HrvZxrawY=;
b=TW4qL+E9Yu1ruaYDV6eQEjTaGbKJPMfHsZJ/T7KfCEEBwhXmc5aasxgmAMXAJvglavVoJB
sRkcNhKh9qi6sXOGOy9gF1v7L4O67DTGj0CTBKSJlYWPRU7z8VoYxr/XzYceMr2m+N5h7/
7SecGeZo8NwBq59cRCrK+3pBO3DlHqNWr5kXwyZ8y7F8GJomAnbbAe1nqwQKqPHSuMCgeK
/aF7Rh9PPVrY4emBO55neXylw4YWHo7bbb6Ysf/v+/ZV4ZEOaDWOmv5ZELS+4D1isVUMvk
iisv/txDHwgiqAmaN7FkO7Sh8dpn7yLuhBHL0VdeKU4WZ4eO38gJ16TKEA/B+A==
From: Andrew Tropin <andrew@HIDDEN>
To: zimoun <zimon.toutoune@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>, "(" <paren@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <86pmaj3td2.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN> <86pmaj3td2.fsf@HIDDEN>
Date: Thu, 09 Feb 2023 18:04:01 +0400
Message-ID: <87cz6jgcku.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-02-09 13:39, zimoun wrote:
> Hi,
>
> On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
>
>> I applied tree-sitter and tree-sitter-cli patches,
>
> Just to be sure to understand, you have only applied 02/32 and 05/32,
> right?
>
>
> [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
> id:20221125012142.22579-3-pierre.langlois@HIDDEN
> http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@g=
mx.com
>
> [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
> id:20221125012142.22579-6-pierre.langlois@HIDDEN
> http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@g=
mx.com
>
> Leaving out all the others, right?
Merged first 5 patches from 01 to 05, also added one more commit, which
addresses some things from reviews and one commit, which adds html
grammar.
The html grammar is added for the testing purposes. It relies on
generated parser.c and scanner.c and we will need to repackage it using
grammar.js instead. I'm not sure if a separate build system is needed
for this, I guess we can just rewrite tree-sitter-grammar function,
which generates packages as in example with tree-sitter-grammar-html:
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tree-sitter.sc=
m?h=3D53b00b91b73bd60412d5bd057e22e6d63194a7f7#n158
Anyway, I only skimmed tree-sitter-build-system source code, and plan to
read it carefully, evaluate and either introduce new build system or
just move all needed parts to tree-sitter-grammar function. WDYT?
After we done with it we can package all other grammars.
According to emacs integration: I already have a working prototype on my
local setup, which uses builtin treesit package, it's similiar to what
Luis mentioned with search-paths. We just need to figure out a few
minor details and I'll add it.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPk/VEACgkQIgjSCVjB
3rAxMA/+JdVS1H4fFoGJGI2LltWc6BsUUlPHQN5ELd1HcGNnzXQtX9jWNJwhkoK8
QHRYE/cWlaZmtdLCuSN9paEqbStVJ+SKYdGcOdTw7C4Riw0o8ceE5I9PNShro5Wh
XfvB7hDiG3rpMnlvlwnhHmXsCk+SPntMNO9B5P+0f3O92YsQ0j2k8iPLeALSueDt
/cwNfc83SSHJ5aQEvuIcKsmjMXe+/52CMiOfieVUIMHY8LrLZH0c47wwbYqDE5K4
5Vl5spxSgwrPoIX4v79x+EPdfN16ui/kkAf96ihW03oo6SAMJHeZIB0fDYJQgEB5
Uc9tqv3uovrOjIDyNsGGHWh6SSU2pFslpay/KsK6NHlV0g7hVS5DseKmNCPXHtTh
Bo0tJQwSA5hMO4yl0XWGIWLzs0VpiA0aEWkoOumR9KATD0pLXv8bBO1aUNhv/SVP
HJeUqTPpo536OfayFb7Kp0+QQDZS3RgoLP2sFp+ddTBWd3vwAXv0OCqjujKOjpqF
YqUXzAwanE7qiNWy1rtC8ASAmFQe0M9GEGypbMgwVrb052aiYQ5O8oyf+MkSjT34
q1ZEVJybV+xp/X7iALow0wZDAbBAuCYmBW4qIOEEslJdTGBNtseLdiSU2+1UjVMF
2Jf27fAKxwCEkTbzxHiN2xJG3lRld/3FMSwA3bZXWhcMj+2nor0=
=AfIp
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 9 Feb 2023 12:43:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 09 07:43:38 2023
Received: from localhost ([127.0.0.1]:57799 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQ6H4-0000d8-3A
for submit <at> debbugs.gnu.org; Thu, 09 Feb 2023 07:43:38 -0500
Received: from mail-wr1-f50.google.com ([209.85.221.50]:33469)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1pQ6Gy-0000cV-O3
for 49946 <at> debbugs.gnu.org; Thu, 09 Feb 2023 07:43:33 -0500
Received: by mail-wr1-f50.google.com with SMTP id j23so1684597wra.0
for <49946 <at> debbugs.gnu.org>; Thu, 09 Feb 2023 04:43:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=dTEPwB890O0bd70XiO6IpbTb5gDVDB/fKkpFlRhvBg0=;
b=JzRTbOvkEjdVcrXOi0V96tf3A6TV4xYdbNX5R9fs/T7uwyqNyx6l+utxai6IjCHiPw
gRCkM9pIKeFZIo3QP/yHxOeZgLZZ3lzK0dqAMrX1x3PRq2Q21BgAwR7pGeQFvr5piPC5
VDS3VYfgmsWMqSvEG3emgwaeAQ9mULOdjoOrjXgZNmXMFzcMHhGUR5Xwg+U0GOCIBvVA
DUKwTijb9AOawliWxwl72GbNjR0yOgLIEOa3lRzY1UwDjXOELisIJclRpslaK4+TGWFw
bV7UwgkW9nPG7X0oCHXBxFI5Ysud4jGPe4ERwQkxI+EEsUjkAjpM+P578kWtvfOe8Q3V
Bgpw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=dTEPwB890O0bd70XiO6IpbTb5gDVDB/fKkpFlRhvBg0=;
b=vGW2AlkscNxLkGREU78w741voX1BDamUxYP/kYBuEpAn6i4Il/JxYgU3pzhC01Wr0v
ldDkQZl+wwhPecRsjl7L51V9RqkFU7eTGyaoJTU46rxgNs7AJkK3uHbA54Kv9Qtrn+Ti
ieIGytOVVhyrZ8Ro+8rMrA4L7OEVazaHBxMvOwHiVaNIoAJgaWyMB5+gB2vFToD4zmVl
m1+k6y17hGrnUPSWULcWKSFffpBb4YLW5uQqWraMAk5uLkT1pVNez1yiaD2iUC99CcI2
1iu4vpiRFNjezx0Spun3K7tzp2yRGV24gUQPlW9E7K3s25zcZNhlYlZ20FHuj2+HORwJ
rx2Q==
X-Gm-Message-State: AO0yUKXzgr4Zz4o7uFD7FW4f7vUr3DwkKwMHqDd0pcSLn/sN4y3Bsd5F
oJRt8pXJfFRKgcdxoUbVeN/rbCMT4OE=
X-Google-Smtp-Source: AK7set/wzZsJ96v+F763cmyOgV55XGndfWdQFhaEw+naj8UZDSNIs3O6LwD09XE2HfO4CQSv2NJF5g==
X-Received: by 2002:a5d:6707:0:b0:2bf:d3e1:b0d4 with SMTP id
o7-20020a5d6707000000b002bfd3e1b0d4mr7363538wru.0.1675946607033;
Thu, 09 Feb 2023 04:43:27 -0800 (PST)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
l5-20020adfe9c5000000b002c3e7474b0fsm1206262wrn.13.2023.02.09.04.43.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 09 Feb 2023 04:43:26 -0800 (PST)
From: zimoun <zimon.toutoune@HIDDEN>
To: Andrew Tropin <andrew@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>, "(" <paren@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87h6vvgnd6.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
<87h6vvgnd6.fsf@HIDDEN>
Date: Thu, 09 Feb 2023 13:39:53 +0100
Message-ID: <86pmaj3td2.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
On Thu, 09 Feb 2023 at 14:11, Andrew Tropin <andrew@HIDDEN> wrote:
> I applied tree-sitter and tree-sitter-cli patches,
Just to be sure to understand, you have only applied 02/32 and 05/32,
right?
[bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
id:20221125012142.22579-3-pierre.langlois@HIDDEN
http://issues.guix.gnu.org/msgid/20221125012142.22579-3-pierre.langlois@HIDDEN
[bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
id:20221125012142.22579-6-pierre.langlois@HIDDEN
http://issues.guix.gnu.org/msgid/20221125012142.22579-6-pierre.langlois@HIDDEN
Leaving out all the others, right?
Cheers,
simon
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 9 Feb 2023 10:11:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 09 05:11:18 2023
Received: from localhost ([127.0.0.1]:57568 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pQ3te-0002SY-Le
for submit <at> debbugs.gnu.org; Thu, 09 Feb 2023 05:11:18 -0500
Received: from relay10.mail.gandi.net ([217.70.178.230]:58571)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1pQ3tZ-0002SE-Kv
for 49946 <at> debbugs.gnu.org; Thu, 09 Feb 2023 05:11:16 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id C1C7824000C;
Thu, 9 Feb 2023 10:11:04 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1675937466;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=HjKf/8spxWlUvHsM1uC19rq0MEEJTv9ZA9tQLLBRLnY=;
b=bjqL5sJTEWwXkWhG7F7ZHPRA1kmbJkw8lBGW/OkOP8DAy2OfisneE/zOk8CITv5EyPagOA
B+SEo371tDyulJqEKcls8olQ3IOFtiqXTrqqeRo663SyJshsmRAuCL8g3B+2i3KV6/MVd0
k/Z4jCoozkVIAKL/M36qdPpQHLdKiN+DOgFM6rb4p+Wc8BFB7shZhAOre1AMRo2kWaU0em
gbMg4+jGBwOWJHg9manzV5RylOAyGey0bbtcmmBYJK5R8gWX4i6+d3lG+VyAQ3RPHgQR47
qW3GgpBV3xR8ioIT7/l5jozAuAEozU2P8F4BNntmlgvo+i9isRVo3XFtqbSbnw==
From: Andrew Tropin <andrew@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, "(" <paren@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
In-Reply-To: <87bkovcp1d.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework> <87bkovcp1d.fsf@HIDDEN>
Date: Thu, 09 Feb 2023 14:11:01 +0400
Message-ID: <87h6vvgnd6.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2022-11-25 10:18, Pierre Langlois wrote:
> Hi!
>
> "(" <paren@HIDDEN> writes:
>
>> Heya,
>
> Thanks for taking a look and spending time reviewing this, this is
> great. I'll work on your suggestions over the weekend.
>
> Thanks,
> Pierre
Hi Pierre!
Thank you very much for all the work.
I applied tree-sitter and tree-sitter-cli patches, adjusted them,
addressed comments of unmatching-paren and succesfully built respective
packages. I'll push them later today or tomorrow. Just letting you
know to prevent duplication of effort.
Also, later I'll make a separate message on tree-sitter grammars and the
way I see they can be added to Guix and Emacs.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPkxrUACgkQIgjSCVjB
3rBRPBAAh1rKPtGDdm5rBCSYsq1ZFQU/Oll61v+jU/KvEe3AtjlKrSmY8YHk9UGN
QxfKSxyKvN/G7UwRw/bvA23dBASbqGtGu8hGahgnqrpgGA4Cb8PA6Es7PwHF+1PK
/2Itaw8MXBtkzB0IgGbCD9sg/boCWz6dJrgSt64XgwGTYcB1raQ21otS3xJXEOgS
hg3zibLKaWr7IvRN5IJoBTZtdBCvBOdJuoaEal/GiFy1/L4e0M6HF6Anjt6nQMaw
JqoULivxsc3+wuClhRVU0Q73Zyd7hrVxqyzcKr6u/te9ISbaclDBCJMnb5CDtZbE
byfJM+FdfBmcyr86xmP95qU/O8L1kqX+1sjWX8w7WtDwojI9H0syr+4FZVumW28g
C1zid3H5Q+7MiZuLkBiIbe/rRjAPuqmET4uZrY0MUrGtWKsPxevHGxje9Jsp9wrT
sLYPRENOSh4odT+GwQ2pNJ1s9l0r4kuhmb9EU0FrPQvPqZeJKVitoSJOHFgG4kcc
m9YS7OwVJWZNbywQL8BGsuAo18IGKoSYi0E4QgfDo3SA4WbdQoafwB9yxkqn6Pyv
joqCcRPfvMiAoEBj92lzTsXc3NZ7RXbu8jDoxPeXZQTkhV7M5rzj+VBkoCxMN8ic
nszqceL/pTBOdGeZjJnZ5fms9jbejJkXuCmNhSeBjsLQ4QvE6Tg=
=xAGo
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 7 Feb 2023 11:59:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 07 06:59:03 2023
Received: from localhost ([127.0.0.1]:51386 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pPMco-00038t-NC
for submit <at> debbugs.gnu.org; Tue, 07 Feb 2023 06:59:03 -0500
Received: from mail-wm1-f45.google.com ([209.85.128.45]:45869)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1pPMcm-00038H-6U
for 49946 <at> debbugs.gnu.org; Tue, 07 Feb 2023 06:59:01 -0500
Received: by mail-wm1-f45.google.com with SMTP id
m16-20020a05600c3b1000b003dc4050c94aso11249546wms.4
for <49946 <at> debbugs.gnu.org>; Tue, 07 Feb 2023 03:59:00 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject
:date:message-id:reply-to;
bh=l40FpR9KUNOlCoVZN6+Vo7LY7W8lf04JRbvtLofe7tg=;
b=Gii7gYBLhFM1yTC7X7ciAnSwKhFXmqGBmOE/NNaxs55PefhrSax4PprXue6p/ld7oH
a9YoGAIeXyepWrTzX+ODfJeGHFKUuPcQUm8pwXQDq2mQ4VCxnyj0Aja1fliqgR1ECHCx
9JQCwDklhMK/5f6RzHUi1z/gQbj2skcAsvocPN6kKaiOiVBkeraCT+cSiuVVmbo4N3B4
R9e1wEY5CPGP4BTWaIWBSQilOHK/ppisN4g/1KDIT3jThe/I5GSg+wSgJUYt3VXMbP/N
7UD/76h+b3S5KgHuuQOPC4Szohi1f0jEYfysOJ46l4oG0Ji5CK5Zl59MaRBrKhHNshil
sWGw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=l40FpR9KUNOlCoVZN6+Vo7LY7W8lf04JRbvtLofe7tg=;
b=6f9YFhw2tGmhY8uvcLROolHsajQjHEBDC4TuH7cJ9NnjrGYQsHn5hm3rHJLoNXBNSb
8IwsfKg4Ac2p32KsWsnjOexky3uiZYmkEiXCeoOHuBMhetWQlquWNTjv280y2km+t5dM
bVKHCG59zpHHzNo3t+XBcoDLvR9N9F+UXelB5YgS5VieZWnt17nBMffoZiGcfiyt07+1
LhuXEB+55xIxEhqVd5VlaI4urtSjQ/Zup1H1N1gxAPY5ma2tuPgsE4AStOEY215/6oLJ
29hqJEM6ha+jQSCNi7qT4b//XURFpITVLi977/OQBAoJ1quddalmnfcWLgoOdXiEys7Y
xMhQ==
X-Gm-Message-State: AO0yUKWrTpwI2dHLmlmlCb3FUyaFHyJsoqiKJXXB8f5ItdWhaxC428bT
w1QZhYT8WqZNhK0wHaE8zKfYdSHDDMhY5Q==
X-Google-Smtp-Source: AK7set/SZcY6D+BVXf8TqWRkOJARvhL5aTPZMgiRkH3SELwEtfkH9v4xvlVQTHm8CbfdjiN8MACT+A==
X-Received: by 2002:a05:600c:511c:b0:3dc:3398:cf65 with SMTP id
o28-20020a05600c511c00b003dc3398cf65mr3518085wms.2.1675771134268;
Tue, 07 Feb 2023 03:58:54 -0800 (PST)
Received: from lili ([81.255.72.129]) by smtp.gmail.com with ESMTPSA id
l20-20020a05600c089400b003dc41a9836esm13235434wmp.43.2023.02.07.03.58.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 07 Feb 2023 03:58:53 -0800 (PST)
From: zimoun <zimon.toutoune@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Subject: Re: bug#49946: [PATCH 00/31] Tree-sitter, node-gyp addon support
and emacs-tree-sitter
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-7-pierre.langlois@HIDDEN>
<87r0xrcpei.fsf@HIDDEN>
Date: Tue, 07 Feb 2023 12:25:50 +0100
In-Reply-To: <87r0xrcpei.fsf@HIDDEN> (Pierre Langlois's message of "Fri, 25
Nov 2022 01:57:21 +0000")
Message-ID: <864jrxogxt.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Sorry, I have totally overlooked this tree-sitter story. :-) And I have
not read all the patch versions and thread yet.
On Fri, 25 Nov 2022 at 01:57, Pierre Langlois <pierre.langlois@HIDDEN> wro=
te:
> +(define* (install #:key target grammar-directories outputs #:allow-other=
-keys)
> + (let ((lib (string-append (assoc-ref outputs "out")
> + "/lib/tree-sitter")))
> + (mkdir-p lib)
> + (define (compile-language dir)
> + (with-directory-excursion dir
> + (let ((lang (assoc-ref (call-with-input-file "src/grammar.json"
> + read-json)
> + "name"))
> + (source-file (lambda (path)
> + (if (file-exists? path)
> + path
> + #f))))
> + (apply invoke
> + `(,(if target
> + (string-append target "-g++")
> + "g++")
Why is g++ required? Is gcc not enough? I thought from Tree-sitter
documentation that it was only using C files and not C++; but=E2=80=A6
> + "-shared"
> + "-fPIC"
> + "-fno-exceptions"
> + "-O2"
> + "-g"
> + "-o" ,(string-append lib "/" lang ".so")
> + ;; An additional `scanner.{c,cc}' file is sometimes
> + ;; provided.
> + ,@(cond
> + ((source-file "src/scanner.c")
> + =3D> (lambda (file) (list "-xc" "-std=3Dc99" file=
)))
> + ((source-file "src/scanner.cc")
=E2=80=A6apparently not.
Cheers,
simon
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 6 Feb 2023 00:07:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 05 19:07:49 2023
Received: from localhost ([127.0.0.1]:46739 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pOp2z-0006uz-FG
for submit <at> debbugs.gnu.org; Sun, 05 Feb 2023 19:07:49 -0500
Received: from mout.gmx.net ([212.227.17.21]:56561)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1pOp2x-0006uk-Kn
for 49946 <at> debbugs.gnu.org; Sun, 05 Feb 2023 19:07:48 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MwQTF-1oZSuX3NdF-00sOoo; Mon, 06
Feb 2023 01:07:40 +0100
References: <874jsemfcy.fsf@HIDDEN> <874js8ewsw.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
Subject: Re: About migrating support from emacs-tree-sitter to treesit
Date: Mon, 06 Feb 2023 00:00:41 +0000
In-reply-to: <874js8ewsw.fsf@HIDDEN>
Message-ID: <87wn4vzmes.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Provags-ID: V03:K1:/Ly/QUCSXjeQAkj7cL8EPUT/9CPQUMcY/uBvrntmC+0jYNqSSdF
LmCgonWX1pEa37/Ne3hsFXow1hhW2b7ZtncZa7O/7iUdyAUIi/plAJQ+JeODgN6Cq8gbjAL
A6/MOisu1KxKrfdTeJxlAcQ4CY1+GiqD98+4LIehvxrSl5MU8REpejQ9Quz1muz99Rdsn7z
xRwFha4U32/MHm0l3ZVNw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:LEpGu9j32TY=;dCKiICeQwu45apPtmjdVo6FWdO/
pi3PaJ6ypTZhP8XDLvS/4rtGrCVjeJqlsR6o/DPqYl9lPVmVmCQXpyGwy4QXJyPiHOn1cj4dd
y66+kfhKw8FV46kOnniMdqluZJdhTDJJ4FMB3dGRO6raC4zVMA0wSMRF+cCDZRmen9qQ+bcwx
SyqDOB0BDYxdFSh1QpEW9ySHKxYW+j66tTiAW4qriqWu9pqSUg6K0v9Rg2jHWlnr9zj5vqGs6
G5o7h+zfXhHm/5wrIyhNm6rUCFA6KH2d3Y3u98axjEnfHXhIE9ZfqHjPOW+uGiUpkUhhLiD3z
r1lCmoohAKBdqqZ/y46+Ygk+XL4958bQ9BHcgiY3ARTJ/6x/uue/pfcnXWGTx7Z+o2JlCqbTb
ZP9iCCi7AviEbQ5wPPznH8X3Q7F8h6BU2Xs6pkGoMFaGv9pgmO4Iai0H9GZV0z0+FTiCZNK5C
BbKfx/MSWvhSjtCgd8M9b3f7MCi0qm7lW7VxECETtulSojdOyT2PXZyVfzEp0NN5wpQnLUf/Q
p5d+AYN3vvZV31KSH/dcuymOmFrgRUCrKMXt189Dcyiqzi67qwA5k7PJyUoAKCdYQktPALaa7
EnOOmyln69Nzb25V0oIy/E5yhdWqTR9XW4yhwwVraSdRE676ZzwJk67cCAYP05ZZOQUJPBYFR
jkf+9QDFFroUX5izHsEKKtGSKagtXd49SjEB4KUoHSVqR/HZ3kq7yPssK84inPMyzuBSRoPNj
kxfZ7Sgn1GZ9B/EnAUuSaCDtywGC/WM3Y2jM4O8NRJbO/ooHmIKKKAYzm8QViTqedIouvoPwW
SGbYQGXylXFsa53b798H2N7aqbC9w7t0Ip20t2EJ2QJEdSl3SDXneyQb0VqwPfQvDAs4HriPb
GQq5rbh6V/OVXWrdtH5ifjwaFfyxdEnw0+jWwBq0TexNJQgiABCus1f6LMu7Ppha8KHXxETvV
YHl+7f1xXopsC63ldvvE+1Mkaho=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Hi Luis,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN> writes:
> Hi guix,
>
> Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN> writes:
>
>> Hi guix,
>>
>> I was taking a look at this patch series again and wondering if it
>> could
>> be modified to support the new built in treesit module coming in
>> Emacs 29 instead of emacs-tree-sitter, as the latter recommends using
>> the native integration going forward [1]. Maybe we should leave this
>> to when
>> Emacs 29 is released, but I think working on this in advance could
>> result on it being delivered earlier, which would be great. What do
>> you think Pierre?
>>
>> [1]:
>> https://github.com/emacs-tree-sitter/elisp-tree-sitter/commit/d3eab879e9b0ccc9582113d81a93ad06f3c6bfb1
>>
>> PS: I'm willing to help
>>
>> Regards,
>
> I played around this idea this weekend and I got `treesit' to use the Guix
> installed grammars :) !
>
> First, I applied a patch that added tree-sitter as an input for emacs-next
> [1]. [1]: https://issues.guix.gnu.org/61139
>
> Then, I did the edits below on top of Pierre's latest patch series:
This is super cool, thanks for looking into this! and sorry for replying
so late. I agree that we should try and get these grammars integrated
into emacs as soon as we can, it's the end goal after all (by that I
mean that I'm not sure the Rust-based emacs module will live on after
emacs 29 is released).
But anyways, it's great that you got it working with minimal changes,
looks like there won't be any blockers :-).
Regarding the patch series, I do have a new version in the pipeline
(fixing style and improving testing) but I'm afraid I've had no time to
work on it in the past month and a half. I should have more time
starting from next weekend.
Thanks!
Pierre
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Jan 2023 23:38:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 29 18:38:35 2023
Received: from localhost ([127.0.0.1]:45589 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pMHFr-00066k-Eo
for submit <at> debbugs.gnu.org; Sun, 29 Jan 2023 18:38:35 -0500
Received: from mail-ot1-f54.google.com ([209.85.210.54]:44761)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <luishenriquegh2701@HIDDEN>) id 1pMHFp-00066Y-Nx
for 49946 <at> debbugs.gnu.org; Sun, 29 Jan 2023 18:38:34 -0500
Received: by mail-ot1-f54.google.com with SMTP id
g21-20020a9d6495000000b0068bb336141dso2249448otl.11
for <49946 <at> debbugs.gnu.org>; Sun, 29 Jan 2023 15:38:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:in-reply-to:date:subject:to:from:user-agent
:references:from:to:cc:subject:date:message-id:reply-to;
bh=HBf+x/T9pKbyKgZRIGA0WRH0PLgpnX9Zz96QVm6JP5k=;
b=NF8XpYJscWxLe9kwisXGMmeXMDjQ2atg00oIjU3a+VkMRTslr/HlY45OBklCz2qaUb
N0Fzf4c8pnyJfKo/4fzhNP1O75Oqf0D6eoP2KAmrc8yhsndfcxVLGWsgQ7azopM1hH2M
AfNW8Eotf9Ho0eRQOyWjlqcMbQus5t7VwFWMIVMeGoCsrBdEJKsaNFBXJwT98E24G8sH
GZ+gZXWV/5jjIBhHtnc7I4vqE4RAdN5RSba8B0+BiHSR4KIFi6nencdCIbUnLVGB/QBr
v8hiimM5u2LzYcgBEXdGIc1oLIywRZJjoyQ8TBisY+0luFLpP1Isq3vKXtakp34//t0l
BJ6g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:in-reply-to:date:subject:to:from:user-agent
:references:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=HBf+x/T9pKbyKgZRIGA0WRH0PLgpnX9Zz96QVm6JP5k=;
b=tJaACdUN3HxmD8yNrKAbYNbeDh4VvEpXKV4uXx5s6XnhSQ+mE23QQOdjPpadP9NjyJ
qSqMSuAjdj7Wvu9W0KkSzGVcN6xt70QxZpBA38Z0UvtPwEpzYUOwVxjCgXN3Qo33BY5a
SUW1T4PNGUVtFKE1FVVEvSHWyUs8kgRhuwbcTO9I74WGoDtizRWLc9awniPN8ZPa3Mf6
2b9/Bbsgyxlu33pf0ljB1uf8swVc+MubE2IOgnqOAnSGSR9jg6fwQUAWsPoI5WV1e0Hc
dR1htJt+NjwlP+yj6jthn4l2jcTLpxQuUU/hxGn2bt/0Vus2JhXUx8n+Zzzzb2lOaDey
V/7Q==
X-Gm-Message-State: AO0yUKXQd+kqyBd3Fqk1SfwRuXknutNzPWlza6gNZjN0nFkiLc+7034V
QaXX9CFauqOnVmsLELfZLlc=
X-Google-Smtp-Source: AK7set9BX7UgzioENIO+bGqGe75JT4xR6JQKiIBiJQ2rJpvgY/M8pu6f8y8t6GcyFaN2bv1l6YVAYg==
X-Received: by 2002:a9d:7844:0:b0:686:50ca:7404 with SMTP id
c4-20020a9d7844000000b0068650ca7404mr3001621otm.4.1675035507973;
Sun, 29 Jan 2023 15:38:27 -0800 (PST)
Received: from LenovoGuix ([2804:1b3:c201:933a:c214:2125:64ba:ee10])
by smtp.gmail.com with ESMTPSA id
y12-20020a056830070c00b0068bcb290a38sm1542865ots.55.2023.01.29.15.38.25
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 29 Jan 2023 15:38:27 -0800 (PST)
References: <874jsemfcy.fsf@HIDDEN>
User-agent: mu4e 1.8.13; emacs 28.2
From: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
To: 49946 <at> debbugs.gnu.org, Pierre Langlois <pierre.langlois@HIDDEN>
Subject: Re: About migrating support from emacs-tree-sitter to treesit
Date: Sun, 29 Jan 2023 20:10:18 -0300
In-reply-to: <874jsemfcy.fsf@HIDDEN>
Message-ID: <874js8ewsw.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
--=-=-=
Content-Type: text/plain; format=flowed
Hi guix,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN> writes:
> Hi guix,
>
> I was taking a look at this patch series again and wondering if
> it
> could
> be modified to support the new built in treesit module coming in
> Emacs 29 instead of emacs-tree-sitter, as the latter recommends
> using
> the native integration going forward [1]. Maybe we should leave
> this
> to when
> Emacs 29 is released, but I think working on this in advance
> could
> result on it being delivered earlier, which would be great. What
> do
> you think Pierre?
>
> [1]:
> https://github.com/emacs-tree-sitter/elisp-tree-sitter/commit/d3eab879e9b0ccc9582113d81a93ad06f3c6bfb1
>
> PS: I'm willing to help
>
> Regards,
I played around this idea this weekend and I got `treesit' to use
the Guix installed grammars :) !
First, I applied a patch that added tree-sitter as an input for
emacs-next [1].
[1]: https://issues.guix.gnu.org/61139
Then, I did the edits below on top of Pierre's latest patch
series:
--=-=-=
Content-Type: text/plain
Content-Disposition: inline;
filename=0001-Support-treesit-module-from-emacs.patch
From fb96ca9c6039d07856c8f3525919ed9036b39470 Mon Sep 17 00:00:00 2001
From: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
Date: Sun, 29 Jan 2023 20:24:04 -0300
Subject: [PATCH] Support treesit module from emacs
---
gnu/packages/emacs.scm | 8 +++++++-
guix/build/tree-sitter-build-system.scm | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 951c1ad6df..193547ff42 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -409,7 +409,13 @@ (define-public emacs-next
(prepend sqlite tree-sitter)))
(native-inputs
(modify-inputs (package-native-inputs emacs)
- (prepend autoconf))))))
+ (prepend autoconf)))
+ (native-search-paths
+ (cons
+ (search-path-specification
+ (variable "TREE_SITTER_GRAMMARS")
+ (files '("lib/tree-sitter")))
+ (package-native-search-paths emacs))))))
(define-public emacs-next-pgtk
(package
diff --git a/guix/build/tree-sitter-build-system.scm b/guix/build/tree-sitter-build-system.scm
index 574b0f2a1c..ee1aa9976c 100644
--- a/guix/build/tree-sitter-build-system.scm
+++ b/guix/build/tree-sitter-build-system.scm
@@ -114,7 +114,7 @@ (define (compile-language dir)
"-fno-exceptions"
"-O2"
"-g"
- "-o" ,(string-append lib "/" lang ".so")
+ "-o" ,(string-append lib "/libtree-sitter-" lang ".so")
;; An additional `scanner.{c,cc}' file is sometimes
;; provided.
,@(cond
--
2.39.1
--=-=-=
Content-Type: text/plain; format=flowed
Then, I ran `./pre-inst-env guix shell emacs-next tree-sitter-c
tree-sitter-cpp --container --preserve="^TERM$" -- emacs -Q -nw`
and executed the following code inside that Emacs session:
--8<---------------cut here---------------start------------->8---
(defvar guix-treesit-grammar-paths
(let ((grammars-path (if (getenv "TREE_SITTER_GRAMMARS")
(getenv "TREE_SITTER_GRAMMARS")
"")))
(split-string grammars-path ":")))
(if (treesit-available-p)
(setq treesit-extra-load-path guix-treesit-grammar-paths))
--8<---------------cut here---------------end--------------->8---
Doing these steps, Emacs' treesit was able to use the grammars
installed by Guix in c-ts-mode. I don't know if a native
search-path is the appropriate approach or how to include the
above elisp (or something similar) in the emacs-next package, but
I hope this helps Pierre or anyone else with more understanding to
do the v8 of this patch series :).
Regards,
--
Luis H. Higino
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Jan 2023 22:14:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 25 17:14:34 2023
Received: from localhost ([127.0.0.1]:60134 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pKo2M-0007Ta-Is
for submit <at> debbugs.gnu.org; Wed, 25 Jan 2023 17:14:34 -0500
Received: from mail-oi1-f171.google.com ([209.85.167.171]:37378)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <luishenriquegh2701@HIDDEN>) id 1pKo2K-0007TJ-Nd
for 49946 <at> debbugs.gnu.org; Wed, 25 Jan 2023 17:14:33 -0500
Received: by mail-oi1-f171.google.com with SMTP id i9so13836324oif.4
for <49946 <at> debbugs.gnu.org>; Wed, 25 Jan 2023 14:14:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:date:subject:to:from:user-agent:from:to:cc
:subject:date:message-id:reply-to;
bh=rqK9AtC/U0trhBnbN8krPyjwx911Gw2ECOrC+ipV5Ic=;
b=eeT+gYyZAhXtJ6hFzpHhNwJJdHCMP/uJpLSNparQMSp4qA6Ah9UOcPCw/yb18h/mZB
e4snOumgsYKBJBkQixOCMbFsx7mQeXhAyi2/Hx/1WaKSpdRbaAbv6+CjKhapyr2oe0Hb
LsuYuKbTW6r4FfGq63xxkpdMxAqlSnKHpmacbeKR/9vG6Fe3C+/iEHaw6QzNI/ihkyx+
Wi0LV2AA/j5OPmkw1b7pbpW1bWn3RhYPOtl4p26lBDR9XG2xPID+U1l/pt+6kPXoTpdL
m6oaPFksV6qwL8KnhWPu4xxJMmSHWe5DMhEOFHqbTrOvDZDc0+wC3TQvnePkLf2cu9bf
IAHw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:date:subject:to:from:user-agent
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=rqK9AtC/U0trhBnbN8krPyjwx911Gw2ECOrC+ipV5Ic=;
b=GHGq1lDJdxoa/Pw/v1qGRgi32KQx0R9zpW9F1ULw53qDh2J7OxNz5ovKrGpYjM3fq6
8dLD8ZZAWieLQxR4KNfrExZnpBaf2nNYquPwrc14LXh/bJleADmRwdwkmwYqZbuIxaDI
TZFbXBd9QVs/vYkJ4BmS8MdE6HMbsdf8L2ZhHjey+cTyWsl1AGlqFeDRSZk1nDpyQ5to
TsXU+TWAuL8VO10Q3jICqOD8pIy1EpTbJXTP3jbsyMm2apNTDcAn7ZsLjS8DnVTc+RUZ
1zYfPzEtJF3IhXWmS0ruSeyFTNv8VWm0qHgsmsh9QXfskE8CN6NMF6blQ4cCggVa09sl
kbng==
X-Gm-Message-State: AFqh2kpZ/FNeUQy5B67T6QXcl8ndiuZLPayd5DmjDMiw7vDfD1pIm2+1
XqZ11z68RG8Ro5mkmQFng60=
X-Google-Smtp-Source: AMrXdXtGhgTWsUq6s+u3bmcNhcafSXwBFxC2nL7986z87wvd+25e3q8HJMSV7TdaDNWmSdAs4glZyw==
X-Received: by 2002:a05:6808:179f:b0:367:b5b:a7fb with SMTP id
bg31-20020a056808179f00b003670b5ba7fbmr22652826oib.20.1674684866652;
Wed, 25 Jan 2023 14:14:26 -0800 (PST)
Received: from LenovoGuix ([2804:1b3:c201:7e9d:ed65:d59c:c8e4:7d14])
by smtp.gmail.com with ESMTPSA id
br27-20020a056830391b00b006864346cbd1sm2681257otb.35.2023.01.25.14.14.24
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 25 Jan 2023 14:14:25 -0800 (PST)
User-agent: mu4e 1.8.13; emacs 28.2
From: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
To: 49946 <at> debbugs.gnu.org, Pierre Langlois <pierre.langlois@HIDDEN>
Subject: About migrating support from emacs-tree-sitter to treesit
Date: Wed, 25 Jan 2023 19:04:19 -0300
Message-ID: <874jsemfcy.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
Hi guix,
I was taking a look at this patch series again and wondering if it
could
be modified to support the new built in treesit module coming in
Emacs 29 instead of emacs-tree-sitter, as the latter recommends
using
the native integration going forward [1]. Maybe we should leave
this to when
Emacs 29 is released, but I think working on this in advance could
result on it being delivered earlier, which would be great. What
do you think Pierre?
[1]:
https://github.com/emacs-tree-sitter/elisp-tree-sitter/commit/d3eab879e9b0ccc9582113d81a93ad06f3c6bfb1
PS: I'm willing to help
Regards,
--
Luis H. Higino
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 10:22:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 05:22:00 2022
Received: from localhost ([127.0.0.1]:33626 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyVqJ-0004an-Un
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 05:22:00 -0500
Received: from mout.gmx.net ([212.227.17.21]:46243)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyVqI-0004aY-1y
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 05:21:58 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104
[212.227.17.174]) with ESMTPSA (Nemesis) id 1Mkpex-1oc8Zc2Vod-00mGrf; Fri, 25
Nov 2022 11:21:51 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
<COL63T6V2GW7.38CF8YKKBV1FM@guix-framework>
User-agent: mu4e 1.8.11; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: "(" <paren@HIDDEN>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
Date: Fri, 25 Nov 2022 10:18:54 +0000
In-reply-to: <COL63T6V2GW7.38CF8YKKBV1FM@guix-framework>
Message-ID: <87bkovcp1d.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:JiGz0La5KxWI/Di+hxypxmhRTeerXWBdAlKrpyy0Qy3m+Dn5mn2
LdJvhjwrts3BVIMT2nT/AF/rpyFckYIIy4VViBrT8Q/ng36+dNZzKfSWeIB22PClpxiDDXb
P0GmfXHsANCM3Lt81/weiHyOP5zsDF4YvplOlILapVebhqMBaLngmCZrN+Lvdzb7x55rtwC
EmQw6ZAf+S9yMQ24K8WJg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:pTQMqhrwckk=;7VZx7SSO6djldT3rT2C1ciemL0I
ubjmdeLWH5HaJvV3g5lAWDbDzuK1ic/aZBWwbas/WlyJ95a6JQRdtTrdCt0+3I06VpfDL00CJ
wcZH8jggNqNSufNcCoBtqySiK0gF9QrnYSp0gLLrb1I1el78k6afcF3mcOY3SDg5bD+ujko8K
MppJEPAHrq9fQ4SjXQ14kUtIhLSsbk7QThaSlKN6ckkfGTk1Cex0tF2F6BSwbcle1Io/mKlsz
2xgQYeiJygclLKZ4jmMH+7Gq0jE0LDjGiYMSq+oj4ynCLHYLdcM16J9dqAm/H7Hmx9kPR3ahN
lE540D/nJz9SZd7JKkQp44SBE0wzk7BYm9i/aMgNgQxaQ+xso+nx87DBHsVTp5mN30kveujRY
MilzuvITdYxpaw3Cv+Br8pLR1xDvTt0XnPBNkIHagTMDfJBsKoVVoGUqo90OhI/T0tgWVCXGX
in/vFcoyQFS8qCt+NNvZ3nvhInU9w0zFDgV8LOlMlpAAka1UU6t8FqzGOtKeYg5Fx6cZ1Be37
gnjgNLuol9RvQ7PaVnjbYFVqIfEiSZExifr7RYj8+mbDmTvoTlLS0wseMxxoim4wHefPPDTgC
A0FlXkW7Mf9u3pRbb8owqFv9voBMTair4f6PXKkR28jMuJLXi72M4CXh9j9fRNMY4IobZK9VF
OuqjrI7mhgZDlZwYlW6aKe599rQRgWEEF3F7mDSg5sWIzBxrMTAyXYNw/NBv+f2DJ+Tl8COv2
3hgFEGBFLN+IyxZ6JYqY0VF0r2VceS1s/MH6B16XN7HAtlE40drdvkYq0ZTldRKZ5qdQ6wLmF
KpVXg0Hn0INtDMokGuJBfTT304RkACdvSe5TGuiupTBhXeuQNU+89t9td5diteYPuEU1Ddr4D
RQMU83Pg7eLMYBAWTy9JfUMH4maOBj9NP3qlAHouREY5ChhZs7LpwCqFQ9T4S45AneglUxyfK
KgmxrQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Hi!
"(" <paren@HIDDEN> writes:
> Heya,
Thanks for taking a look and spending time reviewing this, this is
great. I'll work on your suggestions over the weekend.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmOAlz4YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U4EMH/0g5S5KVVbeY8cjzZVqpsx6+
Tl4OOJsyxDLMKFJDDRRSU/bvGvySUZr9oK378V6/bDKzIiXH4xAZXYyCaztqvT7c
LesrgtOi5OiV/S2GBJxY693a0J4OCHd6Hbq96SPnWecowt+0l+rDiCplc7E3g1xP
eKgDHlV1qmPFKOTLkSpgisT0jN0hlfKxrT3JN0kI8P+VjfYTT7xCE46+sU+Hz8As
d1qr1F1GTIPKGRFmpugbAbnqTp/dyAtcTcsGQtgKpg+QqqQjhbtbWuD8Mr5UscWm
Igyr2sScK+PA07mlBBYCWYCAOWxyq9mY0OIyrOr0OOWyMU6+e/2VDdvJ1eA5vW0=
=uKDU
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 10:14:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 05:14:12 2022
Received: from localhost ([127.0.0.1]:33596 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyVik-0004NY-VV
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 05:14:11 -0500
Received: from mout.gmx.net ([212.227.15.15]:58887)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyVii-0004NJ-3w
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 05:14:09 -0500
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004
[212.227.17.184]) with ESMTPSA (Nemesis) id 1MF3DW-1pDw380OBk-00FTYh; Fri, 25
Nov 2022 11:14:02 +0100
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-7-pierre.langlois@HIDDEN>
User-agent: mu4e 1.8.11; emacs 28.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 06/32] build-system: Add tree-sitter-build-system.
Date: Fri, 25 Nov 2022 01:57:21 +0000
In-reply-to: <20221125012142.22579-7-pierre.langlois@HIDDEN>
Message-ID: <87r0xrcpei.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:E4H3QSjbkqpNsCbOBY8GIFnPKi+n6f/T/e/+eMRMc9flTtqyjNM
walxEI7NVuSeLV6N78p8mQLNnxrPGQCaIHcbn3rsCsF/EbiUUA1gNq+uEjmCTdWuRCPa6XV
44P/cb5Uhkg2vfOTsjudp36Dz/VANRAZc9QQS/xRoCpBvo1rMxUTHsKTUc+3cADBDQPxyRJ
Gzf+O5DM8HBlptb/WCBCQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:XvJ4sFxpvMc=;9Av/coRHkWP07fmI0F/yGNwBeO6
tFp1BXmujFit2rmPNY7Sc1S/r+vmcNPomuYZhe38emYZ0qv5Lag6NxjRieVbnhETnlenc+3yt
PuPIIvpzKDSgblUiCvFWhtdRbmtEPy1qJctzssTScnn0COSKl6hIyEfbS08mXmbv/taVv0oEi
7ijZWIRb2SCSCXHvyQwIVvmMZfzoTIIU0RWe71bePd7h4PxlyvDsxxGNblgeolZdpEMSwOdro
tDIm3ou2wuN6utzMfkyqioJd0/dcAHVwd8AiTmGz9I/lmUi+7ZMtjlIWtbX1r+JZlHVq3JZ0M
NcgLFM0Sn9ia40fsk1p6/ll1QeYBsbDm9n12jnLcX81nUPJBK6U4P5FG9iflSSyUfwWIdF9f6
T7pndZjMJ8p9zEO17d9igEC4rrxaWGbNqiwWDbvp4suayEhkbl0xHDGErd7X1CQX5VbmiqKdh
hEUFg6OTudN3TpJ0MUg545PAAwEViQ7wA979f+PR3TM4GwJYskUOfbMDlgRMm+QEKDE7374cM
G5XdfzcB7zek/VJ4v4DubjhpzClNM/tTmD//PUbhn/mJ7SWRnR6vweVCS5NGKwhR+MDKMfQwV
oD6zfmZTHMcrahsaM3MWmKibQDhI4NaDaIYYcJyvfQeNrgBaG1Ne6FPrwn++x6M8DNhCWL9hw
pgS8+W1AR4qO57PyHQjjjXNdB9aF0F+QPAhuxTiy8aJnlzLnGbFfmrEqWAHBFmMZ0uKHTjPGd
MGSAtRF3KshywQ7cYIUfjynW9QgUvPpmnKAe6rLSRg+Msjou+/+muhgQI+mRV4kaV63veoZT3
ChcIIFxyuAW2VsrS+D1ORkdcvRyeD7IbUsYrLEu4DWOhC8OJs7Lg6L6p6aJw5dRqNlQL6aQUG
RJKlwn+VaGCC2myBpv+SzTV4sHtFeyatXqjN5Ga3Xx2vi3krZ9SYWjeGqaxj4qJ3SqT3eSl2U
S3bUX7ueC2aKHwvWsX5D5m3zk2U=
X-Spam-Score: 0.4 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.6 (/)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain
It appears this email is making it through, so here it is as an
attachment:
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmOAlWYYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UIo0H/iRioXzQ/9ulOwlNlgn2+FEi
fgAUL+jF3uYEX96rWrBLIY2EDdGU1O+e/ymxxkonDkg5VV3Hp+qYNm+IfSPoxtdg
frfk+60D0BIS82gTve6FWnjBCtlzVFLEHb6XuRk9+pgKOh2s/JsqLp+DFAYCWoFN
onncjb7bBlNIsfH2cYfx5Bmj3GLXbNP1InCChE0WMSNCY7ZdBX1ph6Spsf6s0syL
FjKiy8nLz852YsReR1RMxGr2fdxNQCbWMFr3w+3NoyfE5RXhsTfD4b+TlZv0Gjp8
5ToWkOV7Eys2YmjahRbCXx9H9IuCFi+qWMsBO+CdTNagyAlBv7I9VCwRSBRlfZg=
=lxXa
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: attachment;
filename=0006-build-system-Add-tree-sitter-build-system.patch
Content-Transfer-Encoding: quoted-printable
From 4a3c1fff8460a03bfb7c1aada9863205cd6f22fd Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Tue, 29 Mar 2022 20:13:34 +0100
Subject: [PATCH v7 06/32] build-system: Add tree-sitter-build-system.
* guix/build-system/tree-sitter.scm: New module.
* guix/build/tree-sitter-build-system.scm: Likewise.
* Makefile.am (MODULES): Add them.
* doc/guix.texi: Document it.
---
Makefile.am | 2 +
doc/guix.texi | 21 ++-
guix/build-system/tree-sitter.scm | 190 ++++++++++++++++++++++++
guix/build/tree-sitter-build-system.scm | 153 +++++++++++++++++++
4 files changed, 365 insertions(+), 1 deletion(-)
create mode 100644 guix/build-system/tree-sitter.scm
create mode 100644 guix/build/tree-sitter-build-system.scm
diff --git a/Makefile.am b/Makefile.am
index c3af23b68e..a16c4fcd7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,6 +178,7 @@ MODULES =3D \
guix/build-system/ruby.scm \
guix/build-system/scons.scm \
guix/build-system/texlive.scm \
+ guix/build-system/tree-sitter.scm \
guix/build-system/trivial.scm \
guix/ftp-client.scm \
guix/http-client.scm \
@@ -234,6 +235,7 @@ MODULES =3D \
guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \
guix/build/texlive-build-system.scm \
+ guix/build/tree-sitter-build-system.scm \
guix/build/waf-build-system.scm \
guix/build/haskell-build-system.scm \
guix/build/julia-build-system.scm \
diff --git a/doc/guix.texi b/doc/guix.texi
index e547d469f4..4e997f7176 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@*
Copyright @copyright{} 2020 Naga Malleswari@*
Copyright @copyright{} 2020, 2021 Brice Waegeneire@*
Copyright @copyright{} 2020 R Veera Kumar@*
-Copyright @copyright{} 2020, 2021 Pierre Langlois@*
+Copyright @copyright{} 2020, 2021, 2022 Pierre Langlois@*
Copyright @copyright{} 2020 pinoaffe@*
Copyright @copyright{} 2020 Andr=C3=A9 Batista@*
Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@*
@@ -9732,6 +9732,25 @@ be specified with the @code{#:node} parameter which =
defaults to
@code{node}.
@end defvr
=20
+@defvr {Scheme Variable} tree-sitter-build-system
+
+This variable is exported by @code{(guix build-system tree-sitter)}. It
+implements procedures to compile grammars for the
+@url{https://tree-sitter.github.io/tree-sitter/, Tree-sitter} parsing
+library. It essentially runs @code{tree-sitter generate} to translate
+@code{grammar.js} grammars to JSON and then to C. Which it then
+compiles to native code.
+
+Tree-sitter packages may support multiple grammars, so this build system
+supports a @code{#:grammar-directories} keyword to specify a list of
+locations where a @code{grammar.js} file may be found.
+
+Grammars sometimes depend on each other, such as C++ depending on C and
+TypeScript depending on JavaScript. You may use inputs to declare such
+dependencies.
+
+@end defvr
+
Lastly, for packages that do not need anything as sophisticated, a
``trivial'' build system is provided. It is trivial in the sense that
it provides basically no support: it does not pull any implicit inputs,
diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sit=
ter.scm
new file mode 100644
index 0000000000..aeb96e3ef5
--- /dev/null
+++ b/guix/build-system/tree-sitter.scm
@@ -0,0 +1,190 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix build-system tree-sitter)
+ #:use-module (guix store)
+ #:use-module (guix utils)
+ #:use-module (guix packages)
+ #:use-module (guix gexp)
+ #:use-module (guix monads)
+ #:use-module (guix search-paths)
+ #:use-module (guix build-system)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system node)
+ #:use-module (ice-9 match)
+ #:export (%tree-sitter-build-system-modules
+ tree-sitter-build
+ tree-sitter-build-system))
+
+(define %tree-sitter-build-system-modules
+ ;; Build-side modules imported by default.
+ `((guix build tree-sitter-build-system)
+ ,@%node-build-system-modules))
+
+(define* (lower name
+ #:key source inputs native-inputs outputs system target
+ #:allow-other-keys
+ #:rest arguments)
+ "Return a bag for NAME from the given arguments."
+ (define private-keywords
+ `(#:inputs #:native-inputs #:outputs ,@(if target
+ '()
+ '(#:target))))
+ (define node
+ (module-ref (resolve-interface '(gnu packages node))
+ 'node-lts))
+ (define tree-sitter
+ (module-ref (resolve-interface '(gnu packages tree-sitter))
+ 'tree-sitter))
+ (define tree-sitter-cli
+ (module-ref (resolve-interface '(gnu packages tree-sitter))
+ 'tree-sitter-cli))
+ ;; Grammars depend on each other via JS modules, which we package into a
+ ;; dedicated js output.
+ (define grammar-inputs
+ (map (match-lambda
+ ((name package)
+ `(,name ,package "js")))
+ inputs))
+ (bag
+ (name name)
+ (system system) (target target)
+ (build-inputs `(,@(if source
+ `(("source" ,source))
+ '())
+ ("node" ,node)
+ ("tree-sitter-cli" ,tree-sitter-cli)
+ ,@native-inputs
+ ,@(if target '() grammar-inputs)
+ ;; Keep the standard inputs of 'gnu-build-system'.
+ ,@(if target
+ (standard-cross-packages target 'host)
+ '())
+ ,@(standard-packages)))
+ (host-inputs `(("tree-sitter" ,tree-sitter)
+ ,@(if target grammar-inputs '())))
+ ;; Keep the standard inputs of 'gnu-buid-system'.
+ (target-inputs (if target
+ (standard-cross-packages target 'target)
+ '()))
+ ;; XXX: this is a hack to get around issue #41569.
+ (outputs (match outputs
+ (("out") (cons "js" outputs))
+ (_ outputs)))
+ (build (if target tree-sitter-cross-build tree-sitter-build))
+ (arguments (strip-keyword-arguments private-keywords arguments))))
+
+(define* (tree-sitter-build name inputs
+ #:key
+ source
+ (phases '%standard-phases)
+ (grammar-directories '("."))
+ (tests? #t)
+ (outputs '("out" "js"))
+ (search-paths '())
+ (system (%current-system))
+ (guile #f)
+ (imported-modules %tree-sitter-build-system-mo=
dules)
+ (modules '((guix build utils)
+ (guix build tree-sitter-build-syste=
m))))
+ (define builder
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ (tree-sitter-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:phases #$phases
+ #:tests? #$tests?
+ #:grammar-directories '#$grammar-directories
+ #:outputs #$(outputs->gexp outputs)
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specifica=
tion->sexp
+ search-paths))
+ #:inputs #$(input-tuples->gexp inputs)))))
+
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile=
))
+ system #:graft? #f)))
+ (gexp->derivation name builder
+ #:system system
+ #:guile-for-build guile)))
+
+(define* (tree-sitter-cross-build name
+ #:key
+ target
+ build-inputs target-inputs host-inputs
+ guile source
+ (phases '%standard-phases)
+ (grammar-directories '("."))
+ (tests? #t)
+ (outputs '("out" "js"))
+ (search-paths '())
+ (native-search-paths '())
+ (system (%current-system))
+ (build (nix-system->gnu-triplet system))
+ (imported-modules %tree-sitter-build-sys=
tem-modules)
+ (modules '((guix build utils)
+ (guix build tree-sitter-build=
-system))))
+ (define builder
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
+
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
+
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
+
+ (tree-sitter-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:build #$build
+ #:target #$target
+ #:phases #$phases
+ #:tests? #$tests?
+ #:grammar-directories '#$grammar-directories
+ #:outputs #$(outputs->gexp outputs)
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specifica=
tion->sexp
+ search-paths))
+ #:native-search-paths '#$(sexp->gexp
+ (map
+ search-path-specif=
ication->sexp
+ native-search-path=
s))))))
+
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile=
))
+ system #:graft? #f)))
+ (gexp->derivation name builder
+ #:system system
+ #:target target
+ #:guile-for-build guile)))
+
+(define tree-sitter-build-system
+ (build-system
+ (name 'tree-sitter)
+ (description "The Tree-sitter grammar build system")
+ (lower lower)))
+
+;;; tree-sitter.scm ends here
diff --git a/guix/build/tree-sitter-build-system.scm b/guix/build/tree-sitt=
er-build-system.scm
new file mode 100644
index 0000000000..574b0f2a1c
--- /dev/null
+++ b/guix/build/tree-sitter-build-system.scm
@@ -0,0 +1,153 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix build tree-sitter-build-system)
+ #:use-module ((guix build node-build-system) #:prefix node:)
+ #:use-module (guix build json)
+ #:use-module (guix build utils)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 regex)
+ #:use-module (srfi srfi-1)
+ #:export (%standard-phases
+ tree-sitter-build))
+
+;; Commentary:
+;;
+;; Build procedures for tree-sitter grammar packages. This is the
+;; builder-side code, which builds on top fo the node build-system.
+;;
+;; Tree-sitter grammars are written in JavaScript and compiled to a native
+;; shared object. The `tree-sitter generate' command invokes `node' in or=
der
+;; to evaluate the grammar.js into a grammar.json file, which is then
+;; translated into C code. We then compile the C code ourselves. Packages
+;; also sometimes add extra manually written C/C++ code.
+;;
+;; In order to support grammars depending on each other, such as C and C++,
+;; JavaScript and TypeScript, this build-system installs the source of the
+;; node module in a dedicated "js" output.
+;;
+;; Code:
+
+(define* (patch-dependencies #:key inputs #:allow-other-keys)
+ "Rewrite dependencies in 'package.json'. We remove all runtime dependen=
cies
+and replace development dependencies with tree-sitter grammar node modules=
."
+
+ (define (rewrite package.json)
+ (map (match-lambda
+ (("dependencies" @ . _)
+ '("dependencies" @))
+ (("devDependencies" @ . _)
+ `("devDependencies" @
+ ,@(filter-map (match-lambda
+ ((key . directory)
+ (let ((node-module
+ (string-append directory
+ "/lib/node_modules/"
+ key)))
+ (and (directory-exists? node-module)
+ `(,key . ,node-module)))))
+ (alist-delete "node" inputs))))
+ (other other))
+ package.json))
+
+ (node:with-atomic-json-file-replacement "package.json"
+ (match-lambda
+ (('@ . package.json)
+ (cons '@ (rewrite package.json))))))
+
+;; FIXME: The node build-system's configure phase does not support
+;; cross-compiling so we re-define it.
+(define* (configure #:key native-inputs inputs #:allow-other-keys)
+ (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
+ "--offline" "--ignore-scripts" "install"))
+
+(define* (build #:key grammar-directories #:allow-other-keys)
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ ;; Avoid generating binding code for other languages, we do
+ ;; not support this use-case yet and it relies on running
+ ;; `node-gyp' to build native addons.
+ (invoke "tree-sitter" "generate" "--no-bindings")))
+ grammar-directories))
+
+(define* (check #:key grammar-directories tests? #:allow-other-keys)
+ (when tests?
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "test")))
+ grammar-directories)))
+
+(define* (install #:key target grammar-directories outputs #:allow-other-k=
eys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ (mkdir-p lib)
+ (define (compile-language dir)
+ (with-directory-excursion dir
+ (let ((lang (assoc-ref (call-with-input-file "src/grammar.json"
+ read-json)
+ "name"))
+ (source-file (lambda (path)
+ (if (file-exists? path)
+ path
+ #f))))
+ (apply invoke
+ `(,(if target
+ (string-append target "-g++")
+ "g++")
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" ,(string-append lib "/" lang ".so")
+ ;; An additional `scanner.{c,cc}' file is sometimes
+ ;; provided.
+ ,@(cond
+ ((source-file "src/scanner.c")
+ =3D> (lambda (file) (list "-xc" "-std=3Dc99" file)))
+ ((source-file "src/scanner.cc")
+ =3D> (lambda (file) (list file)))
+ (else '()))
+ "-xc" "src/parser.c")))))
+ (for-each compile-language grammar-directories)))
+
+(define* (install-js #:key native-inputs inputs outputs #:allow-other-keys)
+ (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
+ "--prefix" (assoc-ref outputs "js")
+ "--global"
+ "--offline"
+ "--loglevel" "info"
+ "--production"
+ ;; Skip scripts to prevent building bindings via GYP.
+ "--ignore-scripts"
+ "install" "../package.tgz"))
+
+(define %standard-phases
+ (modify-phases node:%standard-phases
+ (replace 'patch-dependencies patch-dependencies)
+ (replace 'configure configure)
+ (replace 'build build)
+ (replace 'check check)
+ (replace 'install install)
+ (add-after 'install 'install-js install-js)))
+
+(define* (tree-sitter-build #:key inputs (phases %standard-phases)
+ #:allow-other-keys #:rest args)
+ (apply node:node-build #:inputs inputs #:phases phases args))
+
+;;; tree-sitter-build-system.scm ends here
--=20
2.38.1
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:29:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:29:34 2022
Received: from localhost ([127.0.0.1]:33303 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyT9S-0003zt-7L
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:29:34 -0500
Received: from knopi.disroot.org ([178.21.23.139]:55726)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oyT9Q-0003zh-1s
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:29:32 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 060CF4152F;
Fri, 25 Nov 2022 08:29:30 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id fkV-FWYKxZm1; Fri, 25 Nov 2022 08:29:28 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669361368; bh=0egKm3cZuyXYJl9ZaG5ahr7siw6xPEDB7vErI0aAHqw=;
h=Date:To:Subject:From:References:In-Reply-To:From;
b=FpCOrtdzaikU1whMNGRqumelGcwcyioHvWN5gH2QRmcFWk3LKEJeG9qnNDfNcz7jI
zhBAQFDhAkle5u4zSJskzvuN18qc4PZgjOAViExWfu3r6YVp9Ri966xKQUuF9mGEVP
U+7diONBg7Xzc18bgQkPtidNScHRK+14HwtEzP578oI6xA1DIA652o1qbWcFJ1r05G
U89VP2Rir5iO7dqUerWwPLtm2qaGW5hSqdtScbAN/byMUWREAs7gzQYEGDmtO6j6y2
4lkP6vLGaDZrz251SyjKre6L33givgA8yub9BOlJlgD+JQzWu9ePqR/c1RrXL4/7OW
BCAPqFn++QR9w==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:29:28 +0000
Message-Id: <COL77TIV1EVV.Q7OVWZ55S2RC@guix-framework>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 32/32] gnu: Add emacs-tree-sitter-langs.
From: "(" <paren@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-33-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-33-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bund=
le):
> New procedure.
Doesn't look like a procedure to me :) It probably should also be
a hidden-package, no?
> (emacs-tree-sitter-langs): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -849,3 +850,152 @@ (define-public emacs-tree-sitter
> + (synopsis #f)
> + (description #f)
Please add a description and synopsis.
> + (list
> + #:tests? #t
Superfluous newline; please use:
(list #:tests? #t ...)
> + (add-after 'install 'install-queries
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
> + (copy-recursively "queries" (string-append elpa "/querie=
s"))))))))
Please use #$output here.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:24:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:24:52 2022
Received: from localhost ([127.0.0.1]:33298 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyT4u-0003so-Iu
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:24:52 -0500
Received: from knopi.disroot.org ([178.21.23.139]:60344)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oyT4t-0003sg-4G
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:24:51 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 4D7AB41525;
Fri, 25 Nov 2022 08:24:50 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id JGR7bl_KmuHU; Fri, 25 Nov 2022 08:24:49 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669361089; bh=/UNIKE1MrcVMs6sDX29cMlv3PzorsYUzWs1al8pWO68=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=kdiCaf0GPza6K9h2rn0QbuIRxzMeKurs+416ipQnWFB/VPalkrlGsmUezx3cMlKlv
aM8vU3vgn4d0ub1bp00iuuWJXn5hKtPDBvck32nhOmtRb2zTY/V5RqP/sC0HkGgTG5
2XXB5BM9R6UzkN0VUFdbcMG3xaYaa71NOFm79w516VvPmyR9XBM9lh8uZ6I8MxyaaU
ulPUF52jCCynYRKwU7zJj2J9KC+WSYYUxDtzJC6PrTMo0Xsc5W9zLG5g+NMzLZOmoN
rEtqalRpah9qR265BfKjXM6Rn63n81YS0WN+sQ6nZEcbvCoPUN/J84PWZjEeI3lobP
iO3Nf+C5x/ABA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:24:48 +0000
Message-Id: <COL748WAHH3I.1TJK4IY2EYIIE@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 31/32] gnu: Add emacs-tree-sitter.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-32-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-32-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -822,3 +822,30 @@ (module (search-input-file inputs "/lib/tsc-dyn.so")=
))
> + (arguments
> + `(#:phases
LIST please.
> + (modify-phases %standard-phases
Aaaand gexp.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:24:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:24:24 2022
Received: from localhost ([127.0.0.1]:33295 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyT4S-0003s7-9w
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:24:24 -0500
Received: from knopi.disroot.org ([178.21.23.139]:55464)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oyT4R-0003s0-7X
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:24:23 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 995914152E;
Fri, 25 Nov 2022 08:24:22 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id HELtPOzYv5_M; Fri, 25 Nov 2022 08:24:21 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669361061; bh=pi4anSC36JqgzZjJP3wGkq8uoQ5fWgzTnmwpvcv3fWk=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=H74PBfxxyN+1X2pOxQcl2xBsjPyy0ZGHVTNKRTMuuiw71O0ktTTlgJRK69C31PBU1
m7tQdk1eFhV9yU1gaacuZNnh+80W1IwuGrl02GyA8xs0PI78saUwjqkn0RhvKxI7qk
GCmwGGklcCB1FYMEf8yQ55u+dKVoPoIQRz56V9lC2dUqkU8bUJi3uuZ6VJJ4wEmc2Z
Z0AeKNRWjqqMVPo+s8V8UPytxMdk7Xr5RbsH4t8/m6EaxwJufYbvhR+hWC9VXVXJMw
YgBSX8FKeshfoFs+FJxNk7cuM1hRShyWwIl9ylQo1P9CYPuLKleoNXby6oRmJy9adm
VmEoBGqaa2pOA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:24:20 +0000
Message-Id: <COL73W51TW1Q.1V6UY8SHDKAVE@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 30/32] gnu: Add emacs-tree-sitter-core.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-31-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-31-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> +(define-public emacs-tree-sitter-core
> + (package
> + (name "emacs-tree-sitter-core")
> + (version (package-version tree-sitter-emacs-module))
> + (source (package-source tree-sitter-emacs-module))
Never mind re ``source'' and ``version''; I just realised you didn't inheri=
t from the
tree-sitter-emacs-module package :)
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:23:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:23:05 2022
Received: from localhost ([127.0.0.1]:33291 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyT3A-0003q8-NK
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:23:05 -0500
Received: from knopi.disroot.org ([178.21.23.139]:40092)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oyT33-0003pR-N1
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:23:03 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 0D45041523;
Fri, 25 Nov 2022 08:22:57 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id qCzQDhh5DpEi; Fri, 25 Nov 2022 08:22:55 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360975; bh=sGT4kMGJ5YyV4RJm5XfqGkL84AVR7+ak77fuy0aP+es=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=XuJLt6V/ub8BCRUMWVbcxnAG1ml+Jx7WgXQ5jmsQW37cRgL4Fx2vsbCdpePj6vHN4
lcL9XO45Yzgk0/LGP8eJPjv9TitkmRFvksr8XzA5lSfYbXnM0C3LrIFWiLM3BwSI8e
mDc5Wvz/sEOkmyTdVTb5vt39gVhkeBw/S1uYsz8OQn/r+q+vcYqXYoI2gmgUkRxOl0
UIoqiRievFwYnTCAFqpewbnOOUpF4ES8LSVJEnI/zWjZY8wvwyvMVqlMT9jCdt0tGP
1MvAmDRgjxPngDAQOyiQdMfsyFge8bNhto3ln+UYf/fL94ucuIiRH8oXVcAPv+Q0Yj
GJf3szrGWYTYA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:22:54 +0000
Message-Id: <COL72SLW5HTE.1K3Y67DCEMPPJ@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 30/32] gnu: Add emacs-tree-sitter-core.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-31-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-31-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local vari=
able.
> (emacs-tree-sitter-core): New variable.
Please split these two into separate patches.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -738,3 +739,86 @@ (define-public tree-sitter-typescript
> + (arguments
> + `(#:cargo-inputs
(list #:cargo-inputs
...)
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'chdir
> + (lambda _ (chdir "core")))
> + (add-after 'chdir 'delete-cargo.lock
> + (lambda _ (delete-file "Cargo.lock")))
> + (add-after 'delete-cargo.lock 'do-not-fetch-from-github
> + (lambda _
> + (substitute* "Cargo.toml"
> + (("\\[patch.*") "")
> + (("git =3D .*") ""))))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((lib (string-append (assoc-ref outputs "out") "/lib")=
))
> + (mkdir-p lib)
> + (copy-file "target/release/libtsc_dyn.so"
> + (string-append lib "/tsc-dyn.so"))))))))
Please use gexps and #$output here:
(replace 'install
(lambda _
(let ((lib (string-append #$output "/lib")))
(mkdir-p lib)
(copy-file "target/release/libtsc_dyn.so"
(string-append lib "/tsc-dyn.so")))))
> + (name "emacs-tree-sitter-core")
> + (version (package-version tree-sitter-emacs-module))
> + (source (package-source tree-sitter-emacs-module))
This ``version'' and ``source'' are unnecessary.
> + (arguments
> + `(#:phases
LIST, please.
> + (modify-phases %standard-phases
Gexp this, please.
> + (let ((elpa (elpa-directory (assoc-ref outputs "out")))
Please use #$output.
> + (module (search-input-file inputs "/lib/tsc-dyn.so"))=
)
The leading / is redundant; this will do:
(search-input-file inputs "lib/tsc-dyn.so")
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:18:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:18:00 2022
Received: from localhost ([127.0.0.1]:33287 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySyG-0003iH-1c
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:18:00 -0500
Received: from knopi.disroot.org ([178.21.23.139]:45518)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySyE-0003i9-LY
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:17:59 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id F270B4151D;
Fri, 25 Nov 2022 08:17:57 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 1BCJOt6XlK6X; Fri, 25 Nov 2022 08:17:56 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360676; bh=IsKFaUlTI/4z7IxqVDnke5TP576fBdChJWAIq+X/odM=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=FWTgdHmR4nP63LT4qDu6EIcwG1sn9oSGeOgftUIwvkCW8Y87ZAI7GpvmRwHxe/WmW
VodHhlX89hOKWUMMXPYXTgsIiTjQEJvdYloHYZADY65Y45n4pxBHfD2G23kyPdsSDR
2z0vITUE2Jclo32HiZooF6T3eJvRCMQre4zqWadYDg4Y5783p0Fs7wiUg0Lr6k0G98
5Ypx5iC4hqYoKroC8dYdYd0hwNESYnKA0vz8gjmU/8BB+aNuCaxeLVGbBmCSRWVSIF
dnlx1+OLt+qvaXbkpyJzts0wtyZ4nLvZziwPbU/ZlDKBhskEUJaAn+Rd0enxWjfYrW
8djrAY154/vaw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:17:55 +0000
Message-Id: <COL6YZ9URVWA.388EGOJKP3TEZ@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 29/32] gnu: Add rust-tree-sitter-for-emacs.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-30-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-30-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (rust-tree-sitter-for-emacs): New variable=
.
> * gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file=
.
> * gnu/local.mk (dist_patch_DATA): Register it.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -196,6 +197,19 @@ (define-public rust-tree-sitter
> +;; We need to apply a patch in order to compile the rust bindings agains=
t the
> +;; emacs tree-sitter module.
> +;; See https://github.com/tree-sitter/tree-sitter/pull/1294
> +(define-public rust-tree-sitter-for-emacs
> + (package (inherit rust-tree-sitter)
> + (source (origin
> + (inherit (package-source rust-tree-sitter))
> + (patches (search-patches
> + "rust-tree-sitter-text-provider-fix.patch"))))
> + ;; Do not show this package in the UI as it's only meant to be used =
for
> + ;; emacs's tree-sitter module.
> + (properties '((hidden? . #t)))))
You can use ``hidden-package'', which is a bit nicer than ``properties''
imo:
(hidden-package
(package (inherit rust-tree-sitter)
...))
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:11:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:11:12 2022
Received: from localhost ([127.0.0.1]:33269 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySrg-0003XH-0F
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:11:12 -0500
Received: from knopi.disroot.org ([178.21.23.139]:33692)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySrZ-0003X1-Cq
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:11:10 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id CF25F41513;
Fri, 25 Nov 2022 08:11:04 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id oT_dbCtLorxS; Fri, 25 Nov 2022 08:11:03 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360263; bh=4dGHFywQR9gvkZPikno8+cVj0a4tS6OGTjZEnTrFVCA=;
h=Date:To:Subject:From:References:In-Reply-To:From;
b=IgGj+b5j5I6gOsVlOKTOcqdVr2GnvgbJpmNO4xTPQeOxQGSrbnkKIPQljrD1nwK1T
sWOkBqMc08mwyc+Tih4E4G3luuMb9Ib6P+wAwHeLt/iqzTiTLIcexk72JIGMpP9ech
vlqUE+4HVIpgGdHwexKvECsmfHMq+Y2uK3JO0yqVOwynP1AOr+0pDSjm+UTifgC/b3
d8TuVfVFM4FsRF8n3YpBfcllkx5tWINsonLPCrXHlIRLPScV9YS6fjyILQdhEaFPuK
qMqpnyKiULAp1RtzlfHGMXYcSXpI2qQdC4jjL2RoxQ1R29paEyhkB+SJ8eSnwoTM+t
5yiKSX53zmtoA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:11:02 +0000
Message-Id: <COL6TPPIQOLK.3CUNK5CQND5K4@guix-framework>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 28/32] gnu: Add rust-tree-sitter.
From: "(" <paren@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-29-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-29-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -158,6 +159,43 @@ (define-public tree-sitter-cli
> + '(begin
> + ;; Remove the runtime library code and dynamically lin=
k to
> + ;; it instead.
> + (delete-file-recursively "src")
> + (delete-file "binding_rust/build.rs")
> + (with-output-to-file "binding_rust/build.rs"
> + (lambda _
> + (format #t "fn main() {~@
> + println!(\"cargo:rustc-link-lib=3Dtree-sit=
ter\");~@
> + }~%")))
> + #t))))
Maybe you should actually extract *this* snippet, as you also use
it with tree-sitter-cli?
> + (arguments
> + `(#:cargo-inputs
> + (("rust-cc" ,rust-cc-1)
> + ("rust-lazy-static" ,rust-lazy-static-1)
> + ("rust-regex" ,rust-regex-1))))
(list ...) please.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:09:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:09:44 2022
Received: from localhost ([127.0.0.1]:33258 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySqG-0003U4-AE
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:44 -0500
Received: from knopi.disroot.org ([178.21.23.139]:47780)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySqE-0003Tw-Sj
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:43 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 1BB954150F;
Fri, 25 Nov 2022 08:09:42 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id eq02VKTDSzmD; Fri, 25 Nov 2022 08:09:41 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360180; bh=dX8yRZg2N/ryCz48yD/aQqUVfdvweabpONgxEG7D1ew=;
h=Date:From:To:Subject:References:In-Reply-To:From;
b=EMB0LO4Y2ua7YF5NphoFbUBzl+dOJ07Ymq2+ejsMQ/obEadLptNTbrzYG4yogUvqD
aoYsOOh+SZZrd/mfWqJB48v06kIWn5yRfnu6ZKD1TWqUzj8sF+ytBLAnbuok6c7D+8
vJGNl6S8ZIloG6ZRlfK0Iza68qK/1xc5UivqiW8c0T3Zk4coYLQeiWx6ocQNbgR6Dm
6k+vQqSL7YB4w1XWJuV8mKIX2e3AmeGmxnmN+uWTOe0FJjuFwI255Wfe/NtutpQ6h9
ZRkCvwje2LM7P6aKEJc2KX+0N2M6hhw7C8URfCVe8Kv4Rwonc84LQXy/jmsO1y5iM8
CE4tZMlsbv1cQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:09:40 +0000
Message-Id: <COL6SNQUAS2E.18M018RM5VUA8@guix-framework>
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 27/32] gnu: Add tree-sitter-typescript.
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-28-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-28-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -648,3 +648,41 @@ (define-public tree-sitter-rust
> + (arguments
> + (list
> + #:grammar-directories '("typescript" "tsx")))
Superfluous newline.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:09:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:09:14 2022
Received: from localhost ([127.0.0.1]:33255 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySpm-0003TI-2p
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:14 -0500
Received: from knopi.disroot.org ([178.21.23.139]:42878)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySpk-0003TA-1B
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:12 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 62F8041500;
Fri, 25 Nov 2022 08:09:11 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id QrGqpdEggKid; Fri, 25 Nov 2022 08:09:10 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360150; bh=h93JVjY4z4qnjz2nCkOTEyeDSBGecNBJXw+hA3kSOYo=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=fFTiYTK8N6Pof41y9ep0vRNr6qNIgFC5lDwMmG5NusUajcPzuQZ+c/qJaff4TxLEY
dQIsGR25jGh3F1/HZjNeKWOmQAq1WF6nhQ150e2+/SKNMeqWccjXMFnZK0q1NVWKNr
KtZ8HR9P0JriY5eYDH9T0Ti+0lsHSHZl7+wSZpQRh9uQ57VsKvvMSY0/P8J3AwQxLg
Cz6WSn4LHTN512Ix/YrfviNrQbQQ45ayrkFjj+lAANlOKohQu74groAqF3kO9EZqnK
qTtWtsrwYejaWGcjljZQJJAVGeHD6gYEEVUJkKujVXmy53YVwEBpkVSt/hRO1H/GdO
tTbkROS20G6Iw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:09:09 +0000
Message-Id: <COL6S9S91M82.1N4LWJOM9LOJL@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 26/32] gnu: Add tree-sitter-rust.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-27-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-27-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:09:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:09:06 2022
Received: from localhost ([127.0.0.1]:33251 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySpd-0003Sx-R3
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:06 -0500
Received: from knopi.disroot.org ([178.21.23.139]:41712)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySpb-0003Sm-PI
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:09:04 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 33A76414EA;
Fri, 25 Nov 2022 08:09:03 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id cnvAXhXLdJUe; Fri, 25 Nov 2022 08:09:02 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360142; bh=byy/XcQp1mkrxpIPldh6BYc23/8nd35a20/Je5ceVA4=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Z9S1a/D59Jx/Hm1QynETbEg3U+6B6I278m5S03te2UsDiigZCaQ8SRvEVXJDYnGG7
6swnCMLuFpAeT+mBlScA6ciEc4MTVFHqKq7wVBmjmdwKFULzszSB3Th2T7voVZa2xG
qAav6aaw+A6EXUPFUXf1kZuKs/+UsxqSUuqswkcSi1U62B2SxACWpoglzDu8nDIicw
MC/MhwPaVOEg3O3izZ0rTx3/ms+E7PiACxCNx8+IvurFTHd5HyyMCCpm9Wrxrt4umV
hpy0CcGz6A5469b/oN7vLbK6pcLMwOs2+lBDQskDXwBEzn1c0wxm+bA/jga8u6m/SC
yAxjCf3hQz9nw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:09:01 +0000
Message-Id: <COL6S5TGCMKE.QS0IEBWIQVKX@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 25/32] gnu: Add tree-sitter-ruby.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-26-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-26-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:08:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:08:46 2022
Received: from localhost ([127.0.0.1]:33246 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySpK-0003Rt-J8
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:08:46 -0500
Received: from knopi.disroot.org ([178.21.23.139]:38716)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySpI-0003Rm-8P
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:08:44 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id AB2104150C;
Fri, 25 Nov 2022 08:08:43 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id AC2_zCzpKt2X; Fri, 25 Nov 2022 08:08:42 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360122; bh=Y5o2HxL1MAjBu+vVek6hR4pyMWKvx0ZipOku5Ml7Qbs=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=ffg6EFVDDFNF9bbM87JL7JKPFz+aftvMgiWmrPLPuYijGHLllte11FYGaYOezdsXh
AVibrqRMLCwp5/hkzR4EY04LVasL2bSjeywlcomYo1kTEmVhmH2uQoCxLMXY4J8uJg
zDCYfbT130Sw015EVXBuCUL7vwBMP+55JDX6myNrrinxta0gK5/9HVOFtiIFh+wHyD
RR20q8YDb4FY6GHCJuEJPF9JBEGEsVjxN6Lj3PFWCzV+deXX/mW3QnQt+RVF6UQzJD
Sc95BF6wfF18mnOkjD+F6Vy5rRU4tq0/yCDTDhxbAW3N5H+d7XW8Q4t67V0IDGUpEf
6+rn0vmcT2bRA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:08:42 +0000
Message-Id: <COL6RWZ609J5.122QNFSCWHFGD@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 24/32] gnu: Add tree-sitter-r.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-25-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-25-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-r): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -580,3 +580,27 @@ (define-public tree-sitter-python
> +(define-public tree-sitter-r
> + (let ((commit "80efda55672d1293aa738f956c7ae384ecdc31b4")
> + (revision "1"))
Explain and start at 0.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:08:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:08:28 2022
Received: from localhost ([127.0.0.1]:33243 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySp2-0003RO-8Z
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:08:28 -0500
Received: from knopi.disroot.org ([178.21.23.139]:35328)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySp0-0003RF-G4
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:08:27 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id C9B0241500;
Fri, 25 Nov 2022 08:08:25 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 6W16JlkaRkxx; Fri, 25 Nov 2022 08:08:24 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360104; bh=NFaTu0dHiEe3Zfwz6b9zd8gxTTut8GGwTb9VPp7a/qg=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Xu0NgYvTK5YYcUVAcJ2q1l4EDCFxvHDarkYg7opB+IQx0nGTJMfqnaAPhc0CS2zvy
/RukDPmkCoBWjjs1gzH00ApWXWsBpsOv2RCRKoc0HItGf1Chd11SvidBp6Jyx3N0iF
RZqTwuVN1aEuZrnaoi9OKqOXeOj530GpgJceOG5Y3zJKSeDYPqq8p6In8AJCKw3fP1
4gV2/5Jmeq50kcZLjA6z2qIEkkpu8fLjYYE+IQm5W3fJaInUR5xXqKWZeBPMtSyjjL
dGl5JPQXH1iTeRMh4SrloxrZTgI2En3+tfRo8BluaVWafCnwawE35s9SoCfWcVY03B
y87Nr2Mrwe7WA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:08:23 +0000
Message-Id: <COL6ROOMWQ35.22SZGJDYHW47Y@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 23/32] gnu: Add tree-sitter-python.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-24-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-24-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -556,3 +556,27 @@ (define-public tree-sitter-php
> + (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42")
> + (revision "1"))
Explain and start at 0.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:07:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:07:57 2022
Received: from localhost ([127.0.0.1]:33238 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySoW-0003QA-VO
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:07:57 -0500
Received: from knopi.disroot.org ([178.21.23.139]:57480)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySoV-0003Q2-Ip
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:07:55 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id E9A5D4150B;
Fri, 25 Nov 2022 08:07:54 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 9QF4SgB3F4JE; Fri, 25 Nov 2022 08:07:53 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360073; bh=LHS26orWa5wADoC6uhAhU9OgWWCMR8Uz0d0ggyHNyV4=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=MuPxOsDaHZ7Mwk0qbWWAob8GoZof2JlmHxZelEcS4bbA93vBiaWWSaBrL+fGjLcPq
X575xYlb4SIRtmlK3gmxur+xB7C1wBlWXK4JBr2/cR8CV4ZjYLx7GJl+zKtTaFwW6f
CD5d5MPpISN4ixyJ0xfuP4p/R1uPsbKOLYXORjBk0+VGdvDQJllBb1745GDC+KbymI
1Dnzq0cfikZlD97ZlnpDpylCTH0xv6IyQT0KJg2wFZ+LrF3sxqKiXUZEp4cpL40Lv5
dWPdx/JwSWhnw6L60YJNAKGNyyMMD9ZDgbIjwowOC9su3J11NxX3iDnimRIeHt65x1
SDl5uBTfKi7tQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:07:53 +0000
Message-Id: <COL6RAJJ9QZT.1TTCX9K3FMFH5@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 22/32] gnu: Add tree-sitter-php.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-23-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-23-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -526,3 +526,33 @@ (define-public tree-sitter-ocaml
> + (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
> + (revision "1"))
Explain and start at 0.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:07:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:07:29 2022
Received: from localhost ([127.0.0.1]:33235 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySo5-0003PT-Ko
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:07:29 -0500
Received: from knopi.disroot.org ([178.21.23.139]:53242)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySo4-0003PL-0T
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:07:28 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 674454150B;
Fri, 25 Nov 2022 08:07:27 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 9PqDWQ8Jxle3; Fri, 25 Nov 2022 08:07:26 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669360046; bh=019l2wYPSHQOoAfx9tnuUrqIRRhT+cZ0QhiXtVb9Fm4=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=ZSvmXPnPP8CSmkiN2UaU1y6jed3R9NqPzyLh0iqL8mJ967bQrcqL6I37zziAz8GMR
WXX1fH+MNsNUc0bOnjtUYo5pf1v/gROs2spnOyF7xkji1s7u+57FYkoLTAy+etPSEU
PfSTPsKFLwS8M309Nmi03p5zceUH4g6ADmH0ElydtIxuraa/R3kp+uX95GvtFRmDg3
lnJAJov85x1M9ARKiLMwcmrWqaKRGxLzKCWGIUQA7TngxAKtqZTYdwWX8VEEKmOaAw
dtRRKLfFYtHwP8nzU01uJnHfx4YEpIWVCglOkxRr2J2BbzdWAZSzWxTp31KI4imNWq
iIdpnCS3Kt+hw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:07:25 +0000
Message-Id: <COL6QXZI3TJJ.19HUXU5I3IQ2O@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 21/32] gnu: Add tree-sitter-ocaml.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-22-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-22-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -487,3 +487,42 @@ (define-public tree-sitter-julia
> + (let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192")
> + (revision "1"))
Explain and start at 0.
> + (delete-file "binding.gyp")
> + (delete-file-recursively "bindings")
> + (for-each
> + (lambda (lang)
> + (with-directory-excursion lang
> + (delete-file "src/grammar.json")
> + (delete-file "src/node-types.json")
> + (delete-file "src/parser.c")
> + (delete-file-recursively "src/tree_sitter")))
> + '("ocaml" "interface"))
This stuff should definitely be handled by the
tree-sitter-build-system...
> + (arguments
> + (list
> + #:grammar-directories '("ocaml" "interface")))
Unnecessary newline and use of a quoted list; please use
(list #:grammar-directories (list "ocaml" "interface"))
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:05:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:05:00 2022
Received: from localhost ([127.0.0.1]:33230 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySlg-0003LI-0Z
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:05:00 -0500
Received: from knopi.disroot.org ([178.21.23.139]:58692)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySle-0003LA-2N
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:04:58 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 6184441508;
Fri, 25 Nov 2022 08:04:57 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 33sUJMQnc-Q5; Fri, 25 Nov 2022 08:04:56 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359896; bh=OY/h0jUPHN6kxKFNrIssuZ75KEVXdQfPYxwnyp2aK2E=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=O3LJtVjzLoAwqmBVTg7/tO+I5bKlkXPnRNE3/yeoA+wWZE2YgJc9et4zf4OWavpRJ
0I/9VJD+qYSC4w2GBbunlD7gvyLazEG/kgsKPcybfuKPdN83qx2mwsJvVCb42JY4hI
ax/sfGEXxnMo/rMcjSeeuNAdtF9Xh+m0rkQOVzd2HPybmvEYQGP7GfGJTzAP30Zgoi
KUSqpUddjec/PPYy3MUv4ajihCqurGGgg6P7+PjZj3ICdnA6Ek4imquY2rbx5rUkl4
cbiLxxfFq2tG6TEb1Fxi0MPHT41z+8sJ6bvztNLOAepZ9Y3kVqlGvgFby4r9ozcj2N
hPccMmG7+qynQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:04:54 +0000
Message-Id: <COL6P0M0U6IZ.1TKXVR8D9Y4RF@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 15/32] gnu: Add tree-sitter-haskell.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-16-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-16-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-haskell): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -352,3 +352,27 @@ (define-public tree-sitter-go
> +(define-public tree-sitter-haskell
> + (let ((commit "e30bdfd53eb28c73f26a68b77d436fd2140af167")
> + (revision "1"))
Explanatory comment and start at revision 0.
> + (package
> + (name "tree-sitter-haskell")
^
Indentation is off; two spaces needed here...
> + (source (origin
> + (method git-fetch)
^
...and here.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:04:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:04:54 2022
Received: from localhost ([127.0.0.1]:33227 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySlZ-0003Kx-Pw
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:04:53 -0500
Received: from knopi.disroot.org ([178.21.23.139]:57406)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySlX-0003Kp-VI
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:04:52 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 4E5124150A;
Fri, 25 Nov 2022 08:04:51 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id QH3mICUwfI2g; Fri, 25 Nov 2022 08:04:50 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359890; bh=HojNOT/GwAmGsE3JBVA8cI0QWp2tlEIQcV1Frem9Its=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=BCMl3quYbcwdp1CQse2/WcYYGbOVzhppcMCfJDUPcebVEpOAgWhXGzZ6DdFrTaBtm
ivPPbqzFXezsbp209HIx7BPVrbDMseXd0ITC9pOS4NZ+MDK6KCQM6XhPVFx/CucLIJ
AmJEqfy5r8HsFXY3kghQN5htYmL3TYR/dsURZhxv2Zmz50zrwgFGlZWkAGw69jlmS1
augJsUenJIxi8ECUCVs7qnP7qlXLI4cEOnsYx8ipiHP8k9Z7Z6hPEj/B8DhO6zxQCp
DeqwzfoK3cbeFiIbN+BduHMNE17LHAqDf1jKxTYJr4cJ5qz7AcC4B16XkM+m6boOwe
ld9pC8VnSSDpQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:04:45 +0000
Message-Id: <COL6OWILLA7L.20EWC3SVZ3SFT@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 20/32] gnu: Add tree-sitter-julia.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-21-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-21-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:02:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:02:53 2022
Received: from localhost ([127.0.0.1]:33220 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySjd-0003He-Dd
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:53 -0500
Received: from knopi.disroot.org ([178.21.23.139]:35354)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySjb-0003HV-MV
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:52 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id F346741500;
Fri, 25 Nov 2022 08:02:50 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id b8BKKMBTip0E; Fri, 25 Nov 2022 08:02:49 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359769; bh=GyyPEVrPZPQW/85s3DI7SUGJAmVKBgZ6HXmE72XakVI=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Lk4AGzNMdNdme6iU81RgiJpY1WKCw7qy73+Ir1kmP3W3+FCnwXgXsK8e1XxcbTcAO
zl8dXb4VE9l+gyx6+h+kMd3wKXmPwW1i/1RMrVzY9ClC9qyOZqEN0unV0vpdV2EjYf
xbCdZUQHiXLsSyY1A0jTTQYnCWshVA1fyVpNlioomF8cTsJcvy+R90P2Z9C94Q7kjl
v2s+FSIxfuI12jR/pCqvmblOwgJ5t0JCx/VskKIwhmraG7MfQkVPjLyvbptJHE1uxm
9au+ScWqyW3w5lftRhXqmhKkgH7oXS6h5hVGIYqDT/KiKIpsuG8eIWk2s4hoPfAO6s
/Rgq4b7cqDprg==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:02:48 +0000
Message-Id: <COL6NEI5O9HZ.33P8V2BH3TAC0@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 19/32] gnu: Add tree-sitter-json.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-20-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-20-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:02:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:02:45 2022
Received: from localhost ([127.0.0.1]:33217 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySjV-0003HI-5v
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:45 -0500
Received: from knopi.disroot.org ([178.21.23.139]:33832)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySjU-0003HA-37
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:44 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 807C541500;
Fri, 25 Nov 2022 08:02:43 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id U7NCYIusy2MR; Fri, 25 Nov 2022 08:02:42 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359762; bh=cWFZOqMfkdBEtjciLua9Qnck4DinPs09OEqV+o+0cFI=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=WdBSypyIyd+zVHWRcB19mkBrUBgN+EPHv1QXLV4RfYTWwR9vXciZ1agOo3ne9lNxR
RXa2qC1OmQna809U4ZpmmM4FeprpNfH1m/FobbxSbmoFWEmzPDTQCUGPgpfSPq98AC
LGZe2VbBs/EEGZypYDYdx2ZUwatMCQCNcfxnlDHmgElPpS/eNd2n9kUz0bbt3NBpCh
5miIOaJ/dcD74wMcSrNGbbW4MSM/uThbTiuClFuO+Z/zwEEOpx3wD+EdwWxzjCJ/DQ
8UZ1B6r6Nexun/u4JgU1b3an0fksBoPZ57DJPq4Q3oIlXj/WhCvTfc1OT20WI3znml
nOVFiGY7uAiVQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:02:41 +0000
Message-Id: <COL6NBGJQZZK.IX1F03X1K6GK@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 18/32] gnu: Add tree-sitter-javascript.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-19-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-19-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:02:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:02:38 2022
Received: from localhost ([127.0.0.1]:33214 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySjN-0003Gv-Tj
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:38 -0500
Received: from knopi.disroot.org ([178.21.23.139]:60778)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySjM-0003Gn-5t
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:36 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 9B277414FF;
Fri, 25 Nov 2022 08:02:35 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id XiLOcoF92DBs; Fri, 25 Nov 2022 08:02:34 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359754; bh=M/136i9ivsh6p3feyB8jO71cTASBTSo/0buS3+mwWdU=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=i2ywIcLk264yPk4ZVjL7GpHQN5deuAh0kLtI1GsQxHVKynn2Tdql1/LHfCnhJYs8s
70amom3w0jsiJCE4Ix1tJMi0AoxWEroHjcFZ+RLI7veku5Jy+Qi/wnubeK7/JEaaZq
XP026j67vv943QsyNevNnOe7hMT+RbLHWkX7w/IDdDtP320fwr1xjmldn6pnXzX9UN
IcsJdPNzOmOjMWfkgB7s+pIcDlXNbp5pSxEseTFCO7LdtJTn062TR0cHA1LWDNEhqN
/pNNujocAd4VLHng89f71nK/T63HSQyVTP284ajsLOm/npzu5RI2LOoATn8FL3+aAi
NugZLds27kiFg==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:02:34 +0000
Message-Id: <COL6N7Y16N9G.18T87BEDTCKBG@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 17/32] gnu: Add tree-sitter-java.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-18-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-18-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:02:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:02:23 2022
Received: from localhost ([127.0.0.1]:33211 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySj9-0003GU-Li
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:23 -0500
Received: from knopi.disroot.org ([178.21.23.139]:58396)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySj8-0003GN-DN
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:02:22 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id E7DD141503;
Fri, 25 Nov 2022 08:02:21 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id IdWFQOwZvUXQ; Fri, 25 Nov 2022 08:02:20 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359740; bh=+WyUUXUqDwI5ND2ucfZpoLhtaysMf1WNBvnah1CcOUQ=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Uu9sw5i2QJ6U3CdQi45TpYIyjmxdSsKJhyfkvyKWbZbA508KP6nzV7aws3K8dkM/x
WY8Tb1hh2nUgOM805zu71WKhUC4I7g2UrIWJjmrGUAgyhB1SnwUZpIhl1LiBVirFNp
Qu6qbiVb5f0pOnsX/Y1LmZu56q89LUAAUGXAOQ592aZsj83I88jfj8o6VUr7FvML5x
1k4CHiunnWLusWsghv6iYkYXg/sLa/xN0viBRkkc73X+HGZjc2IwIrKnyO3Lfe1WXe
iKlkiEMX1llUhLAqsKP6qk4viDoQkHHc+7aCIpi4hGtFqNauBWDU0wZiL4luKO66Ec
KgzoeIAPA6y+Q==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:02:20 +0000
Message-Id: <COL6N1MTB927.2SKCFOCU086DY@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 16/32] gnu: Add tree-sitter-html.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-17-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-17-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:01:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:01:19 2022
Received: from localhost ([127.0.0.1]:33207 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySi7-0003Eq-AI
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:01:19 -0500
Received: from knopi.disroot.org ([178.21.23.139]:45752)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySi5-0003Ei-3m
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:01:17 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 8D0B741507;
Fri, 25 Nov 2022 08:01:16 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id vMnaykS0mDhp; Fri, 25 Nov 2022 08:01:15 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359675; bh=+Bgc9F/1SxvkHZ8d55A4MUChgshHNZS25jOeVx8+3GY=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=C6FidGtvn93ebir0SfjlKL+EQw1jbPjpkwcPY6u7rxKRA+Q9aHnBlfry6zSI1U8zN
XQJd2QanIKKlo52UziezBm8J5bq6D+J67tKagwx21ACOcQ4MR9eavCkMCC5MCI3TXv
pFNet45jjHh5CjNM5+JZF7DIVb7NXp+y0vv9A4SClTGVACLia7BO/GgrUJQS+gcyHh
HhvBk8tjCdjyj9qTX6TCx9Kefa1aFQZ1Qi6xOVtMwf5TsKQ1q/sIOuQwL/vl2l0xTr
dEEmo76TDgzurQr/ySzSEEIdDQQG3yMbL7W59zlrBDt0Vf1Y+40PlIR7Y4Pt8EdrEe
PhLuiL7SAJxvA==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:01:13 +0000
Message-Id: <COL6M6ZM2W4G.1W3E85IW5NLX4@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 08/32] gnu: Add tree-sitter-cpp.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-9-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-9-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -189,3 +189,28 @@ (define-public tree-sitter-c
> +(define-public tree-sitter-cpp
> + (let ((commit "5ead1e26c6ab71919db0f1880c46a278a93bc5ea")
> + (revision "1"))
Please an an explanation of why you're using a commit, and start
at revision "0".
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:00:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:00:30 2022
Received: from localhost ([127.0.0.1]:33202 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyShK-0003DD-2T
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:00:30 -0500
Received: from knopi.disroot.org ([178.21.23.139]:36554)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oyShI-0003D5-9a
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:00:28 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id AECFB41508;
Fri, 25 Nov 2022 08:00:27 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id IfytYlxe7wuP; Fri, 25 Nov 2022 08:00:26 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359626; bh=tDqLOzDJYzrdaqDuJVjiqZGm+EQDc7GwYD5488eSlTQ=;
h=Date:To:Subject:From:References:In-Reply-To:From;
b=AnIwI1qcbTe1NpnE2pz9e/yr13U8iEbUGwHjlxZhAgYOp8Aw5uYy54MPPUPFkvLgy
TKxgM23E0d8M3JV4XShOarzT8MqkKhh8WKATpbDSR0dXaW3Y5S+W1PSIoWe4EIvzqW
DVHoexqAZlF99HNv8jo9qlXaVd7vMD8/9BAz5rUdiQ1BxncuHn7cP7nTUyoRVnfg4F
fbuRA1jtcSw0btpaJPTK7Qf15k5jz/MxBRZ7ecOO8x35oHGL1kpajBIqgLDVJQP+bj
nJVwvEp96HSQgfsLQlPFTDA2Uy33ZiFNGDQKlvAT2HLp7wR4c7U5ZdWN0OF35Bj2N/
GmJXGQiO1cWnQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:00:25 +0000
Message-Id: <COL6LL2R2LQ8.8RBHP6L94GEX@guix-framework>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 08/32] gnu: Add tree-sitter-cpp.
From: "(" <paren@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-9-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-9-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable.
LGTM (apart from nonexistant tree-sitter-build-system :))
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:00:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 02:00:13 2022
Received: from localhost ([127.0.0.1]:33199 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySh2-0003Ci-On
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:00:13 -0500
Received: from knopi.disroot.org ([178.21.23.139]:33582)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySh0-0003CX-Pa
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 02:00:11 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 1BB0841358;
Fri, 25 Nov 2022 08:00:10 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id kvAy2_MIsl35; Fri, 25 Nov 2022 08:00:09 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359608; bh=dzPo9HpheH1jbFhCnfD3MLcdQ8Tybw+l5IE8x++uYOM=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=aLOPLHPQr72tTm6zWNeQ4rZ7YxkDGvJ/jZzOWMAnSxXr/Cz45OL2t+ny68xsTX6m3
Z+6boRbe35u7/zRYZnkirNop2lfQLT9DE7KwypSEu1HGwDOK5W9NIr8GQsx1KcAFnB
Oi4jSGwhhDszKCgPhHu/KyFSXuYu5T4iDNhAVt045DWMVELJwwPsZOTcvMPrLhrWbu
/fpNvI9Xja/scBWjgveT0jkaCyq0LyYpmlcx5fwiGDuhBTaqV2X703vPxMGAvHwChY
MhrUHrvXSFzE2UUV72Zn5+7K4dYwqAUVLz2fFajtJb65VfECJniamgBnxZUmwmAprl
Qq4VF12S4ZFVQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 07:00:08 +0000
Message-Id: <COL6LCX5PGKK.1CK3ULF8Z3V0B@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 14/32] gnu: Add tree-sitter-go.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-15-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-15-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-go): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -328,3 +328,27 @@ (define-public tree-sitter-elm
> +(define-public tree-sitter-go
> + (let ((commit "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611")
> + (revision "1"))
Why are you using a commit? Please add an explanatory comment. And
start at (revision "0") :)
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:59:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:59:18 2022
Received: from localhost ([127.0.0.1]:33194 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySgA-00039M-FP
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:59:18 -0500
Received: from knopi.disroot.org ([178.21.23.139]:52826)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySg9-00039F-6P
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:59:17 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 9BBF041503;
Fri, 25 Nov 2022 07:59:16 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id zPMEsgwIbSo2; Fri, 25 Nov 2022 07:59:15 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359555; bh=8z/BbKcz0lXw09dQsHrtGTSVFtU3p73VIz2ohK9/LN8=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Fek/PlLQ1qoVtgMTIcAaf3wMzQXiIBniZKgdQhoe+c7ca5IaeYvLV1mBTyU0mTK0x
9Gw/04TG7oIsyuPuWjyhaZjFn12MdXxhXsi1GqA4Vbd0YEVQmOQfAGkQhf2TBx8aBI
Q3hsG5O3KpOiC+70n0eLkMnspj6faVopN7Fq0UcCWxlPSyMuL6QLW9BTQmLAQsQ+XB
g+7BiWzzLYetwvyE2TtYUpkkG/RoEXlXztVqksUmPK8zlJysTcpCphBUV7De8HTRts
linePm8lqtDAFn55ORF9okmVXnVpclj+7cTbNTmXKv5OJQtoQpdULTHbfttVyLrmo1
JWyPxwMkTaK2w==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:59:15 +0000
Message-Id: <COL6KOI38RNL.39NAY37EOGJ7Y@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 13/32] gnu: Add tree-sitter-elm.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-14-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-14-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:59:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:59:08 2022
Received: from localhost ([127.0.0.1]:33191 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySg0-00038z-62
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:59:08 -0500
Received: from knopi.disroot.org ([178.21.23.139]:51184)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySfy-00038r-92
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:59:06 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id AD54B41501;
Fri, 25 Nov 2022 07:59:05 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id BWUJaaj9zoRk; Fri, 25 Nov 2022 07:59:04 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359544; bh=J8O4rs9g6ZLj/kEecZm8nxZdzQGnPRti+mP/NI2WPaM=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=TKFLjd2mJZIfkA0J+8ZtwpQCRyDcn8lNDVt8HKKgMHyWKAwg/fKttP8TFGsBanVho
aIjSB1KtOGMqNTuWClRan8XHX1LdE1C2k5ZGkWWOxT+lF3263VtwEQm0npGO1aTZEi
V1I8+1LAszcLvBWiV8IISufgvMWgN9ADI4TmNiPYmN2CwabC50/IVkNmpsBnSXjhJn
y8jWxtsZO9zpBWuk2Ifcj67OhyubMgIZgrxA4VmeKR1GT1JejS7QTVb4pDJ1dVe5r0
6S9sWXQF4sFeffkh0KlZED1HUlX+12lDmUxwlvPdqYP5L22fZP0IJzqPKCtnpJqva8
BZgM0eOwRcUkQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:59:03 +0000
Message-Id: <COL6KJCJPJ3Y.167VZEQ8HHEGH@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 12/32] gnu: Add tree-sitter-elixir.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-13-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-13-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:58:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:58:56 2022
Received: from localhost ([127.0.0.1]:33183 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySfn-00037Z-Up
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:56 -0500
Received: from knopi.disroot.org ([178.21.23.139]:49464)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySfn-00037S-2F
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:55 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 4F57A414FF;
Fri, 25 Nov 2022 07:58:54 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id Jafg4MQBX0iy; Fri, 25 Nov 2022 07:58:53 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359533; bh=faYYRLcbyDtY58MZtxdoo/Tc0QBG2uNuFGmexAuMw9U=;
h=Date:To:Subject:From:References:In-Reply-To:From;
b=DYuFEIPlcsrlWA+MiksQ5JIpf0O1uPzUW9e1zVjj1UZi8eHSY87ZwCcZZXh0o+BsQ
n1+iUVSd88d/KAT924QQhSCP9jEqKYAjn7lGYa/bYl+tTcdVYcOUqMNLWCsCP4WZht
O71pN1erk5oewPKCsO140XhaQZLFVLWRLGSEVseyRyDZ/POKiqQzAFe6AIgQZNu6KD
lQYFrtOchbZIe9MpnTsPoxDd9WNiE0iSbi8uDkKM8oqfML8CE7mt0HQu0p9AgP/V0g
XeWCnXqVHgWf2jNmPt10qSFYGD7aMlX5JunKu7R2SFXhw5YaldfIt0t0n3OckR1ZP3
gUEFkwNXtkS2w==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:58:51 +0000
Message-Id: <COL6KDWOORD2.2T5IY9GY8JW2S@guix-framework>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 11/32] gnu: Add tree-sitter-c-sharp.
From: "(" <paren@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-12-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-12-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:58:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:58:44 2022
Received: from localhost ([127.0.0.1]:33176 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySfc-00036y-FD
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:44 -0500
Received: from knopi.disroot.org ([178.21.23.139]:47570)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySfa-00036q-Rk
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:43 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 3269B414FC;
Fri, 25 Nov 2022 07:58:42 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 8EuH-If_981b; Fri, 25 Nov 2022 07:58:41 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359521; bh=+U6f7/wADogoBK4cJYpFSM8+O5JNOkFDWFluBYF0xCQ=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=YZj1E4h1bert8QF8dboTgg7AlUAUGntyFM4Z7iw2YR/WUSVtAJEI0a8nt4EqSvYcD
2NcqevpWQh+mN26wReWTonojj9iQY5kbkPgxJ8MLDeXGvUj9V6knFWtBrBTDMp53PJ
NHvT/CITJkLhfY2TM/R8Qlq18ff98sFXR7VwNqcvhkXIAp8hYp2ZAMkHj8tVu/Rglq
6prldF/5+e+8Co6lKcTOUGNIFv5WUUcu0cEMLVG0ESNnkKQliQWinvEhlwdoNSQoen
tO8CiG6bEhYPT3AYtBOKS5g3P/Dk4Q5wgvD261/YspMz3WjedTVxizXofo4Fhb0BHH
OPQXgyvtJh3Kw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:58:40 +0000
Message-Id: <COL6K8LDG2KW.VERV7ZKKQ9QD@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 10/32] gnu: Add tree-sitter-css.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-11-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-11-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-css): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:58:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:58:37 2022
Received: from localhost ([127.0.0.1]:33173 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySfV-00036c-7A
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:37 -0500
Received: from knopi.disroot.org ([178.21.23.139]:46302)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySfT-00036U-4Y
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:58:35 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 78472414FC;
Fri, 25 Nov 2022 07:58:34 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id F7iqtW4NajCw; Fri, 25 Nov 2022 07:58:33 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359513; bh=KNCTMKWzaLUYISedAJqCQDl2Ueqj6ngwmaiUpZQqQ2c=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=CPmEciCcHXy3CTrqhgn8uDvCY+2p9B/G0xWxKnJDty3qbJ75//R+1qzEE69jwgERb
wbpIEDUnkKjBx0cNSLcyo8gch/nIFPih01hH9n3vZHjBpNqmRvvt4rhEeD6xKzE50B
6f7sTm453I3eFYz0usPwTyjOQW+n4KTgzbQaf/vIRqc+Wo4HrGOEsThIIEG9E8uYCf
Of8nDrEgYqeYdTMRBA/c+wID2yNWEOLnIl45IDhUk3scbjQxyVg3fDzWA3hAzD2rNS
5BAhmMSKmmNRr1db+QSoAGrOTNI5Bt0DTGQYBFYEKuFwYZB/AtRmxLOV6eGvjXC8N9
nALR4AGuglZ3w==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:58:32 +0000
Message-Id: <COL6K5427TVS.1FBJASUHZ4H64@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 09/32] gnu: Add tree-sitter-bash.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-10-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-10-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable.
LGTM
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:57:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:57:54 2022
Received: from localhost ([127.0.0.1]:33169 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySen-00035E-Rq
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:57:54 -0500
Received: from knopi.disroot.org ([178.21.23.139]:38840)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySem-000356-0X
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:57:52 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 47C4D414FB;
Fri, 25 Nov 2022 07:57:51 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id k3V6f4NxZAuY; Fri, 25 Nov 2022 07:57:50 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359470; bh=6S/8SqwcSTMd6kFHG3PNI3M3vSv7UsNciju8OKlerbg=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=Q+5AMc2F24QyXGDlOXYxtO3HKOkR4z313/VbEcew2CVDJ1mBnsPfcfygD5nonBo8q
okjrWJghVHyrl5wBxwEBortyYBVhoiFmtTFnOpx6lP1dib0r8xu896VtFc1rI7sVup
XVYNYbRhCGhDbuIzXbgZCMfcW1lWhnp9oyBUsLXfAo8hZ1PyeYajAohh2qLYBZOh+P
PxRmvj4SplivJNyH4jLr50Jz+LPqAipG0Nd/e69PYLFykKFzPhtkRmzzYNRZ2zdB29
Zda9u17UiWm7zXeTsbCztpiPQ/P79JavWMk6SoErDMCF4QFLoqrPZpNjCNU3+9Uc7b
jKxU6oR7vw0yg==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:57:48 +0000
Message-Id: <COL6JKW2WS5K.39NSGAIFEVXDQ@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 07/32] gnu: Add tree-sitter-c.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-8-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-8-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> +(define tree-sitter-delete-generated-files
> + '(begin
> + (delete-file "binding.gyp")
> + (delete-file-recursively "bindings")
> + (delete-file "src/grammar.json")
> + (delete-file "src/node-types.json")
> + (delete-file "src/parser.c")
> + (delete-file-recursively "src/tree_sitter")
> + #t))
Aah, I just realised that the other grammars use this... My point
about incorporating it into tree-sitter-build-system still stands,
though.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:56:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:56:36 2022
Received: from localhost ([127.0.0.1]:33165 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySdY-00033M-Dl
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:56:36 -0500
Received: from knopi.disroot.org ([178.21.23.139]:54378)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySdX-00033E-3K
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:56:35 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 6D763414FD;
Fri, 25 Nov 2022 07:56:34 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id FwEhQtBkkj02; Fri, 25 Nov 2022 07:56:33 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359393; bh=ShDCS7xFFRd4WcjZuOHlwrBPqDIfruE9pU5HHGCWogY=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=lhuYBOQq3qKSLY0s6KHgQc22CPRZkDsGiu51yoE1AdDZT76aVcW5TzHOdIKXlTcat
iIBflHHzV6due7laF2z0JFSI+OKsiIwpeD7gF+ilRffJ85N8vD+arahb+/Hr377Wsr
N9bYS+Pxee4jh9u4IWwr0Jq/aD9QrRbZr76PB+Zli9sv88Y4WcbL2LSYVVjnY/EV5f
LmhM6v+Pnc9RETDQFcAELDOxGYsse/dv6CXWBDN4qSI1h3FcxLEE6Yr9mq3lC8wg2T
4HN1+IZdmnjWceDSNmPcOLHgflnma12pgsXTNieReWLheheP/naOiv6Nss7yLkslYs
XV9cabMkfPexg==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:56:32 +0000
Message-Id: <COL6ILV9JKI8.1W8VPFQS1VK68@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 07/32] gnu: Add tree-sitter-c.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-8-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-8-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-c): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -156,3 +157,35 @@ (define-public tree-sitter-cli
> This package includes the @command{tree-sitter} command-line tool.")
> (license license:expat)))
> +
> +(define tree-sitter-delete-generated-files
> + '(begin
> + (delete-file "binding.gyp")
> + (delete-file-recursively "bindings")
> + (delete-file "src/grammar.json")
> + (delete-file "src/node-types.json")
> + (delete-file "src/parser.c")
> + (delete-file-recursively "src/tree_sitter")
> + #t))
No need to outline this; just do
(snippet
#~(begin
(for-each delete-file
(list "binding.gyp"
"src/grammar.json"
"src/node-types.json"
"src/parser.c"))
(for-each delete-file-recursively
(list "bindings"
"src/tree_sitter"))))
Shouldn't some of this deletion (namely, that of pregenerated files)
be handled by tree-sitter, though?
> + (build-system tree-sitter-build-system)
...I think you may have forgotten to send the patches for the
tree-sitter-build-system?
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:53:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:53:05 2022
Received: from localhost ([127.0.0.1]:33161 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySa8-0002yP-P5
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:53:05 -0500
Received: from knopi.disroot.org ([178.21.23.139]:47060)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySa7-0002yI-Lg
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:53:04 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id F16074140F;
Fri, 25 Nov 2022 07:53:02 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with UTF8SMTP id kFDDUeYk1-VL; Fri, 25 Nov 2022 07:53:01 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669359181; bh=KMiHfwq8joCUkP4qQ9Aqwsfy98axxj3CyO39F2wVSSo=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=dSskhdaqSfEN6HoKpaurxbkDFugP8UA/nsdYMThj4GP1yoD3u8BOWQ3Rs/pI3xPSR
2qodYWJHOvggQtiwioW4M4o64W2vYgh+AOT9AgJgoG1K+AfjSj4LJkKMirtqDOtEbe
Lj45aPUm2PHhBobEQf3QnLtetu+ZPNh53+xD4YU4M4amj7tWG2ONgSlDdsz13dhZtS
4nbBGLRLgOCrTJLxB35dt6OFjyzNdqDbAJg2aGOuuEsrATp6XoNeP3Oz2qzShgjN37
8P5G8wshW1+oKrLzbZH5k9JWtWlfdhs5TN87TLlkA1PDQlOiMvzRpiOzLEsUaY1uxl
Gbn2cEcixQASw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:52:59 +0000
Message-Id: <COL6FVZHRLXS.3U96J8NTOCNUF@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-6-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-6-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable.
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -76,3 +79,80 @@ (define-public tree-sitter
> + (snippet
> + '(begin
Please use a gexp here.
> + (with-output-to-file "lib/binding_rust/build.rs"
> + (lambda _
> + (format #t "fn main() {~@
> + println!(\"cargo:rustc-link-lib=3Dtree-sit=
ter\");~@
> + }~%")))
> + #t))))
The #T is redundant.
> + (arguments
> + `(;; Running test requires downloading fixtures, see the
Please use LIST.
> + ;; script/fetch-fixtures script.
> + #:tests? #f
Couldn't we fetch the fixtures ourselves with a secondary origin,
like I did here? <https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packa=
ges/golang.scm#n10561>
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'delete-cargo.lock
> + (lambda _ (delete-file "Cargo.lock")))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (bin (string-append out "/bin"))
> + (lib (string-append out "/lib")))
> + (mkdir-p bin)
> + (install-file "target/release/tree-sitter" bin)))))))
Update this to modern Guix style, please:
#~(modify-phases %standard-phases
(add-after 'unpack 'delete-cargo-lock
(lambda _
(delete-file "Cargo.lock")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append #$output "/bin")))
(mkdir-p bin)
(install-file "target/release/tree-sitter" bin)))))
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:47:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:47:00 2022
Received: from localhost ([127.0.0.1]:33143 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySUG-0002mK-Am
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:47:00 -0500
Received: from knopi.disroot.org ([178.21.23.139]:41076)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySUE-0002mC-Ta
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:46:59 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 2BB2D414E4;
Fri, 25 Nov 2022 07:46:58 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id qEUghE1-blmj; Fri, 25 Nov 2022 07:46:56 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669358816; bh=q/Z73MTdDjFTwMXa7djnRv2Hk3yWljdwr9qJgo/mZwY=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=AryhzAD8k+XdinVfYZwqytV+QChZ2YDSdePBT7exrB5ID+ygSNcQlV6eKX+BRh3yT
Y7yhI1KMxDiPTnaJdC6DFrHtr/qsq+g6R1RfuyHLLY9f+hWpz3+mtKNyxLoKT7lGm+
GuUfNpV8Og4GtVpcgXaBYytuukfmHOlKXXZHlX7kSN5peH6gPhn+6gP+ATZfKC+qDC
Dy+4n8FdgPkn0JlG9R+/5NgY/2pCxBvRLo791y7vPwUieoH3MD1YWYAhd8PQGjg+z+
N5Nnct6Or3ynNWPI/mc1iQ0fhJw/bnqPtQ3+wVdYqWfy4KBf73wvxU7qHmLi5QoA09
CWgwp75LvEw+w==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:46:54 +0000
Message-Id: <COL6B8A04EFW.I934W877NW7Q@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 04/32] gnu: Add rust-smallbitvec-2.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-5-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-5-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable.
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -53163,6 +53163,28 @@ (define-public rust-sluice-0.5
> + `(#:cargo-development-inputs
> + (("rust-bit-vec" ,rust-bit-vec-0.4)
> + ("rust-rand" ,rust-rand-0.4))))
LIST here please.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:46:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:46:25 2022
Received: from localhost ([127.0.0.1]:33140 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySTg-0002lJ-Vw
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:46:25 -0500
Received: from knopi.disroot.org ([178.21.23.139]:34964)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySTf-0002lC-AQ
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:46:23 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 96069414E7;
Fri, 25 Nov 2022 07:46:22 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 5Ai6iGWXj3nG; Fri, 25 Nov 2022 07:46:21 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669358781; bh=IPuDpMh7sYVXSVX9QvejC4wWKuotWiM4O0biIKEmxWs=;
h=Date:From:To:Subject:References:In-Reply-To:From;
b=XQj5HV1RiPJunnEPlTzPJnFs6O6YSUKDM71aqumFoR7DvnXoT8sIHcyBuTLTjo7FC
Uo5L1rGJAfJe13U3kIC7nIfCLdlnzUzwzFo542wgpOOhxAzWHhdrTLhFBg0WgcGy7I
uV7UESoVWVJ9jzLcSd3YXuoXGEP+oSQ690Dyiy41pVFNbi53Vy70o5M7e/cV3ws6eM
MmthA8oVwzUGvgiq2ZegX/GGVPXlxSXS4Kv5E2qhLg76BiGaRMECfnoRLhEc/UnsYW
X6EcwTZkWv/3xWmq1/RnlG1psxzibenifTijLrQ9BFZwJ/kfk7jXF/MkB8XKV+Df96
kD4E6UasBB7dw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:46:20 +0000
Message-Id: <COL6ASRYMCZ0.OXMK8SI1PLMN@guix-framework>
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
Subject: Re: [bug#49946] [PATCH v7 03/32] gnu: Add rust-html-escape.
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-4-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-4-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/crates-io.scm (rust-html-escape): New variable.
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -25913,6 +25913,30 @@ (define-public rust-htmlescape-0.3
> + (arguments
> + `(#:cargo-inputs
> + (("rust-utf8-width" ,rust-utf8-width-0.1))
> + #:cargo-development-inputs
> + (("rust-bencher" ,rust-bencher-0.1))))
Please use LIST here:
(arguments
(list #:cargo-inputs
`(("rust-utf8-width" ,rust-utf8-width-0.1))
#:cargo-development-inputs
`(("rust-bencher" ,rust-bencher-0.1))))
=20
> + (description
> + "This package provides a library for encoding and escaping special
> +characters in HTML, decoding and unescaping HTML entities as well.")
This isn't quite a full, grammatical sentence (I guess it was lifted from
the crates.io page?) How about this?
(description
"This package provides a library for encoding special characters
as HTML entities and vice versa.")
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:39:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:39:50 2022
Received: from localhost ([127.0.0.1]:33131 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySNJ-0002b1-Vp
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:39:50 -0500
Received: from knopi.disroot.org ([178.21.23.139]:50090)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySNI-0002at-1Q
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:39:48 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 61C36414EB;
Fri, 25 Nov 2022 07:39:47 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id T2HOPFpmaWxc; Fri, 25 Nov 2022 07:39:46 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669358386; bh=Pp54VBS1qRI/3LRUfcLIfzH+h/IUF8OLJtJfewn79Xw=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=hHc1iHPINSfW75nJrI/mbVkSLrMcmSir8anp+xRUukanH4Yj6Rf8Gs1nOU3W3Y+Ip
xeenti6FLrb6lcGbvvhmzJUsw1JGETrwzzbfFsxGkwmU0p/axXAzNk9WRMa1So/Stp
qZTlYbttYQ4jaj31myDkC64HYazmmM1R0nafpsxpl4qF49bqpgsxyAjx9J5AEOcp6J
Id1FlXNhPROkA23sjz4lb2K3tcueabNLcoUaBNd7nmo541FoopK7qGcKuFcQq8llc4
O0DsE9/4Ewghg3B3uI1+4fS+yLITh0ZKlFWY8pbaKST1ngCbhBZNqp2WGNjalMqJ3u
0o3ccfj91LClg==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:39:45 +0000
Message-Id: <COL65R4MPFQL.1GKVBNB2W5KWQ@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-3-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-3-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.7.
LGTM, but maybe you could use this commit to make the stylistic
changes I suggested in the last reply.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 06:37:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 25 01:37:19 2022
Received: from localhost ([127.0.0.1]:33123 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oySKt-0002XK-3L
for submit <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:37:19 -0500
Received: from knopi.disroot.org ([178.21.23.139]:53714)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1oySKq-0002XA-Lr
for 49946 <at> debbugs.gnu.org; Fri, 25 Nov 2022 01:37:17 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 0FB99414E5;
Fri, 25 Nov 2022 07:37:15 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id GGo6zbib87sP; Fri, 25 Nov 2022 07:37:13 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1669358233; bh=ZkrRJY68T9MMzZUEKA/ahxjxFHqbQnKHlPM0aEWhQvc=;
h=Date:Subject:From:To:References:In-Reply-To:From;
b=JRlE/iha1tXbmP1IWE5/5umsIS1kIXQ+GhsqKqhQIsnVuGUf/zr1lEatqyLth1lxV
cXVXRr1mcW1OXNAFRHlePTFA74Fm/5rFi+no1xpKP567qxfE8I3dRHfXKCuFG8vfg/
jJkDF6Jq8F/Ul7icrNbSVAVOtKUQEeL/OUx8yXfwTmpFLFwA8Fjk5eCggoCe1syZmD
eHZ72vLmzWjrZDFdgavODd7SBXp2e9mqLo60po5xUn4WQkPeWWd7Q0JCh0mkZU/pl0
wbDmwBI0xJyrOCe5PN82n/rihQYH1RD0VLo1mlIonXUlkDfIQHAsQmDOiGUSLu1XgC
xnoKtg+Nh6Thw==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2022 06:37:13 +0000
Message-Id: <COL63T6V2GW7.38CF8YKKBV1FM@guix-framework>
Subject: Re: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own
module.
From: "(" <paren@HIDDEN>
To: "Pierre Langlois" <pierre.langlois@HIDDEN>, <49946 <at> debbugs.gnu.org>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
<20221125012142.22579-2-pierre.langlois@HIDDEN>
In-Reply-To: <20221125012142.22579-2-pierre.langlois@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Heya,
On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote:
> * gnu/packages/text-editors.scm (tree-sitter): Move to ...
> * gnu/packages/tree-sitter.scm: ... here, a new module.
> * gnu/packages/vim.scm: Use (gnu packages tree-sitter).
> * gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module.
> --- /dev/null
> +++ b/gnu/packages/tree-sitter.scm
> @@ -0,0 +1,78 @@
> +(define-module (gnu packages tree-sitter)
> + #:use-module (guix gexp)
> + #:use-module ((guix licenses) #:prefix license:)
> + #:use-module (guix build-system gnu)
> + #:use-module (guix git-download)
> + #:use-module (guix packages)
> + #:use-module (guix utils)
> + #:use-module (gnu packages icu4c))
Please sort these alphabetically.
> +(define-public tree-sitter
> + (package
> + (name "tree-sitter")
> + (version "0.20.6")
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/tree-sitter/tree-sitter")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
> + (modules '((guix build utils)))
> + (snippet '(begin
Please change it to use a gexp: ``(snippet #~(begin ...))''.
> + ;; Remove bundled ICU parts
> + (delete-file-recursively "lib/src/unicode")
> + #t))))
This #T is now unnecessary.
> + (arguments
> + (list #:phases
> + '(modify-phases %standard-phases
> + (delete 'configure))
Please use a gexp here, too.
> + #:make-flags
> + #~(list (string-append "PREFIX=3D"
> + #$output)
> + (string-append "CC=3D"
> + #$(cc-for-target)))))
Maybe modify the indentation here a little.
(string-append "PREFIX=3D" #$output)
(string-append "CC=3D" #$(cc-for-target))
> +
> +This package includes the @code{libtree-sitter} runtime library.
> +")
Please remove the newline at the end of the description.
-- (
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:38 2022
Received: from localhost ([127.0.0.1]:60929 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNVB-0000bq-JX
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:38 -0500
Received: from mout.gmx.net ([212.227.17.21]:53197)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV2-0000aM-L1
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:29 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MKKUp-1pKASX2f31-00LnrN; Fri, 25 Nov 2022 02:22:22 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 29/32] gnu: Add rust-tree-sitter-for-emacs.
Date: Fri, 25 Nov 2022 01:21:39 +0000
Message-Id: <20221125012142.22579-30-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:zBgujInTmLA9ug+YTlRRIQylsNSC9dZtPVBF5yjWvNK/3rfv9DT
R8Y70PZ+U2VALYTo8693E2PTsIxdzkHxlPSulwTVvRSMYSAG7o91p288cVCJutT4UGfuyFh
/q5zdRb5eECkYHJkwxo1iH+org3HEg/nVlAB2UGikiD4mTOUyF5tkI/g6khGrPU2WiVOa9f
kfx54rfao1Z6zl6Yg6t3Q==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:FrsdyuFZGp0=;/wkQBefdqTA7Z+tR/pcG6V3FQG9
ub5ufYD3gGna9dPjkHlg/k6UAH2H12YQhrottgAUrKbz/BDsWRxP3GcooM1uzEea++/ulxVnB
FDukqN+voIoZAcqGiVENQmaryk17+Qn1xwlvvClc7+RWlaMNvkX9XY5pEfBcRBZaJOzLOc/SF
mshOmjLA8O5ie/yjAtWYfPKO1E1pzzfl1+fTn48ndIN9KQQVQiSWh6x94jV9yVPrlvTfrL1Za
UPqIGvNhymngICvA8pXsPHIRwIMjM/qvoo3xuQYexhm+LsXLZkf8d+j07W/JMvlAWTWPkAIR9
DyyR3q19xXMbx9nzfLIturqoNtxDcc+KpwnIggt/1xutseXt3DqLS3QxV4lkMb3Wq/hjCNW4f
8ZCuUcbQxicUqajJytsQUhOuACcXYbY28NGCHCTvptnMdZwMxSVLvoGVLAGaMuiSuVBBkV8JC
+oa4OKvJSQ0/cpbSNvxKKDoJB3WOt3IxMHL9qLxNYWlczk97+9/+QPMFrzZtdkscvl9Sprv+p
TLrcObovbdrZqahXnQvIG1TZOtLANsUVNdjklF5bUfYmFdx5kEM+Y+ODqIDqssznHprUevOeN
MyJJJzRkke/SYYIO90/+KjByNGRqRWJSEY0E7lhY/GPtuXnHOozQbFqGIcn5k4MA762T04gZN
srUvBXW54SKMYj/Q/0EbDIGwu7toQe161P55WcwukdICSpnSlJv60g5OekZC73XrHqxha5HVQ
TmKCfLsNsYxmfLS4r3zPhgLDvP0WJKMZauvInxier2CLFMRqVpbFdBrVyBR1yR4PET5Ir2lRY
ZOaz4K0TmVNWtd2Lpk/5aue5TNnWujcrVZyCQ+68SX+cF64n84sPAiqwg6QfkzHWXVMJL2qm2
FmZOrtwLmF7DP8xlr9sDSIi2aScj0Z5q4uN4cg6lKbyKiuZ+TbVpKrXOw2MZyvEYGO0Hhk4a8
+fS5jbjQfgvN/ANJ43C1f9Ba3MU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter-for-emacs): New variable.
* gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
.../rust-tree-sitter-text-provider-fix.patch | 98 +++++++++++++++++++
gnu/packages/tree-sitter.scm | 14 +++
3 files changed, 113 insertions(+)
create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 7d11f4bb27..961d90bee9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1832,6 +1832,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
+ %D%/packages/patches/rust-tree-sitter-text-provider-fix.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \
%D%/packages/patches/sbc-fix-build-non-x86.patch \
%D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \
diff --git a/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
new file mode 100644
index 0000000000..215e7fc18b
--- /dev/null
+++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
@@ -0,0 +1,98 @@
+From e3576b180488b8231e1fc0ca130748577579d129 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tu=E1=BA=A5n-Anh=20Nguy=E1=BB=85n?= <ubolonton@HIDDEN>
+Date: Sun, 25 Jul 2021 13:11:52 +0700
+Subject: [PATCH] Allow TextProvider's iterators to generate owned text
+
+---
+ binding_rust/lib.rs | 33 ++++++++++++++++++---------------
+ 1 file changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs
+index e88a411c..cf214d92 100644
+--- a/binding_rust/lib.rs
++++ b/binding_rust/lib.rs
+@@ -5,6 +5,7 @@ mod util;
+ use std::os::unix::io::AsRawFd;
+
+ use std::{
++ borrow::Cow,
+ char, error,
+ ffi::CStr,
+ fmt, hash, iter,
+@@ -183,7 +184,8 @@ pub struct QueryCaptures<'a, 'tree: 'a, T: TextProvider<'a>> {
+ }
+
+ pub trait TextProvider<'a> {
+- type I: Iterator<Item = &'a [u8]> + 'a;
++ type I: Iterator<Item = Cow<'a, [u8]>>;
++
+ fn text(&mut self, node: Node) -> Self::I;
+ }
+
+@@ -1840,19 +1842,19 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ buffer2: &mut Vec<u8>,
+ text_provider: &mut impl TextProvider<'a>,
+ ) -> bool {
+- fn get_text<'a, 'b: 'a, I: Iterator<Item = &'b [u8]>>(
++ fn get_text<'a, 'b: 'a, I: Iterator<Item = Cow<'b, [u8]>>>(
+ buffer: &'a mut Vec<u8>,
+ mut chunks: I,
+- ) -> &'a [u8] {
+- let first_chunk = chunks.next().unwrap_or(&[]);
++ ) -> Cow<'a, [u8]> {
++ let first_chunk = chunks.next().unwrap_or(Cow::Owned(vec![0u8; 0]));
+ if let Some(next_chunk) = chunks.next() {
+ buffer.clear();
+- buffer.extend_from_slice(first_chunk);
+- buffer.extend_from_slice(next_chunk);
++ buffer.extend_from_slice(&first_chunk);
++ buffer.extend_from_slice(&next_chunk);
+ for chunk in chunks {
+- buffer.extend_from_slice(chunk);
++ buffer.extend_from_slice(&chunk);
+ }
+- buffer.as_slice()
++ Cow::Borrowed(buffer.as_slice())
+ } else {
+ first_chunk
+ }
+@@ -1888,7 +1890,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ match node {
+ Some(node) => {
+ let text = get_text(buffer1, text_provider.text(node));
+- r.is_match(text) == *is_positive
++ r.is_match(&text) == *is_positive
+ }
+ None => true,
+ }
+@@ -2002,23 +2004,24 @@ impl<'cursor, 'tree> fmt::Debug for QueryMatch<'cursor, 'tree> {
+ }
+ }
+
+-impl<'a, F, I> TextProvider<'a> for F
++impl<'a, F, I, T> TextProvider<'a> for F
+ where
+ F: FnMut(Node) -> I,
+- I: Iterator<Item = &'a [u8]> + 'a,
++ T: Into<Cow<'a, [u8]>>,
++ I: Iterator<Item = T>,
+ {
+- type I = I;
++ type I = iter::Map<I, fn(T) -> Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- (self)(node)
++ (self)(node).map(T::into)
+ }
+ }
+
+ impl<'a> TextProvider<'a> for &'a [u8] {
+- type I = iter::Once<&'a [u8]>;
++ type I = iter::Once<Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- iter::once(&self[node.byte_range()])
++ iter::once(Cow::Borrowed(&self[node.byte_range()]))
+ }
+ }
+
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ca92fccfd6..d0214f3a12 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
@@ -196,6 +197,19 @@ (define-public rust-tree-sitter
parsing library.")
(license license:expat)))
+;; We need to apply a patch in order to compile the rust bindings against the
+;; emacs tree-sitter module.
+;; See https://github.com/tree-sitter/tree-sitter/pull/1294
+(define-public rust-tree-sitter-for-emacs
+ (package (inherit rust-tree-sitter)
+ (source (origin
+ (inherit (package-source rust-tree-sitter))
+ (patches (search-patches
+ "rust-tree-sitter-text-provider-fix.patch"))))
+ ;; Do not show this package in the UI as it's only meant to be used for
+ ;; emacs's tree-sitter module.
+ (properties '((hidden? . #t)))))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:37 2022
Received: from localhost ([127.0.0.1]:60927 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNVB-0000bj-8U
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:37 -0500
Received: from mout.gmx.net ([212.227.17.22]:38689)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV2-0000aK-2x
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MvK0X-1ohG8t0F29-00rHap; Fri, 25 Nov 2022 02:22:22 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 27/32] gnu: Add tree-sitter-typescript.
Date: Fri, 25 Nov 2022 01:21:37 +0000
Message-Id: <20221125012142.22579-28-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:+Gipa/kwImVmKjue4qVtMbd25NS52f65C+QzfZDc94QomBJ1ElT
FXSwclFS4zmwzedR97g+qN8cIPAkzbukO0aPw2IM7H+UG9lHWk+hF7G5b2nFO+i13FSi2ao
Sq+si7i5nQFb0Jj82e2daRRNGjopQNud+Fn5paCAjpYZthbVWJz1t76ImRvOQtxN5b9LWAF
sB6xHx2e1BHhy5X0DvPJA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:H3iKbdBtrkc=;O0j9kN0Q6yN7da5di8yVcPijRTL
xMA2eF4WcpjZQkpkiZVfKzEY8GnKfXTO042d8D+pEcE1QpaiKYcv2F066wzLmy2B+aV7Up9zr
fAKKk8lg+7/5o9Atx5VfAW4xHwMygxVPsSQPk75ZEvDe2BmHrFC9VuiRtecpntuoJUzlX3PDo
8HQE5Z/TK4wQLT6OrY/tUN0IOuuyfwK++X21xJTgFug13HsbCJ3G0c401UOLQymqJRs6nIn+3
K6Gkuy+yZqu2Cpo7gd3IrCes6vhVPC8BxamMjQBS8Ptiy4LbOGX1W8AWJbYqIlliQ8sII89Yw
aBoiobDJmHALpb2Bt2mFqty58EGQk7j12l6TZ2tL1p1fLEE0fyxmTho0mpXlD70SBMev50kWD
Um2iG0c9XE7KyTlUsQPGJl/lcjKRE5sQz5M7Ef86wffQL/4oZE3xZCnkdmcSk4Dr6lXfTBXMa
gWhXqNs6AD2QWh8cRSW9MXTCk4PPsSfW0+whf/8T8oeNL43jWr2F3FN06XzguZLFiwVz5mqFc
B4tV3XYXehq+yoTBoW1GeSE5jVC/y9OV2LpSCC1wYtwXCr/toU8SPvuRPqPTmEy+6xYJV0Slr
RcUmt4IB8oR0Sg6Vy7U1lwslqgGIpT2qnbH4p/c3KW0z7bfqHciBdd2asF7WkmcEwE+LNtfqc
Uls0k18ZRRFYkun+PQVu9LM05G9mD4WFY+DVQOkac9ErXK0J7t+IceUNf9YrO7HA1pjAp4rch
ls358FS/6I6OsoxafC9LVsqQ9Bf8xgEq/NpUnpo4sDODCjyDdanl5a9T02KHYNZEPBziBjHwn
WCRy6N+wQkB5jFqdvJhUVaNBmOAq/CRyNFwrZ4wIOnG4FtdgGNEciFwcybrGL61Rdqu78qz6i
EmxEU8/UuHY4fpXLYdhkQ7uulm+06TS6x1WMaJcAG53iWRu2CdQpw06w03SguKsWveXZv2oKp
wUdRSR8f/zgbLcBWj1VV2NDd7EU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
---
gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 54f2affff2..7cf9a41105 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -648,3 +648,41 @@ (define-public tree-sitter-rust
(description
"This package provides a Rust grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-typescript
+ (package
+ (name "tree-sitter-typescript")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-typescript")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("typescript" "tsx"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (inputs (list tree-sitter-javascript))
+ (arguments
+ (list
+ #:grammar-directories '("typescript" "tsx")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-typescript")
+ (synopsis "Tree-sitter Typescript grammar")
+ (description
+ "This package provides Typescript and TSX grammars for the Tree-sitter
+library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:37 2022
Received: from localhost ([127.0.0.1]:60925 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNVA-0000bc-Sw
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:37 -0500
Received: from mout.gmx.net ([212.227.17.20]:51459)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV1-0000aJ-Pj
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1McH9Y-1oSby53ApY-00cdxK; Fri, 25 Nov 2022 02:22:21 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 26/32] gnu: Add tree-sitter-rust.
Date: Fri, 25 Nov 2022 01:21:36 +0000
Message-Id: <20221125012142.22579-27-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:BoyxGHhUjr9qw4HWa2xNDGWKQcHiA2OrFi3yI+nAEHIpR1hiskJ
XFL2lpNk0b+vxtNwwFR7bxkTjSBK2Yk205189umn1z9Hpzm7s2kOqhsA/t2nWmB+X5zLM2t
Qws1nPJcCR7EA3YoidyIBdwFxlj/bNQSk947sgjIMZkcbz+0YJjDMQJkyYAwerSJB5P9MkP
Ch63dEaU4jlCH0h+DjIbA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:xeeAkmEFMYY=;9RHQ0m5aRwHHZ7gGXbabYwLJbX9
0GMT769MvU/kE7qJC7cJgr4LFEACAUng4GzXkDeXwkwzE78Ipj6WXmHij1Df1HeQIyxPA3GHC
A2Y2KsbXUQoCM0z/cxACVzksJ3RBhYE6TnCo48vn8g+FshP3s5cubnd+OaHFVjhc+jQgo5tSr
teCwQdGAiXwxtYqxUwoQOZdt1yVXkmriW002rtz9FWvbHb1Gs8Qf7vwgvd5TSInDrL89DCIRS
JuD0qddkRqWYZimpOnbNCspZz9b2kD68tuYaU+Jy4YJE+xkGcLoNpRdJ1TUlbJFLPqlINV06H
rb9p5yRGh2hIREx7bTgaZdBaamJwmgdkNbpWgmkJPNwj6IbYt6wnGAFhiH+0CgaA2DzdkKabW
RJZMR76XzV22GB4r68iYbHpdPEGv2DY2UWbzvCXz0+fkRbwhWJB/b1UEjijOGJ7vJPqi8jkw8
/cwBy5pGtw10waIQRkwXK4edenFhQZYkjERg9vEUSkvTGvCr1vzKZDX0dv2F6kMihbqliVH0y
9YBxImnwz75VSG6YHcUJDx9ur35Eg0KjyOypuF0AocX/fGRN7Gcj9XUTXjOiIpc3zmD98blev
Je6REJU1X6tJzJ45Ok756pWerpO7NE9v0ctEhnMYNCeC2/IWSso3VbfjAMzFUhlC//uiMTDlp
KBHptyhTh3V7GlCA9PoyJB5gyIK1KDxkMfOG77a+L32N3Tn1fcb/pT/3KPLzTvy2shtvzPdqo
AundDi75otCqXjirxSCLnyXxF2pQ4io30rNQvXbpHlAIZrw20k7uYNyMG/PxaHsIqKfBA5d+4
MvrATbASV1Ln+NuDMsKA4sInAOxBIiPO1q9kJ50ZPe8MSNjKnjhfW6NzciGglf8jqLfw4bC97
5Vm5GbKESiX5xS5jTjwV+lTQ6vhVXXQ1JZqOGcLsbdTwV2W4DY2jOCWTYeFS3+DEvuBIRMpOq
jMUNHWG4WM/J0K4DgTf6JAoO1APZzDikj/3cW8/BwJIfo3Uq8W++668UyX6nuYfcKrb2NrEAu
AAg/IqCW+eh4kmd/FK6Y7MG80FlT5GuxaLjB0Yb
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 19e5308818..54f2affff2 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -626,3 +626,25 @@ (define-public tree-sitter-ruby
(description
"This package provides a Ruby grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package
+ (name "tree-sitter-rust")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-rust")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-rust")
+ (synopsis "Tree-sitter Rust grammar")
+ (description
+ "This package provides a Rust grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:36 2022
Received: from localhost ([127.0.0.1]:60923 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNVA-0000bV-H5
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:36 -0500
Received: from mout.gmx.net ([212.227.17.20]:50657)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV1-0000aH-9l
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MHXBp-1pBrxd3jN3-00DWxL; Fri, 25 Nov 2022 02:22:21 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 23/32] gnu: Add tree-sitter-python.
Date: Fri, 25 Nov 2022 01:21:33 +0000
Message-Id: <20221125012142.22579-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:skG0HN10l3How/DGEIx6DWxs8+MPuloRmEsp2HOEsJ+ZMYDbIro
7QwzKD6ZFpbWERZLuvtzt1vd8p4IAx+2iIZRDbs8HeOq2hnfuBs7Ug8QNBluOdW4uaKxIoG
ZfIAjB1s/28x1TaM5UgegoX07n+0WHQWSfdOyByIoc/tZdSCgqJuKF9NEwrH35TXAx3jwgp
imUukFvGN5FSjLZlH8gDQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:KHFcRMuqB2U=;RIkEYuUjuXG+6XmWlO4fSk77piM
11M5GKvKyjhsQIoDFXfTt9bH6tRWsiQltjndzMpnhHlgv2/rYBLjdV+Aqb0CLlzfG6qAO1Rzu
Ygl5jSIzIy63AZZnVM+YZeErm5CSn0Kp64XLcFcLvUYhwJcTPBagkoqNLcgDOh008KSje/W/C
RNfAVTbUIqUuT34YX+7zPbJ0NFq8GLLmqmZ4qkvRuBrUuYmpGrEHDf2ILeH8qyEU3CcjWjCTS
4chJ0aLQLakFRTcwqTphyqO7HWR5ZxqLaCP7klnHx90h7n9lj26Kck0tKyrm5G/EhEjpxLIap
xccb6D+A4grFWF5G+kM0ajCdFG7sV8sWWGZc6vyG9EkXhW7ebUuX08+JWswy1PDltKBqjuaZt
Oa/APf4t+smnzk7Npllp8x544td9upqVcpKgx0Wh/wL2NQJMAocZRdGJyqYE73QLYzQ258ikW
vGmMVKGyf9sj6YDfvKU0BQiClCDQXIBnNRN3wd28U+y1PpGcbAfhAKaKPswKTROJjbzZuB1S9
czzAyE+cyA6CpzCubA7RbWmM5bjzNUixTwOj8gBEupWyzvn0CZt1yAgQTjmBNpMxoSzKifG0e
u6FWq4mrCK6naz+pGP19LyYkZBC5prgicrYJleIW8q/ymu8qHHqkTjwwaaMZsUgGGe22YEFXj
xWapUkK3Ly+qsDnpU5Hj8ap2WyNKyaZG1JAIQrh+0lPcrKNNhVzyhLqmZ/+U0FPCORctpBoWu
Kt4SsOHdPM0ZWB8lxIkmxIrxiP/AocdE5HaqyhQE7fy4n1x+o/2KhWf9ob7eTCPhQxqOsAU0Q
TpRXp07oNdk2GcVpqYQU1fHLdg9a/yGIcpLKcBBQ4SbJBenEKdCu2hNjdvt2oXR3qfjBXzDFo
h8xNQz0huyz3TBIXepvVmBAQFOMWwnJ3ERltsLpzuxSkFZYYhv9Uk7d5mtFNE/nHKR63PKxZB
0QM3KrBcO/YDzm5d50H5cPGj2zeqolHnk90iVLEGweU8KLhqJjKUfveEr6bVMhAz62jpRsxni
M5B3Bcg8rw6t/iyZ8EU8N70zsiWKrICIoY+qN/1
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
---
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0a1bd4739a..c6256cd427 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -556,3 +556,27 @@ (define-public tree-sitter-php
(description
"This package provides a PHP grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-python
+ (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42")
+ (revision "1"))
+ (package
+ (name "tree-sitter-python")
+ (version (git-version "0.19.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-python")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wrfpg84mc3pzcrdi6n5fqwijkqr1nj5sqfnayb502krvqpjilal"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-python")
+ (synopsis "Tree-sitter Python grammar")
+ (description
+ "This package provides a Python grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:36 2022
Received: from localhost ([127.0.0.1]:60921 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNVA-0000bS-89
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:36 -0500
Received: from mout.gmx.net ([212.227.17.21]:52297)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV1-0000aG-6X
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MfHAB-1oWiZi0jj1-00gnE5; Fri, 25 Nov 2022 02:22:21 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 24/32] gnu: Add tree-sitter-r.
Date: Fri, 25 Nov 2022 01:21:34 +0000
Message-Id: <20221125012142.22579-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:XwhzzfxF1ozMFfR3/yGekJaY5bCkq6aDpfdnPifn6U2IdnbNXZd
BJmSl8BNcalSJWlg352odIGr5ihY3AsHgDEh3SsWTih+9+52KoE8nED/NFfd0A14wxPh+5z
1C5HjOJH50UNa4V2a2IwlgSU7JZgHlwL+h5mW7pQ2gFzFxlzXRUl6+0n36CtEIbhhy9ox9V
bm6pWu08QOe+DIa0cVEEA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:VQJ5I8SaRXY=;pVfZ9EZ6a9hIv3sr3tJDAokvaTC
SzEuY5+Rhu0o2uzWeMqmx6eO8sMMbZDMUpXwag0qvje8zjX2hQn9v8lFvZEgcwhBYXxMlatNI
HrWYFxy/TSTbqJmKQhGaFWA0kA1f4hwCucT++Vre9XqlRwB9r3Vuh4QuTavU06rErWP9wqFZJ
6dtjuehWlyMI3dJuvu5YhspyAwolY0k5FdFKbmrZjCsbCp0r7WJQf8LqoTMkBPEayAV29AwJZ
gUaWbVPvgKmiV9bYD22ntZBnU7Ye+jJdtNILXKD6ZCrzzQbNpfRUBRBLv0xV4FFP8Hy2Okv8B
tXdqnbCW0MQVRuW6DoX/xDut9YdPMj48fliIuWU20RzKTsGxKcorkTqHnq+nQzwqQ9zgyac3M
04k4auoG38I7qM10RMghcJbluQbyR1FIMGG6DOjXPBEw0+wyIHCttRBd1qOn2GCP9mIE8k+7Y
PeVCC2EkuvudCrbJn6/+/Z/8HHDTzgiJaLN54Vy1a98ZF/rrNoWz/1YfY+GTonuNaI9QI0TF/
86Tb80WMY557WsDtXdGw8glZ73xwrzENWZZe4NkZhQIR+lPOfYo4nWYFnN2LWTrdXy7hhKDum
uiw5TIKEyYLBeGH89QhpzAfcWk95wi0Vmj5cBHpruNbrKCmXT4ookX5B9Sl38ygenwlq3qILd
mxddKrxnIxOonQ0emkijMqzKwbm66WFQqna1sQjKxDLgkZBx5Je7ttEjaQ+BBWEmJCL/dbjlq
aImcm02DLurxrJwoZMkRyYdCmfeYV5xhd1x2MCad5/MLF+X5Zjg5ga8Yn3MB/RdFfzzhTZMYB
IHZgeRddV+p8qByg1B/kw0QLVLhxJvV8VASzX4IFAWZxTuuZlCqUbsBITHHZQsH4w10TEM7FB
VGivRRlTIaNMUcmq2zUWl2o1oNh3l1MCuime1PIaW2ZkAAI0e7R2KPN35MoehMzSm6PWAa+zP
+CMzNhkC2sKABVoIiklEcsonS7UZu5AAOpPB1xUhxrpYGARgffiVrPskJdZRYDUuX5uhOuygp
OQhQDXDa/LnTupwFBIfZ9ssg/uAoAMd1CGtIkM1
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-r): New variable.
---
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c6256cd427..7d00ee209f 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -580,3 +580,27 @@ (define-public tree-sitter-python
(description
"This package provides a Python grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-r
+ (let ((commit "80efda55672d1293aa738f956c7ae384ecdc31b4")
+ (revision "1"))
+ (package
+ (name "tree-sitter-r")
+ (version (git-version "0.0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/r-lib/tree-sitter-r")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/r-lib/tree-sitter-r")
+ (synopsis "Tree-sitter R grammar")
+ (description
+ "This package provides a R grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:29 2022
Received: from localhost ([127.0.0.1]:60919 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNV2-0000b3-Su
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:29 -0500
Received: from mout.gmx.net ([212.227.17.21]:55859)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV0-0000aF-UY
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MtfJX-1ol6gt2V9r-00v8g5; Fri, 25 Nov 2022 02:22:20 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 22/32] gnu: Add tree-sitter-php.
Date: Fri, 25 Nov 2022 01:21:32 +0000
Message-Id: <20221125012142.22579-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:/0NBaw696KZx9vR1noXhIAccJ+jzyj6MfQwtlM4S0Rgycp4thPL
nzhsjgoxBGZZucQmKqj2iEohlniiuE3EEfzh1EOnUs6SvITFIi65V5+HefOUWrcJwgHrzwh
GpLck8F32ht9/7d7q+cr39iPGaa2/hWcXUU/F2px8fTFQeMGyj71DUySD5gKA4dhGM8/0Ia
dciAeAoTJUyM4jK867BWA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:R0hH2jX2if0=;5MnVlgrGeKjDIBCKiuah5CdAGuT
RgD8NZ6akj6m/Uuoozie/Yvs3W1UvN6cwN3gAm1ZWa4Mu9MZ6H4DhUWXe9fy4ZHv5ZMEHrU6j
2MTO1H6L9KF8CW45mwhYTLRRFSYCfW/qxR6+TfB5TxTEjIGI4o/OdK0ChygMgfSkiTS+62b4j
V6a7luY/NMOoOMgELuDYJT3pUtRl/R+HGkkvpy1DF1s6qd8wDVfNjfA5KUtnO+LhFwM1YJpmn
8sMbK3QAtquDv8GAb0EjqEDJLkn1VH8JETZuRnT8/2GGSaht2GwB9pZI8BX2j1EeSijVMfmNF
61NvpDNWg/EbVPr3bysf4il4e41GKMih8FXpNPyvkbRZ/3dLu/D3rZvzPT/rkk6qLouuCffgz
xpZ8L5lB/PwNKIMp9/GqbvjOuFcTCmEbIB3uaaiD/AN5IVYSQUg8gPOnod80h17RNjFRaFUSB
X/BW7HAcgAUt4EvZnTpeVja1BP0fOS6qA1N3ApKcg5pDGCct5svahpLri+gx47QWdOALZt9be
c8ni1vg0iiK4GYkSOWLDw2qmdNGvJjTPM0IkF0uDuVHz0z4pMOcmg6y9w3SqRDjWycuGAiyo3
L9u6GMbh8aRZKYi1T6mdmqFrHohyj/XP4lTGJQQ4N3Ddv5g3mPFrfQw/WreO4DxPk2LnMCXIC
o054D/ozDtDvQQfNwD65KgjgZbwgyuqb4H47zFiDjTvznPSPTrB0JUU/Cx6cA0pZzSt1rXzAJ
2Wto05hT3xsubFX2a2phJypP7cCcSiVDaQjcvoDEJDiHQS4PoMOGtpETDi1r4aorqbwbeDfSp
MdxjwRYkiQ7+QCE3ppFU1578ZvzQlg++yWX7cpwxY2ZcHfIlhiaoQu11LS/6VKOTuH8VX0JMV
ZH8vtgWGhR57ZhxVMgW8lY/Fv0y+4DAKf/00bCJCJ3lmDjxqUWR+Wt/qjfN4Eavo67EB7Ij4M
55UF1Cke2Kxp9TD7ICU5n2VVvdpcmEmsonQlm0XY15L9joTgym9ozlQxKpvUJTSOo+MU/Qf/r
bBXO7HTygtb2G0hEK/wEb7Pvt4mx6M/wBast1/o
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
---
gnu/packages/tree-sitter.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 244eb2e8ec..0a1bd4739a 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -526,3 +526,33 @@ (define-public tree-sitter-ocaml
(description
"This package provides a OCaml grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-php
+ (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
+ (revision "1"))
+ (package
+ (name "tree-sitter-php")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-php")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")
+ #t))))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-php")
+ (synopsis "Tree-sitter PHP grammar")
+ (description
+ "This package provides a PHP grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:27:28 2022
Received: from localhost ([127.0.0.1]:60916 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNV2-0000au-H9
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500
Received: from mout.gmx.net ([212.227.17.22]:36079)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNV0-0000aE-S0
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M42nY-1oyNQ406j2-0000He; Fri, 25 Nov 2022 02:22:20 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 20/32] gnu: Add tree-sitter-julia.
Date: Fri, 25 Nov 2022 01:21:30 +0000
Message-Id: <20221125012142.22579-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:+c4YDZhifCBwX1ccYiMLPKksX16X2g/FlcAO6l0Rcu4kvVRZ9xz
1z+LVrAJGmL2WRyd9PznQlEecO5+BETMGAaML/7KnuoZBhBu42RpbnxdMUqh24MCxrdR65X
OasJ4GmmQFT8RGfX0Ffhg1X2pBCXGzMzIFArBNncAG+6hM0/s5wzi5oo1z6FIeviwUwWNHb
9I3Qp1IltOd/GsdQiTynw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:Fr6V25pJjtU=;f0LsATWpAk7NXumWpWDxErESxwA
DPl6JIIrKqMS5N75bBe/5kS0rMqPZPxh6U7FytPXSAX5Oqod7mhPyBel1kIfoPnx+KToFlJ+k
uFWzfPHr8JMB2uePzoAFeup0FByMflhe/c43mnBZH1gVkvNW+9ZQKJ0yH8Z2Z8lHncAWDeQbx
6uQ0+/RHBFijjA5OwqJxRORTaU2BjO0zlBm5NFW24t/IXcob5jFc4SsOqVHaSn8hPMQOLCxA0
Onuo8QyTZ3pQmyVuumAezKd9lKbPrZ5OHRXMKfXe1Pgdtk1JhxI73VwysPmQel0ggyNe9+eXL
16ZwjPiKT0b7DAq/VtUC9FUjr8gg4x2Mw1WX1pFFTPG+riz2h1WijXU514fkgKMtwE2jvgrdM
lqz17dLu2c7AC/FZs2c8IsHDXgAlbKtoVokaGOnQyQzTM2h2Zwv0mqoTYRHs4TABAwXaZpVIy
bEM198AnPS1A7S7UwgSps+z/Mh7I8RQX5vn4A5N+YRKy0fp22DpMz9Wqjshnh7rWD1ON7rWap
fFfp96sEA5CzkV6btJRQ3bWPc8jcfKnk3aesyXU5VPldVeWxb3qA9QyYLyKnWhgLsApmdHiyw
vNQx7axbjbu5hV8Tox8uKxArb8q7PlG1K3qUXg2OE0LfQD3L+8CSTugHkCr1PFxTxM9LvtZpy
4UYUbvlQ+JXPKDVdGJdQMyfiOZUFnZjDiG7p8uqFolnnOGrpHmuhVUlf4m947J7981DA45E/M
EyF0YyBgGhn6QRMSiwTHw+aSLPc5KrN5qu0xhCtyuqRHYiMx66FKj9yECUPCJRCus4Whfa36y
IXcFcnAjXJQNJAla6M3PWr2/lg150+phjaUa8kcfans2kZlpIJHyhRXbKMy9rXb5G4OHXUXOX
Tthv50oqppKHYAYkpsjSFhIXnZw+W6H/Lxdq8HqqnpRXGSyYIgJPGloW9JyngIC/NTrHmwyyV
aeslreJMEfPFmc3mFDrro4sYyMfKvQvm+zqXZVbnaDxQbw08+NLVyd8EHx/lW6RXQqzG/vJhI
AsMaQ0QGRZoahYy7cVqeGumqv7XhM5SjObal6G6
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index df9c8f7f4c..0f9f9097a6 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -465,3 +465,25 @@ (define-public tree-sitter-json
(description
"This package provides a JSON grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-julia
+ (package
+ (name "tree-sitter-julia")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-julia")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-julia")
+ (synopsis "Tree-sitter Julia grammar")
+ (description
+ "This package provides a Julia grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:20 2022
Received: from localhost ([127.0.0.1]:60866 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNR2-0000Re-6k
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:20 -0500
Received: from mout.gmx.net ([212.227.17.22]:33115)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQD-0000JQ-AL
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MJmGP-1pIVle279F-00K9hX; Fri, 25 Nov 2022 02:22:23 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 32/32] gnu: Add emacs-tree-sitter-langs.
Date: Fri, 25 Nov 2022 01:21:42 +0000
Message-Id: <20221125012142.22579-33-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:p2PnVRh5JbdrOAQug2c77p9QgdAqNsacHan6OxarUzv7R5cw0B2
PXJlkJki5A0cmmo4k04oqynjYZqGVppvoxcghKgLSE6LgyfCVi3693X5oznO3vvI4u5vLZP
W5oY4TDd/Ez8Vws0oqSNoOtiQHYkgp5V2f6q3QobJWLZK4SvWIuu2L1382SkTtRlEJ/yorE
QVhdK6BADfECKrj7rXCNQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:YG4aQCyWkLA=;EyuwUni4kt1Ky8Ga7W5wNz4fTFG
M8PUy1ONmK4pBXPfYVtUpR40RInXXkJy7B3fsg2X3/2Gj+qeG0J8qQOage85XbVgr5XxrSGcl
yHWasTNmOL6EqN8BUwdTSgsCyLzFhwg26zjoOdzuMhVQ3OdEyVy1iygmO9T+mfnhEx1aID8g6
1/m9x8aFE6suCJH4/oBJnhk5zR7Oa/58u8S6N8aKRVkgNmrSZCPkkthO5Imab9zxSJ29C10Z5
YFTXQrhAa7bVsnvZ0oKN55wj4VdUTjkZsllITbcXMcIsjrIIjXCSXAWp5PGPZBV+8oNOz3c+S
YTevADxPzzUObF8u2c7ybc1GoKltFQneiw5+D8xvsbvkBIThcFnQ9dD1r12zvczU9XqaYJa+e
q11MXRj26ggNCsXvepacuRwoJE7UaVJPN1oVLYdZOeIfPG4lo1gnZtriL31e+f2WZ5EYIsSNE
dd0AH28WFw3LhDLzZJRuZW49UyS6IdMYrOgeNYvxTLQ6LvLuOjqy1KrfdBaxx6KrQzXCEDlFd
lW/MjPx6lpC2Hr9exPVvTkbPJyistV6DdI8ddi8qWZKC+A3JlEudBvCOLXJThcfebDikfKjTs
gQEjSoSs0SdqytDdG9aNzl61O3eB7bZJXwX3C8vXCN28kB1k9eUmXoUoAEWT2wDO6Ulm69Q8W
BYW8s3Up/8JGndqVNC7bxnO78ajzTNA6/2Xr/73uewWRX3KG3gMG6FbzCTNid81/yAiJW/Luy
3qUt4ZfSWoQkA8tTkzK0CC+zEnvj+u0/AVlm4xhcPX5kozrJOpuvQyV46NHW9X2Fwqx+v5CWd
0jnhkhGdKrmjM7SDVgSGgM2CtmX9g7Temh2eGF6tgnVJt7kAZT1jiIbLy8vGpTZRZntaSZpQ6
Hm9aU6riE3qMgaP7estNaIwJiueN5/c1uh3oPsY4cemEpW5YUB/fQrDUR8AJnFDQlI+Dx513T
JIjt7VdMU7F4buyHQpQBqWsM30w=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bundle):
New procedure.
(emacs-tree-sitter-langs): New variable.
---
gnu/packages/tree-sitter.scm | 150 +++++++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 26b0206575..02d515bdc4 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
@@ -849,3 +850,152 @@ (define-public emacs-tree-sitter
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define emacs-tree-sitter-langs-grammar-bundle
+ (package
+ (name "emacs-tree-sitter-langs-grammar-bundle")
+ (source #f)
+ (version (package-version tree-sitter))
+ (build-system trivial-build-system)
+ (inputs
+ ;; FIXME: Support for some languages is still left to package.
+ (list tree-sitter-bash
+ tree-sitter-c
+ tree-sitter-c-sharp
+ tree-sitter-cpp
+ tree-sitter-css
+ tree-sitter-elixir
+ tree-sitter-elm
+ tree-sitter-go
+ tree-sitter-haskell
+ tree-sitter-html
+ tree-sitter-java
+ tree-sitter-javascript
+ tree-sitter-json
+ tree-sitter-julia
+ tree-sitter-ocaml
+ tree-sitter-php
+ tree-sitter-python
+ tree-sitter-r
+ tree-sitter-rust
+ tree-sitter-ruby
+ tree-sitter-typescript))
+ (arguments
+ (list #:builder
+ (with-imported-modules '((guix build union)
+ (guix build utils))
+ #~(begin
+ (use-modules (ice-9 match)
+ (guix build union)
+ (guix build utils))
+ (union-build
+ #$output
+ (filter directory-exists?
+ (map (match-lambda
+ ((name directory)
+ (string-append directory "/lib/tree-sitter")))
+ '#$(package-inputs this-package))))))))
+ (synopsis #f)
+ (description #f)
+ (home-page #f)
+ (license #f)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.12.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/tree-sitter-langs")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1qqf5naf4a9zm0am1rn9yn2b2s6q3h9fapsl5d546vbsyvak5q40"))))
+ (build-system emacs-build-system)
+ (inputs
+ (list emacs-tree-sitter-langs-grammar-bundle))
+ (propagated-inputs
+ (list emacs-tree-sitter))
+ (arguments
+ (list
+ #:tests? #t
+ #:test-command ''("script/test")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-downloader
+ (lambda _
+ (call-with-output-file "tree-sitter-langs-build.el"
+ (lambda (port)
+ (let ((on-load-message
+ (string-append
+ "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@HIDDEN")))
+ (format
+ port
+ ";;;###autoload
+ (defun tree-sitter-langs-install-grammars
+ (&optional skip-if-installed version os
+ keep-bundle)
+ (interactive)
+ (message \"~a\"))
+ (defconst tree-sitter-langs--queries-dir
+ (file-name-as-directory
+ (concat (file-name-directory (locate-library \"tree-sitter-langs.el\"))
+ \"queries\")))
+ (defun tree-sitter-langs--bin-dir () \"~a\")
+ (provide 'tree-sitter-langs-build)"
+ on-load-message
+ #$emacs-tree-sitter-langs-grammar-bundle))))))
+ (add-after 'unpack 'remove-cask
+ (lambda _
+ (substitute* "script/test"
+ (("cask") ""))))
+ (add-before 'check 'patch-tree-sitter-require-test
+ (lambda _
+ (use-modules (ice-9 regex))
+ ;; This test needs a git repositories with submodules for
+ ;; each languages in order to map all repositories. We patch
+ ;; the mapping function with one that invokes the tests for each
+ ;; packaged language.
+ (let ((supported-languages
+ (map (lambda (lib)
+ (match:substring
+ (string-match "(.*)\\.so$" (basename lib))
+ 1))
+ (find-files "bin" "\\.so$"))))
+ (substitute* "tree-sitter-langs-tests.el"
+ (("tree-sitter-langs--map-repos")
+ (call-with-output-string
+ (lambda (port)
+ (write `(lambda (fn)
+ (dolist (lang ',supported-languages)
+ (funcall fn lang)))
+ port))))))))
+ ;; Tests for queries will fail given those languages are not
+ ;; packages yet.
+ (add-before 'check 'remove-unused-highlight-queries
+ (lambda _
+ (delete-file-recursively "queries/hcl")
+ (delete-file-recursively "queries/pgn")))
+ (add-after 'install 'install-queries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (copy-recursively "queries" (string-append elpa "/queries"))))))))
+ (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/")
+ (synopsis "Language support bundle for Tree-sitter")
+ (description "This package is a convenient language bundle for
+Tree-sitter. For each supported language, this package provides:
+
+@enumerate
+@item Pre-compiled grammar binaries.
+@item An optional highlights.scm file that provides highlighting patterns.
+This is mainly intended for major modes that are not aware of tree-sitter.
+@item Optional query patterns for other minor modes that provide high-level
+functionalities on top of tree-sitter, such as code folding, evil text
+objects, ...etc.
+@end enumerate")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:20 2022
Received: from localhost ([127.0.0.1]:60864 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNR1-0000RW-Sw
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:20 -0500
Received: from mout.gmx.net ([212.227.17.22]:43603)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQD-0000JP-2f
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MrhUK-1oddXP0rn2-00ngaQ; Fri, 25 Nov 2022 02:22:23 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 31/32] gnu: Add emacs-tree-sitter.
Date: Fri, 25 Nov 2022 01:21:41 +0000
Message-Id: <20221125012142.22579-32-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:y7VTlc8b3jD51j/jWYxWbsWj0aADfNLnTU4mxovNEvXr2Kw5G8b
djvucw49A2aovGuX5/UfGcVIywbzSYZbNM0uFXLPwCQTItaj7HOKQKiY32hvK168c/lN1BT
APbIJwyBnfGaZ5X/ofNlC0j3lZEttGE3ehausgSUlEYFOdDJbE8GVb5G7pJ+mPKShkbL298
FRDOxEDK2IZf3y4nLbbtw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:B186MvRsH1Y=;Kez2k1vDn5FvXmuR3d0nun0O9+5
HrWKXgxYg2Oqj0YoEGRO5zJDLjklnS50LEkfeUt3h5kuM5wsAJlG3n+QDrPZlQRIdTZ11SHlA
mePliaHJATG8J7vmJAfJbECVgzvaLOrXl/DTFT1mMGfsiJUPkN0Or5N9B6YKA+aQmRaaqtq4r
OKq2828XwXtGtapZUXy0OcnPxCj2F3WmbSKtOzJDtaeZAviOxlVTMyD/Y7gScAxAM9rlDyRY7
/oFbjhJs6Czogm4BmgwfjFdazRrHseOANWIb2PFI0slrLpr15C3LRpI2vxviAPPs/RFFxYFae
VpWxa9SpUy63XSvmzZxtyX7tIWxz46nw7ULLHzmxLFu674dimiXQWIsRKp4IEAeRPrOKsrnQX
NZr8Q4UvhxT6vpuQLZp4NdPWep23s3b7+ufiOoex7ziKQQenl49JZ6BbsacgzOSr0Ty2uwLx1
3JfS5mVAaeNYdxSAokYoB6JIv/2j32GhWy0fqTrAcFwzLux3vxbk+5Ro2CcfqebFwPyAuXqJL
u0cyzQsC97UCaY7cLVmp92YDvEizkOjsSlTG5iasx9kpbl9aMeg0ggASg4gU6zeEBw4gWLtFi
R7AudGfr+i8kOimN5MJ8ZQxTueORChOtB00ij2RfIeURdDvy8GS0phSTInIXPD4qkmJz2dhRh
PKqe6JnCj6a6vHIRWmUdgiFPG2FBIxsPnBiL0tVJN9gw+DWf13ekqq1m8t4qj/GSlctpNS4vX
hSNBppJcTjuHcRkSvoJFR922kh6GReCgjGwAhVGS/ggEwNVoRSFnfKSPFxPtGN5ozDDYyA/D+
L+O5B+nguVnsXZ9RjyYqNCLJ7HNSqzQpuIzWKs7awTPIvO8ly2sSrzX+qFXtXJy735UR0yjcF
wkpLo3Q4aj+fhAkdWLT2DWvCtTmh1xoW1h68mdynPzw8JjWsikY+rhjaiPAE+KTkgfVW5FYnN
z56qInkNbPHiE1ySkx/geUELOUc=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable.
---
gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d23fa2fbd8..26b0206575 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -822,3 +822,30 @@ (module (search-input-file inputs "/lib/tsc-dyn.so")))
(description "This package provides core APIs of the Emacs binding for
Tree-sitter, an incremental parsing system.")
(license license:expat)))
+
+(define-public emacs-tree-sitter
+ (package
+ (name "emacs-tree-sitter")
+ (version (package-version emacs-tree-sitter-core))
+ (source (package-source emacs-tree-sitter-core))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ (list emacs-tree-sitter-core))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "lisp"))))))
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp")
+ (description "This package provides Emacs bindings for Tree-sitter, an
+incremental parsing library. It aims to be the foundation for a new breed of
+Emacs packages that understand code structurally. For example:
+
+@enumerate
+@item Faster, fine-grained code highlighting.
+@item More flexible code folding.
+@item Structural editing (like Paredit, or even better) for non-Lisp code.
+@item More informative indexing for imenu.
+@end enumerate")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:19 2022
Received: from localhost ([127.0.0.1]:60843 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQn-0000Og-HC
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:19 -0500
Received: from mout.gmx.net ([212.227.17.21]:36519)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQC-0000J8-Mj
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MgvrB-1oXGnz3sab-00hKvL; Fri, 25 Nov 2022 02:22:23 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 30/32] gnu: Add emacs-tree-sitter-core.
Date: Fri, 25 Nov 2022 01:21:40 +0000
Message-Id: <20221125012142.22579-31-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:x8pVT2+hWSLK/mhBNyh7pRAHPPLydmVXoppjZNZz9mi6102CPGt
UqMyP8Ab2uSY3MyGYYR2lcLfPuhWA5uatiQ8PFnpfmcpjspjLSblVtjeKH0LGMXoS2WKUgI
i/nO51ukAMnDJjj7wLCvFtaTC9MwsSCvZb38rtcLdSvp0s7aooBOcemj6IKr+6+EgOJFM1Z
JQIis66LmiaasRz51MgLw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:0ltnzgdeZ1U=;cr/1f5gPWTqPwNSWiuysMPZFHqp
EI6DXRbIzfuIuuK1mgGtRsC4MEUSMDc45Y7yHaxJ4z+odrxyAF7zPXRqGJYqrGaaEhZCBAgtC
MzUdUp7sE3rbihvktstEbyO3gULtMbMUeIScdtL8Zmat6vpcxKroN3/l8r+a4XdqB2n7UCseC
ueEBzjDX8YdT2oJgvwYDUq/s2Un+1urIHiG9WtdyzpZ/3PfADFxUd928EhJYve2uq2r4Vcgre
mMbzkkb86mMBBYO5AGEeKWCx4j+QddiEAqZ5V/i14iQTJFfv8uLPobRDNInXCyU+ydlC/q4WG
v97FvL+NZV2XFMvXQIHTHcF0UBC4FSb1Ou2iAzWkO1znzlLRUTCSmwtGzeBB3Dz2Y/I8ZtL66
ePhdLlSlI1+LU8DqHz4ASS8zsCwqZr8Jndz8Fhlz1eqQwgELPsKYG9D+0cgKq7O3r0sI3Uupk
u9fIqlGKERzrR06MRudl7ZOfLrKqEMiXdfUqw2CUzaZqDx9niM3CSVs1r9Gacid8ln2QJQVnQ
8820btCeJxr4cuBqtYnm3p5pPSA+Xmfpt6y2DB+gIeow2Yrg+TSSPqf3Ja1tVhvaKXXR4j5Ws
tyI/GW4abJAnv5aO8xVVdNuPki4JQT1cg6NUYOWhXrjnxTQ8p62PuFt5pXN+PkGYHUYKJS9Mb
EaHUGMNHudozDIvL5N71zLNpZ5OsvO30kmq8KV1eZamFQHwNEsL+tPpm6n5Jx8znOseV8OeAH
VxkN3n6ns9GwLBXLaqjW3491r1cnMFY7e7CkfASsrJMrDbYT36T7l521iEn/hQqpA13v9AHHA
JOWJZ4xK5LqBDq4V4+kK9/NtcJ/ijmJ7b0ntrRe7hKZGgCh8dy4rG+NCRDHDUlEQaXAUli0ZS
IRjYcjNCYUVEqmQxae7Bq2roWtbjwSM9mdSB9g9RpSUHx+ilxonKARokb9Ox1r8ImAzQM5JE9
HydI/Zf/jYBPZHOrLvGpAlb0IUE=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local variable.
(emacs-tree-sitter-core): New variable.
---
gnu/packages/tree-sitter.scm | 84 ++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d0214f3a12..d23fa2fbd8 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
#:use-module (guix download)
@@ -738,3 +739,86 @@ (define-public tree-sitter-typescript
"This package provides Typescript and TSX grammars for the Tree-sitter
library.")
(license license:expat)))
+
+;; Local package definition solely for building the native emacs module
+;; written in Rust.
+(define tree-sitter-emacs-module
+ (package
+ (name "tree-sitter-emacs-module")
+ (version "0.18.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif"))))
+ (build-system cargo-build-system)
+ (inputs
+ (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-emacs" ,rust-emacs-0.18)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tree-sitter" ,rust-tree-sitter-for-emacs))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-after 'chdir 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (add-after 'delete-cargo.lock 'do-not-fetch-from-github
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("\\[patch.*") "")
+ (("git = .*") ""))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
+ (mkdir-p lib)
+ (copy-file "target/release/libtsc_dyn.so"
+ (string-append lib "/tsc-dyn.so"))))))))
+ (home-page #f)
+ (synopsis #f)
+ (description #f)
+ (license license:expat)))
+
+(define-public emacs-tree-sitter-core
+ (package
+ (name "emacs-tree-sitter-core")
+ (version (package-version tree-sitter-emacs-module))
+ (source (package-source tree-sitter-emacs-module))
+ (build-system emacs-build-system)
+ (native-inputs
+ (list tree-sitter-emacs-module))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-before 'install 'find-tsc-dyn
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out")))
+ (module (search-input-file inputs "/lib/tsc-dyn.so")))
+ ;; Install the tsc-dyn module in site-lisp and the current
+ ;; directory for test to pass.
+ (install-file module elpa)
+ (copy-file module "tsc-dyn.so")
+ ;; We replace the tsc-dyn-get.el file with an empty stub to
+ ;; prevent the code from downloading the module.
+ (call-with-output-file "tsc-dyn-get.el"
+ (lambda (port)
+ (for-each
+ (lambda (sexp) (write sexp port))
+ '((defun tsc-dyn-get-ensure (requested)
+ nil)
+ (provide 'tsc-dyn-get)))))))))))
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp, core library")
+ (description "This package provides core APIs of the Emacs binding for
+Tree-sitter, an incremental parsing system.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:05 2022
Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQn-0000OT-2d
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:05 -0500
Received: from mout.gmx.net ([212.227.17.21]:41133)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQC-0000J0-4t
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MCKFu-1p7lM41SiI-009ODc; Fri, 25 Nov 2022 02:22:22 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 28/32] gnu: Add rust-tree-sitter.
Date: Fri, 25 Nov 2022 01:21:38 +0000
Message-Id: <20221125012142.22579-29-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:K6NNQKSI5eb1L3RyajbjxzZs47J4EpkU81GvhyJhHQ8Z32QnulZ
KonoZMR6P0JqLk6vk5xfFtoYfelS8NMEJsVWWecqihANM8t6mGbFJNj4//NjQ/3mUtMAAGI
+sxUpR/9CpxyvYQSmIh3YJRfNgJpZnRSuUux7HFqrz+Vj8wYg1gDrWuJL5WCaMlUZgmMOTa
pO2BvIlX0+vCjvke3kxuA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:e+W+fSq/AQE=;XT5CdQvKGq1Lv+9ipugbDBAfJ9W
kdsH3dUoDNEf4FCPgD3ju/0OmovNYHBOhVZ8BRPevfQmZbLu7vCKHJwx94PWpn5TCXOJl/p9e
yOlxWLrMN/iVL8Ixzc3rSfFO+k80M7Nf/Bh7hi9o2WR5sEvKamK2VsLZEskSH3T/8jfOE9khx
MBT2Qau0VyCxs0sEoaQSvh3/vysoHXlbas7b3pLMNAu83eFx8kXjKzuTDsxe+IA6iG10exxNW
4Loe1ezd5Ihbh92zHy6D/oNJhY5mkCUvnl/i8LUAbxiWWbq9+62/qcHDp500DLCekbMGLVKWf
d7zsmM/DsbZNOmMuYOee5BMpjA4KSlhGu38oOjCMxwrZmsD7i4meR5NgnYT9Vwq/uFXaz9g4t
6gQtvQcRjUnjVyXfabfE/D3wAf1/M9FBgkdvlFuo4ydabK8AL4rc1scoyXO5WFZ+pqdlsmn9K
F5S4bAQbB77QLC+NOa/HDv6jPmsL/VhmSMsCLR8aSRFQZ9lCnTyLlbOxuwDFcSGesCLzDudIO
BLFC3zWKWHK5cBGd4XWYKR01jGFyha6w3CBjhn9S4T/0cxxufxVDLy00LtVejY+j6+R+x6GC6
x8kurwijyZ0GIxZhIXBnJSqn3Gg+Qvnx3i1XYCjpA87vmlfu66kA2a29Ev2S80LNppw+v+hQ7
rRFpsUM69jL+qLqwU9g+WcEY3p4LtUljNBKAzfHgZadhmE1abBA80Un48nBDIgumF8xKQVwy4
UdGrRZ1rtTPvAcqYbXoDi6OAqBarLlNm7sJZ6uF3Oqmya7GdoGy2DcWjFURsh2A7W4+QW+Mjt
u4AJmogbfmKPisl5Uboki88uqnelISLXxmSVtL6PlCs0kskP5pPZBnL0W6g1nIc1cr8DBjDUl
POjhfsNKys22Una/CrOcjp1Hg1DdpD6ZkHy7RF1j2b7pkkHS/7t46lcThHOvlOH9ACyZt5Nbu
MqKFkBrMHEvhHcWsfgLkbTFr5Wk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable.
---
gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 7cf9a41105..ca92fccfd6 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -158,6 +159,43 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+(define-public rust-tree-sitter
+ (package
+ (name "rust-tree-sitter")
+ (version "0.20.7")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "183niy9malzr4dm81swcgl05xkwqamim6ck0gw5xb6k78nprz6jl"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove the runtime library code and dynamically link to
+ ;; it instead.
+ (delete-file-recursively "src")
+ (delete-file "binding_rust/build.rs")
+ (with-output-to-file "binding_rust/build.rs"
+ (lambda _
+ (format #t "fn main() {~@
+ println!(\"cargo:rustc-link-lib=tree-sitter\");~@
+ }~%")))
+ #t))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-regex" ,rust-regex-1))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Rust bindings to the Tree-sitter parsing library")
+ (description "This package provides Rust bindings to the Tree-sitter
+parsing library.")
+ (license license:expat)))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:05 2022
Received: from localhost ([127.0.0.1]:60838 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQm-0000OJ-Na
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:05 -0500
Received: from mout.gmx.net ([212.227.17.22]:38907)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQB-0000Ih-8I
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mq2nK-1od5J91wWI-00n8tA; Fri, 25 Nov 2022 02:22:21 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 25/32] gnu: Add tree-sitter-ruby.
Date: Fri, 25 Nov 2022 01:21:35 +0000
Message-Id: <20221125012142.22579-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:Woo6SPvYVm9E2Al/GF+oEBNLgb/q9paFBe1cvtdUkj6FV25f7o8
qVqZAXdMiB4fpr3h1n4RFKd1oR0d7oAMK+2Gu0us1GSApMfGYPnF0Tv2qp6hveMrdXGgJ0Y
sFfhPhi5ZmJd06AlQyvhS2nOE7HLG84VSiraU8Oj0cd7uBuewIpaCcmp5qqmqwFQMdyGW43
aHq05/TULNjmETjJSh7CA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:fJCqvOyLIUU=;oJsODgW62ux5lCM1L6XqBHpY80W
mcOUxREz+g4dyD3u9VzpslyJmL2xvFDMxDQsWD+S/Co16MAsgZbdx/vH0bvBZf5wtlxGMaq71
SOTTqONiVzAPeYfRo1Gqk8sPT+37uTyOrEv71Y/J07802A0c/JmjUVPfQZ8+8zr/PPw+KOTxx
RH/YdDrPTEYv3pasoNvWcoYrr8tJKG/wOULIQzFED1xsZDdWQ+dyRIf4gAmzjtTwLDTZPaUSe
qo4hVQGGWszIp70+gMDEYVC+yTaziNi6ZtCMzIXMvcKbmCvX+Q6kOhJ4QxAzRukJUE98kq3o9
CfG4v6vMernd/iB6MFlMJqKWUKCW1H5S2uooNbmtOWX5wkVa9QTNfrZeesqvGNKj0ipkt0cOB
pnR2IaGoNjPt94HYoynvVy373UD8/UScfafKjhJSquNdCeZ5QqsQbj0ru6ibwMrzC5bjHmADI
afn9pdl/e0IvJz4PxRo/Op99m9K9OFfCMKijCTAAVhTNKkINv7Fg+t39dyRgMCYLsR8E6vZY9
TtXKnkSCH4IXXxY9THNffLQ4jG6AAHq2E9AtUlm6+GJCyYUaGcvu0RGw/gqO3aKybzSFJTo00
1t33D99tk66IxRItfuP8D+NK3mgRICKMU+myK9L6sXkCJ6YNMcYFOLtjFlablf1uK8V3kkliA
XXIIwSnmpIyT4REH6yLVMOkKrSGDTNDKiwl0If/CJF+mNseUhvSvUgJRmsUxGWGwTQILRyA5/
2vhyM+ABZGDHnxheDYEOZHco209y1Ib3YTMPq01/Jah3ONCLUGDqlKyecGaOm8rSEOoBsoyyr
RdKu6blupP7+oR0AiuqbJoijmTNyb6yEJO46712FOXTlt4h2OU8dbHTg0/xRVaIq4uZmnj9LJ
nHWTwHZvJY+qBcUihetqzTwFvObmW/0rnDOjFDzjs1uS7Juhrat7N/LFzoKfbwYCEP0lHXzuN
UssQhiHrG+Qu30xoXLGAMBIC+lY=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 7d00ee209f..19e5308818 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -604,3 +604,25 @@ (define-public tree-sitter-r
(description
"This package provides a R grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-ruby
+ (package
+ (name "tree-sitter-ruby")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ruby")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-ruby")
+ (synopsis "Tree-sitter Ruby grammar")
+ (description
+ "This package provides a Ruby grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:04 2022
Received: from localhost ([127.0.0.1]:60835 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQm-0000O5-5r
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:04 -0500
Received: from mout.gmx.net ([212.227.17.21]:52401)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQA-0000II-2S
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MUGeB-1pPhqZ1Jfn-00RKi5; Fri, 25 Nov 2022 02:22:20 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 21/32] gnu: Add tree-sitter-ocaml.
Date: Fri, 25 Nov 2022 01:21:31 +0000
Message-Id: <20221125012142.22579-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:4DA7LBY5qR4qz9atJuI9GTcBrUj/hhL+wwFR2jkksNGzBYHMfnk
yAJ1g6uP/xhU4+PW3k/h8Rj5K/Xpbv2KqSzjXyam7Ifz6jL084hblUswxsTwDeiU/r0kYoC
yuzvdcbPMS8+EhhPRCOWKaGXsMBY5nJ1Ti9y9pcxNAJBRRx4jZ5uOWo4MdrmneQdY1MRcK1
sqUWyTBfcfpdSNrIWk/OA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:0CgXu1A+Bc4=;fCdjv2ECb+0PqQjUEuYOxSek0jo
D+CkxBCXONLaMLhDW5WxDewX11PHRVpDwHTK+YC7bRqekI5oKKuAtW9T0Kab3A0M1NyRsX9tQ
X2k/4yX/hmfbZ6ho+UYrUn29NsMP14aTlhvuXchexclgkBBt5uyfTnRKdtJGZsaj2BuUeCc4j
W1OLaU+4BN6T+cs6ELgMfckutwvJBbzQnU+FPrOZo49qv87NbM4DivSko4JmQc2v4xc/KWPbr
7ZqTHxOjDMC5stcR5O3dLZj0H6rNiaP7RLLfHXCYid47zn1H/lQIIozvBL01TT8lZtNNUC1sl
RFyzOALlyKJnoxHA1lwoMaGm9s5DQIX/JYO8AyuMKgZtT8ZqG0idDURm5/hPGy/2o6yvwWcYk
8FFDUMo6/A+WNf76Ci5Nx7Y9GGee4U4xo7trzUU2YxxdQA/8syRXgjujXHmSj3Qry/807nNVE
OjqM56TA8ly7h7LAyJhVmJuDbb6Jyt8rw9yoEtw6YLCe/zKCckpU7vkB4cHo4I8Gnuj6CpTva
Em7KcUgfjF3cfHpBKnYXwHJOiasv31se6PQZi+qZo46nIXylBRN7T93x8TAchHBQYLfGrGO+l
PvNSYxCkYiAWwbOjaemQZ3h0Urq0gcVo7fnDl8PYSLGC1NoCkVmDGVOFYdc5bOLDoMWJmd7sI
K0OljU7/Wmz6WcZUoYp8BGhZ5aFp3lxvNJqYlhNxebOMSAWg2qh1QNbR3v2St/Nk7ZBJIWKXm
+AzIODsRaBorg/GhVIn/JJdb5GJOpJdtDImEx1Qu/bukav/fbGiDY0+0uJaiaddYXt4Mf7Kl0
jMItwaww4AXAmhfqGiBW6shRla9TnZxld8VFl/VhBdCBhN83bpCFfeG6oAGfs/pP6/OVdVQAe
uEndhcnJJ/+/O9ELGOhdPEdy8epO473Xspgl4YZ1VnVwYQymEtwljo3TUk8X7GjS6aImhvnvK
FLSRkdgOIM3+fkeaabdkx/YJz9k=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable.
---
gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0f9f9097a6..244eb2e8ec 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -487,3 +487,42 @@ (define-public tree-sitter-julia
(description
"This package provides a Julia grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-ocaml
+ (let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192")
+ (revision "1"))
+ (package
+ (name "tree-sitter-ocaml")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ocaml")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("ocaml" "interface"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (arguments
+ (list
+ #:grammar-directories '("ocaml" "interface")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-ocaml")
+ (synopsis "Tree-sitter OCaml grammar")
+ (description
+ "This package provides a OCaml grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:04 2022
Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQl-0000Ns-Pf
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:04 -0500
Received: from mout.gmx.net ([212.227.17.21]:53485)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ9-0000IA-07
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MryTF-1oduec192T-00nxqz; Fri, 25 Nov 2022 02:22:19 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 19/32] gnu: Add tree-sitter-json.
Date: Fri, 25 Nov 2022 01:21:29 +0000
Message-Id: <20221125012142.22579-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:so0ERfkJQTKpMW6UPkaAlwIPcG57d543PUe0/7g3R+EZfQH94e5
CTd6GAc9VvI9+KosHC90TYQeg2A3/HpkYFljYEaWHM9La0SEPHSwOaPA9CX+iintK+DO4TU
78M7TUMmuQPjMgo0YCzcECa+QinGv6om4mYfGe2t1OpMxKCarxJNDjAWUFOwrZW2dnLTiCI
eMA9hQ+6cc/0VSunaRH5g==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:Uw172T1TayQ=;AQz7HdrsL02HXfS4do8L1mxJPCl
TW+mhGdDLnnPUPjDIC/lqUTVugO+lfHrGd76IEV2ohzHE4Tk7gQhVpqOiVfiHe61NLjSzAcWw
U6kBcxdGi1Js7eHG2I9suQcQyZoUzwOvUArmztfbyRocyDFshtd47HZ4SJ3BAFi6FWn81OhTT
W6uPhvD33OtgFhRrl9NRGRvEopFVt+JxhFAiZpEO7FGUtMW9/gxdih2xM92A4bKBXImvwM+od
YFDGkPm5NOZseKW435V3qjyVXzedxPzMgQyNgYS4u0xjz4YV4HlhC5ylwgo0e4XwDNiYIKR1T
Y7vUU415rpNLNgSLBwRxMztchfEdc1Rn6Ldh/dJugVoXf5wO+kcFMayjuYYMm+IkTFre5Hqyb
jzMJm6L/00yuGF3wdMvEyq9kzuxapftz7QutFeRgyjvBa3PAxrS9PM7QUuKOR6h2uN2POMpNx
dN/6sCpB6CX3ZlJ1XQnP2ZV1PWNuE11JNCidmqWrMCJUwQHK38EtOSrnDzCr9m2uDrUxh13YX
RqrO4xAIB11WCeqHrTg169X/HSeeuEf/m0zV2WyPRWiUqk6wS7ftVmSgfDXBbJtnQMBlsIurG
DWmxQyBPVaGxSLHduHVQUiKBMVOTIutMBw4MPE/IjN6gUw1Qvx8QR6pnBDzDuPP2pRofHkfZa
iHATlhoneeVbVH9fwgUCqVsGrUO5ogr5fWTr8tww5PBQuWrzEIY9aGOTsHCCe48CHKk0bgDDC
EdD6ggrcAvC9m96HTb8jLfxyenVzNNuc+NHRcdtK619dC85qc/42dKg72s1dRW/sRWDhIDKTL
nAHRYUiJ1/HIOe8XO5dgvT111NTIzuvn0NhTUeSvnVcthoTE3C3GOb2Z+5C7IB8bGH66mGhDA
TJq/xG2Tzlved7Cte2lkNrC61GwJhezWw8sGvlRDlbS9TkgBj2vp2mHsqFYUuRpbu9E98IO6d
g5GHAjYQQr858CHfXd5+dCpsoyk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 99fdd2de2c..df9c8f7f4c 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -443,3 +443,25 @@ (define-public tree-sitter-javascript
"This package provides Javascript and JSX grammars for the Tree-sitter
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package
+ (name "tree-sitter-json")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-json")
+ (synopsis "Tree-sitter JSON grammar")
+ (description
+ "This package provides a JSON grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:03 2022
Received: from localhost ([127.0.0.1]:60830 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQl-0000Ni-8j
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:03 -0500
Received: from mout.gmx.net ([212.227.17.21]:56077)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ8-0000I6-Dd
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MxUnp-1onpid2xrd-00xu1F; Fri, 25 Nov 2022 02:22:18 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 17/32] gnu: Add tree-sitter-java.
Date: Fri, 25 Nov 2022 01:21:27 +0000
Message-Id: <20221125012142.22579-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:dQ/U66bv2O0TbIKMeUzQSsrqpvgGzyJx6G4sP8fk+QgtHXQChnn
glqz6+DR178eNi2NV6YBr+QFP7F82+zyPQN9odwNbJIFkcToBG0U7xKOaBd+8PZw9WlrE53
6CTWss5Hw4/mWT5593hjtM552XPDK2KGnWuzKcGzl/gp4mLalvkD7fIBfhRCBrg92VN9ikm
sfwxGb5TcLs0C5n9PhKgA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:5tcpIF6xfic=;pfTxWanquqazy3HX7g5KBaDutjl
7nJic51ERBh1B/ld+dVC9teEh8BRWoJ/W3QFf5X+uidUtGBhR9bbz57gE7GReKgFl2rq+oJqy
5tsTZHsdCv5i/w+d6LBpQONI6ee7ABHYgyeic1Wdl+dAojN6kmYvNnueivbSSRjn5Fxui10Ny
D63qerRpEPnf2XoofCM29kSZsxJAUHw2jlDnz1cwjFhHHOtTHIuHHom5oT/N/VsI1VzptFjMW
Gmhld5QC4FhBGGwNDwXk8k98QfP0FcqNaB+dA5Pjr/ZZ8EH5Dj8TfDKzRNPnCJjzR5MeJeS8l
VKQJc/pZUOzTZliYR8ii466JLqYtetfl+D+tFGR15O1uE1SiEzr2/6A1srGrCwgMye/Ka6x2A
AL3tCGVWlWrD7sfWEiKlbtsjF+a3N2XoGzCvy3FtmRknTBqYl/H5W12deY1b3NMlzt92KGFya
5EUt12SQsSGTooLeHoXNSConajn87S0ZLB+sG/pRUOAj4tk0ljdQP9+TaZzp3wsqvkzjSL0RS
pDaq98FRHQoQzYkrYZFWuPzEpEDPVA4wrKxAX2ba5K6clPIVnaMKz4dNlu6r/gWZ6/PZgaGnD
djaUsGm8yBTCQnbK1vsu0WmoFzmG4+pzfKpDo9vHoXICQeh6w5KFIFoa9af/uvIEimhTuduOL
Lsv7O+DlVS+lL+SPDmN1xUiZ6RVfrxbx7d//q0NhJ2/WzNYT/Sg+SiomNOk2hMndKS4ne6Wo1
ZLGsJ6Q8/Jo4i8YX2x//YR1brgfR9oCFRet+51CLRZJgXdLmj9P2jert/eoeSz7bNGl8Hgp8m
L6WM8/cmr07t5X6BVKx6qBaZE2ncbsKrWfHKTKH/UtGiiLRHyfxsL6cxCA+Ov3BeNBd06d9F5
76F53oSPOecjty2/R1W4/kvSswzpKSv9O0BI91qB0tafh3cER46AqDkCoEuFv5Y/Y58l9JEVx
8AJKVR1tQ/sOod1ie5o3JLTOnGQ=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f8edddccc5..1782fa8e19 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -398,3 +398,25 @@ (define-public tree-sitter-html
(description
"This package provides a HTML grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-java
+ (package
+ (name "tree-sitter-java")
+ (version "0.20.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-java")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-java")
+ (synopsis "Tree-sitter Java grammar")
+ (description
+ "This package provides a Java grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:03 2022
Received: from localhost ([127.0.0.1]:60827 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQk-0000NU-N9
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:03 -0500
Received: from mout.gmx.net ([212.227.17.21]:49649)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ8-0000I8-Ni
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M4s0t-1p0JEC00T1-001vmF; Fri, 25 Nov 2022 02:22:19 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 18/32] gnu: Add tree-sitter-javascript.
Date: Fri, 25 Nov 2022 01:21:28 +0000
Message-Id: <20221125012142.22579-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:Y8qFSkBPSbaNAlSFwb/yeU6xREZKXQVHS9bvO+hZ66YK5u8bz3x
XxjqlWwmjKMUUpcgALSn/dwAoKBU/S1MpMesjHxt6PnUlaBi9k0vOaTz7ZBfXpdjdDPIfSh
zmyzSeAgPsnVfoEsDSTfhmhG3iF/TZ8BgBllfRRH1nJcsNOnb/VTNweDF9rTpwkSkIRiq2l
Czrbd+30hPfxBaIraH25A==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:RJptrnBiImQ=;N7Y6u3obuxojtwNxYcalWp3uKzM
r23P90FAEFzMW0IL77qbdiRvmJ/e1pUjvpENdukInhI3LgIjZSr74OPLh4rj0nuEJulLyBkZY
bIQwpqVags1i/dw6lIdoU9CwXufGoS86Rs2RG8XBgFUouFvYlbmaL6ZE9W50Q0MosRnIExnXm
4nqpKbUzVbbiaVrfwddp2p/6HkrBs2LXg9ArzSQXasUR9nGHUM3iqHhnDO1VBF1hK4YKsvjaZ
G8ocdDx4dZxeyluLLbImO4UmfkfUnqvBUT2gmmn5YvcKkD1p8BqPIBlBOhbPlHI+nlan3L1WH
oPdrXuEGC3lYV+mfwsD2oMIFbkGIH9Z51tCyl3VOVGoC+YkiI02YjL0oCFuVr54HjTrKAFof9
0G8lulD9cJRvyIQrKFkgG2KbdrbScMpKiOd+QXUkzw7ftrV/XpwcCd5HMciLnRBgoMzzmwmFd
mcSbz0aKZlCGnbBg/DZt3QAFW6dVMKdcbJ7kA5Yv55bV/1YzENzTUoQvX7kfhEOU9u2goTaBy
23TDiLNDj546s4Tz4G+pR7sTH08lmLn3ROClmQALK7YHclqZ7K1shgEsWUKQTHN+vMkHK5URz
ezcFXTAw/c8RznQZ0iuD8pwc9O0YBg+fNujJHNb70hpBWOFFmXKv1gslUl8CVwGYLc3oLexC2
F9oUDbhWBXWLCKcF1xnzFLbueczkC/0HwA7Hcq5OgqfhraXjsSM/WXmqjOjuF2o9os3wCZztw
TNYuuFRf9jBfDTotMr/pG0MfO/v6dIf94Ryih8sjNIGqUmgd9o6bQmkypw2h4hvQZncv2eeF0
ToWuy2UT59RGhbtoLdvelPXeJbhhtKVwSIQfPvjsnJFVs3PAsgw+gLpHoFlQaXcjuivBeLF5r
1Sv+ptP65cvlioi3LP2yl8rLTnlbNX52H2A6933mwk53RWLBvgGjNgl2iO7MIrl+CRz/YuZ/1
nu+tMg==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable.
---
gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 1782fa8e19..99fdd2de2c 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -420,3 +420,26 @@ (define-public tree-sitter-java
(description
"This package provides a Java grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-javascript
+ (package
+ (name "tree-sitter-javascript")
+ (version "0.20.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-javascript")
+ (commit (string-append "rust-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides Javascript and JSX grammars for the Tree-sitter
+library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:02 2022
Received: from localhost ([127.0.0.1]:60825 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQk-0000NL-Al
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:02 -0500
Received: from mout.gmx.net ([212.227.17.21]:60663)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ8-0000I4-5K
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MsYqp-1ok0ED1iH5-00u2Ol; Fri, 25 Nov 2022 02:22:18 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 16/32] gnu: Add tree-sitter-html.
Date: Fri, 25 Nov 2022 01:21:26 +0000
Message-Id: <20221125012142.22579-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:vyseECFQ8ciRm8+5ZqOYLONBwoWqhAVrownEZvLVkOUDwzm7PBq
L0HdjW8loYPCAawF8GZXoS0YxEf5KVC3/9p3M+Ax/rW4YXhsd9XWSDwc309pK9N6tMaBTcE
IR9CGQzatsrytvxWlPREUCcW0+fJ9r+44oS+cj8Xn1xMW9ToRchMjI2vJMCLqRww2cY0F7X
9A/15kHsdtYSlyBpTiJKA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:pnM6SN1kOYQ=;Ps7dqKCpUL1Wv7CxW+RI+mjHIZP
rNNM1askNmvIEJlO0GZ0hp3m/n+RTJnHsYvKJ9a1vnXG5Ben6pAotfCGW1bV+RMoA7TNiiBOz
LZ5Bt4VpuLkiWTNNyPbBZpzFS7mC07YY66iUt4ntDxr4zmYMeeFaYyMJmfO7OwGGhrQfVNyC4
lkXrApzAYEAiafoF13VfXsShBSfVxGkaB78vNj1AeIIhkPJxDuu0MeKuIIZlwKtermZLwDquJ
JJfWOZr0QPfuzSphozb8rUSkeLURJg+dTDHqBQAHWV8RlXROs6Uc4wk0VaCJnOuHBs4Nv/qq2
JMk0qMH+ki+GUiuUn2dd4cjztCnMWwEDJUq9WD4V2G7mNU+VguL3s/RlFcocPbzaLy4oAnWAH
BzXktzFvdLkwamuBzaMZj5sGK5kUwt0T3JCsjsM5C6GLQaoH3fMrOaRn8/j2pK/NcSA1fwV4k
bpXIKOMvcCi+CEg8/Lh6fhmG2W4UYn3WqXL2Ritx428ekkq3ASB/qqv8BXZyqUejRxwR8wK+8
tvQ7GiQiWGDLkGtM6DB+5OHRSSpcbLEav6TXLgzqk6vYmU97rsi+phT0/ORUThJnUSakhi64l
8O3Q9PDEvfpmybNEMxFh7IGsimSWSPaJPSSyFMpDTGT4DCYTrV+Fl1Z7zx7eBxmqMtDHHLc7O
y9c+CM/cfIcDM625bmL5cHod5jMN8IpQ6CWe3ToExGFwrgjEunnMYnPaeRKN/TiBoW0qAdN4E
FDv8tStNEHrBsCto9MkrDbS4CcmnwwuuROiJplmKT8fZsLVFQQG7xADV/VLP/XDjGMLty7rEK
OGgSBrLbO8ygR5k7T4ITj3oSdux6LyBxQt2i6a6jUcNZscNd9q3rO3fxMmBAbyoFeRGfsxmpi
RmwjdhcSEHjpgwldZNYKZF1BtAci9WQDZCn9/J07RBt0TqMMtsvbYU4QFtjLShT8+QcSYm9lq
FdqkDMgUslYZbrvjAlA07iyb9S8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 668788e582..f8edddccc5 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -376,3 +376,25 @@ (define-public tree-sitter-haskell
(description
"This package provides a Haskell grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-html
+ (package
+ (name "tree-sitter-html")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-html")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-html")
+ (synopsis "Tree-sitter HTML grammar")
+ (description
+ "This package provides a HTML grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:02 2022
Received: from localhost ([127.0.0.1]:60822 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQj-0000N7-Vx
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:02 -0500
Received: from mout.gmx.net ([212.227.17.22]:35357)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ7-0000I3-SK
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MvbG2-1oidie0V1C-00sexG; Fri, 25 Nov 2022 02:22:18 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 15/32] gnu: Add tree-sitter-haskell.
Date: Fri, 25 Nov 2022 01:21:25 +0000
Message-Id: <20221125012142.22579-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:kWBa5rm8Pk+fKxIQUxdLDWKz+2wdy3ELmvt4a7QeY9k5104OnLC
vyXKlSQMkreF+1LZjRtNw6uOE6lwCVO6g6v+MaiKURf6a3OBxYyp1V3JhYgws4IZKnyk8CM
Wxc7+nHX0nBtZz75e2QvOaUHxg6rjO3fAu8SvN3tOuxtM03S9eOaMZSh8C8Hsblj269KERu
C+a4aTlpQr2YjYVEwIgMA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:XHkyrqIm0BA=;rzst7q6ZD0Yz8dEGUWfvvKDtU5t
DqBQWYKW/LTMktdj3zIN0WmdwtUPq2KQJcMyqzeFgLdRNsquJlCf8p4KQMpD8P1KvGo7xIjOC
1XEqTv2KLbXqT5ppo7MFlpphg0JWttyKAotYk2ZqDu+fkIjDjRR2HT1neiwJ0j3vCQOQOLJgD
Dqsz252N9zwLileUxyDtTyHAJRnIaobFRW23ZLOP3SzEeMtGzEDCeDS9Pf7mq348ikoypUbB3
s9FkvlihrOJIUp0GfSA9EGEtWbZ67jiULt4f5phQMe51fyUUdIrVCPh3uc2obJQaWPf/98vsN
0Z9pM5rZ4XxpSz6mWs6qVCKNfqW26PVUT0M2+CzXGv9LR6U8Hahbt1hWlShKUCP43MnEVgsFR
Cxl1pWxXQm+WuUEdDPWb4Z1+T3wUw1Vj/JlLPVPbKKJotXseJdTXQ4FJt33agPsTIami3mClq
o7kOaz8ZOdHTaCfQb5E/bulMViNj+4Va+hyVzmXClAI9trfBYHaXiia6+aos1TpwvZdouwIVj
ISVE0Ccsokue3Z+3Hl0qPqJFsrARt5n7DhQ9RbEgTM8TFR/QPIDMIX+zd7xK09brnRM9eGU2V
RBM+5b8++BoSHZzRa0ZRqSnTlOx7FnYSyWt9NqIsT7/2WXKQIg1JwTwXeC5cPgdN+fm52vA2i
RHfa2lGCHsVgARlgUM4Sgo3EPH8QH09Sj1wceqenn6RfChqgARXpEBISNWGVm6XMmUEVK3QZ+
0iW1+QWUyvE3NbXV7Ak3j6Vef7mwpbggmnPTcvLiiYL7XgbpvYCOROZYKpVgbJ4MZ0dthtJJi
KGhDfF8IhI6w1dzBBBD/nKSWzfSL0vEUS66pPuV6ddJSf+WIjfOqz7m9Q+1lj10pDQiRZGPOe
eHBIlx/ZsBoNn+tzDH8GmTSYQrNe+1JFThklDElZ+1jCCSEtHuKeVyKSch98F/vqjC1a+eSKQ
OlsUsGIiBtn39egCgeM/Z2NrLEY=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-haskell): New variable.
---
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 61d6eba777..668788e582 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -352,3 +352,27 @@ (define-public tree-sitter-go
(description
"This package provides a Golang grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-haskell
+ (let ((commit "e30bdfd53eb28c73f26a68b77d436fd2140af167")
+ (revision "1"))
+ (package
+ (name "tree-sitter-haskell")
+ (version (git-version "0.14.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-haskell")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ylgs6lv1dyh3wxf756fii070r32hzbgddrfjbi2v369vmvg337p"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-haskell")
+ (synopsis "Tree-sitter Haskell grammar")
+ (description
+ "This package provides a Haskell grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:02 2022
Received: from localhost ([127.0.0.1]:60820 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQj-0000Mx-LO
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500
Received: from mout.gmx.net ([212.227.17.20]:59775)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ7-0000I2-Jb
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MsHru-1ojj753UIE-00tlPq; Fri, 25 Nov 2022 02:22:17 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 14/32] gnu: Add tree-sitter-go.
Date: Fri, 25 Nov 2022 01:21:24 +0000
Message-Id: <20221125012142.22579-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:TmH+oRybUGJUadoKlbwLr9TmRjXMMx4lk0dTymcAjpazuEa0B7S
+N2/EoZxeXYc4VgYYIi979xELlNUyoywKcbN02F5Bw1Fhz0InPEoK47MPpn5gVibXkhESDg
acXwFzmeZ//2UljxyIp5fdHVVY3G86LJTHk06b8bNWDeyemKGxSxz8ad88y9ahcKnLh5mSp
RxaQmnjUyGZ9bh5ozPtMA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:9RuixkdoVlI=;+Jb0Y64bYL0xodqZzboOOJbhgIc
bOd7DVx1pkhRIcouVaBzBfezlOU9L1VSgSB1GTpP1PCEIzdCGsGarqAzoU2RVs6rqGQrLgSv9
Ay3PuNOkgr3tDJf8TVsx0HHxQmucl3C6hXivShDcouNnVFR725/6CBwA7gcTMf3E6v99UZhVJ
tHE0g98Xq5PzBnIxGc2JoYQcV0HVqNK3BlG9ThUjop+PKdF4BMNS+QT0niSWw0YpO9kIkUwLm
p5sLOR4Py0rchMTwjFKm+ej17o2SMdPZ2JvyadJhqbxaXXdnQQ7QWRVuL+q7/kBbhe6OEfW6N
CYlYUXIxgiklcoL+esHc6fJ4C5ABAsl9MUdzBhl0B9DJ9EUeh3zjqQnDn0LbWeVfIaEvaa/6k
SY4ZMiE2jRNuoOYOm0G5wWybw3j9rDcTYVMgxwV5DqAr0x/9oZj8pZEje4UDlCDx6izT7RaMI
R6/BY9JZnH8wHNXavpTH1tpglAdu6igcvaXjj6RlehC1do/mKs5W1Rcv6ZLsbbCiNUJfHkYs0
6qlk9EMcbotnSi9W7sNQeUdI2H17/lD2aTdYY57p3qpdEbiz+24IFDXPKp1DClNYBFlwbFeSf
gFT5znUfA7wn/vDQ3VTdUCkpUpzxnuWAY39kPYMNNiN2ciOiMkxl2XCqGtde3QeMOvTLfl4AS
7AVbOlQsGueE6SNhzbNht0b/MPo6eYMXa3s5yiZEf7wclrfXwHGApLNtrGH7QeERnI86GSu2r
7s5lpTB4b/XGpHvsOYSLJcXfjHr0rv791Fca7q6KvqlNCL8fSbOKUyM9LoqbhD2PbnXb7DLKo
JvJlXAljg+rv3984MOlyqb8TDQWiVBJOs+EyLdPotjayRmg5BBO5G4eD9uNpD2+4rfAGy39/Y
nAibKbqXFg92Rn6etlvQv3B9BIh52yQj0xbRoYTesak773LXs+/8m930XMkmGdgxeqm/rGumh
Ij4qVGpUrIz2lHICxHn0LJ/DDwI=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-go): New variable.
---
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 11548f526b..61d6eba777 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -328,3 +328,27 @@ (define-public tree-sitter-elm
(description
"This package provides an Elm grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (let ((commit "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611")
+ (revision "1"))
+ (package
+ (name "tree-sitter-go")
+ (version (git-version "0.19.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-go")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1qymkdi4qcnj8ywmsanb6pdl9zd71cbm6kzl87zk241h7dhkkkvz"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-go")
+ (synopsis "Tree-sitter Go grammar")
+ (description
+ "This package provides a Golang grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:01 2022
Received: from localhost ([127.0.0.1]:60818 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQj-0000MZ-8x
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500
Received: from mout.gmx.net ([212.227.17.21]:47677)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ7-0000I1-9G
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M2O6Y-1p2DyB2Bzi-003riU; Fri, 25 Nov 2022 02:22:17 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 13/32] gnu: Add tree-sitter-elm.
Date: Fri, 25 Nov 2022 01:21:23 +0000
Message-Id: <20221125012142.22579-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:CeMKWCUhdDpwVRy2a4jzMiF4d65KIGvgI0TCmU/h2pq9g2F0Ifp
2oRdWZ/0UsIuvjkEyHpsaMqH9jN4yDRAmuF/It6MbYsvTWPQ08dKClAP4sQay663fIrvrX6
g0G+CqJrR/o8iHrYNdsg2WIfDS6sKdwgZloZ8yq/EXV9p1XMog+A4U4K3jfTki086rOQTs+
UnNipFWWmGbQuU1sCPamg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:dt1zNQvVQOQ=;UflSZJfwdTW0AuypmV/Jest5Qyt
CcqWRWpM3Y4lZxkDG+UhhYgPjrYuGRBw9pDfJzZTpDzLRVg0Yy5DzxA3usmq8/6Pfpr1/PTkI
u61+DBYyEXI7l0DJ2G8Vv9gpq2ftvHN3z82Y3OGZYL1I+O676P2AdkhT2pQWGVbaFV+sb5yD0
w1WmhFcr1IkDscwYkEwSHYSLpW6QrBrgc1dd6qPZecKLmbKoeHDjJtCByTlD9Soy7mfqoJDKI
DXhqqJ03yAJf2DPxDG4omijpsggMVG1/Dx49H1d95tTx5JL2kp/dBTG/O54OhT3rr0ixt5dEP
xzkU1FkUnOPdc+w463oqA8DRIneXAfFgBh3TRR8MR/rjv0AShUGDW7fspKvMsMhvn2zEsyEq2
t+m7w+WIfJQIYEwGwalVWa4zzZOpb6kn0E0PLbCAUBV/+mrwp6S1SMiJPB8kwNPlFMeU3IzYK
lVIrIs0kNOZwGMl1QAbFSzPnmC7fpY3AAqwbqM2f9Ko02PHzU9KHOc3BrnTeAAz/QamQGuI3q
jNkiB6QWrwIwUKL34jquQrpZ8g+guQRn5jnN53pzEcbPm/MoF0n2tALWrlTy5CqDDtRxmuuXT
hRxVzAVWSLenGmkoECuB12cHMTjnTiTOqFPJWtsX7rbuaWInsuktvrgFXaZkYiZvClyHE9qkm
ZvkrQYDDWvqOaXi+Xjj6OFPzkmeqF2ht9YGnwPaSk15g8KeA/WTzUyRDqltzKsmbyrFfAuEQ9
1yOA09hOj3VtT6XnZLnxKj5G25SXnYaq3KfIDXk1gQxFhIITQypKMki5ypY/+JCpmhUOg2fnZ
xj4rriFxBxA946eZsmnufm7p5TTvMpjRw7zKn939vvwZt2Rk4KBouoXVdTStSIsYsKO77YxQT
HWIIFqspHxF5npkqWxBVIORBjfEs08Sp9Yolu3ucltNVcaDvSZzaOCjyqkopLjO5AgRsWE08V
/WJkgyQquZ3a5GATcSR1mjeb1e0=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3ffb91a1a7..11548f526b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -306,3 +306,25 @@ (define-public tree-sitter-elixir
(license (list license:asl2.0
;; Files in tests/corpus are under MIT license.
license:expat)))))
+
+(define-public tree-sitter-elm
+ (package
+ (name "tree-sitter-elm")
+ (version "5.6.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elm-tooling/tree-sitter-elm")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0b5jpj8bnil1ylisyc4w48j8a30dyf3zylhidj73mlrb8rf7xm2s"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://elm-tooling.github.io/tree-sitter-elm/")
+ (synopsis "Tree-sitter Elm grammar")
+ (description
+ "This package provides an Elm grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:23:01 2022
Received: from localhost ([127.0.0.1]:60816 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQi-0000MX-T4
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500
Received: from mout.gmx.net ([212.227.17.20]:56135)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ7-0000Hz-1A
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MJE27-1pJ3zu0xxL-00KheB; Fri, 25 Nov 2022 02:22:17 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 12/32] gnu: Add tree-sitter-elixir.
Date: Fri, 25 Nov 2022 01:21:22 +0000
Message-Id: <20221125012142.22579-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:FKm2Akp1M773dgloOpMA3YIlVY0Wz/F4HsPNMrFou7eW2ed1uon
jRGb3CUfLWBzTR5d1WJBhf/k/YCRxLz3U6GZ6EJWXZf+U6zt3xSIwjCrgjYSdlge16DcqkI
0w9wWDYY7uprs4SHc9gjPVKQeTkvPvvjfEUSajm+pIFstPfy0SqFza12I9dQ486obB4O76N
6f3GPa89gDhP1NEx51pHg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:avzB6Uemsgo=;yLJLjrqxwOwRwcFyjyRPyjcz2/z
hglQYJWO3QPnMdDzq/ZX4zg8c43Xp1jbWjQkHh4zMzRRvveEtCf82q9jiuJ/nKtX4tT42HYxK
g9DvOyLJhBHUnYHe02Hk+ZeT4ydmsKLaqMoeaAlU3Y5f7Zqe6XzJi7rxunVTcOIgy2zgclnTj
Yg48LuWJOqaEzY8j5b2YyVNSH/zkOZwRG0LomA6PVorGHgVHWoHSHrNkIHQ/UZM2Wl/nrwPEW
TEl9qiSZePVi0NC5ZtDreT9wja2FdF1hS1sRkDChdJUileF3DoMdXfwt3jp0y8EuCbnVGYXA4
aBbafjFDIIOzy843iPciwmFVUyHsYcoNS7ctsVirkgo9kCyiEijBrqRmzPL+S+stofVMdaI7n
OSu+h5o9KkIvxn5Oo/NhWCUuQH3/zHSSypPT6Wtzi1BUxdl2rpp6M6S9DdkuptvkDiACXL42l
9Ij+KTjbxtSGHfwQJdCNpzlANV/OjiHSbixar60KwU43cA3+o+E5+iAwHjicN44EVnEjWH+KY
N43IQMriSEPNS7Jnnh/0oAZHgkrry2/NLs/hdyw/WDpx0xbS8UQigW4DHhDYfn5W2SBCIWxev
J5lQY/es++J9u3yGm4T+mSHNOffLr4+Sr5i14ik6aSkgFYrAoaTursbb6fUX8KGa0W69kX/ij
eth7nnkniSY+j0jgLNmvMcUK2j90zejndGHh69lhjimF0ppMgwq/7oljRwgEQp/xsnnf7X/Q0
6UjZJafD2yvIKE3UHi+aOMlAUraIuhU/2kvwRpgsa9OWnCZ8Z58SCP7iHgDFoQ3fNy62aBINr
UifjBfMgIkX3ykRcR0ax8O/5CQct3acmuqgx8bga0PQJc2XkNe50DCW3JcirQAP9ySjLOobRd
03+SY2FODFqyNIZ54yAG2rhGJTaBEwRJra872Vpl8E0RGasGn2Yn2G8Q+pMXOHIvIpXDeZpkK
qhGsN3HjIWr4c06wS2JReF26B5c=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable.
---
gnu/packages/tree-sitter.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0f65e50440..3ffb91a1a7 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -280,3 +280,29 @@ (define-public tree-sitter-css
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-elixir
+ (let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869")
+ (revision "1"))
+ (package
+ (name "tree-sitter-elixir")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elixir-lang/tree-sitter-elixir")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://elixir-lang.org/tree-sitter-elixir/")
+ (synopsis "Tree-sitter Elixir grammar")
+ (description
+ "This package provides a Elixir grammar for the Tree-sitter library.")
+ (license (list license:asl2.0
+ ;; Files in tests/corpus are under MIT license.
+ license:expat)))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:30 2022
Received: from localhost ([127.0.0.1]:60814 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQE-0000Ld-AR
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500
Received: from mout.gmx.net ([212.227.17.22]:32893)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ6-0000Hw-4Z
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N63VY-1owOJ61cIC-016Sk0; Fri, 25 Nov 2022 02:22:16 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 09/32] gnu: Add tree-sitter-bash.
Date: Fri, 25 Nov 2022 01:21:19 +0000
Message-Id: <20221125012142.22579-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:Aom8K/NrNs8SmBDw4rYf5Yy29KnAzdrEdk7bkr/19OFK3m6X8f0
y633YIsuD7FVklZy3QtPluXvBvv2azCpKKYgMaEQQiNGtG4E6IGSK7yGdogxgZCnY8doNHv
1YIFe6pdM4JpiDCCXaWXjVb+sRuL6uM0y2Mt4PAy6c+EiNG6RCobSIeJAowt+0fXf2/Ttx4
gl/xsZsb0tIP5iH8uzZTw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:uAJ38Q4puXM=;IqC0AWkXctcfH6YpRzl9wePXxZ+
TaaLgSJW2MAgrI+PJkWa12Cw9iUpw8OHLMzXktPH9iz7LGc8YuyUJOq7IC2SDyFDeF9UZ130Y
8GzR25/dtIS5yrlKtu2oFJYOCFVzUPbbAIdiWJXankWLDFX9RIhshS2z3tSsRR1vu0RFWShTC
JE5xDCk7810qSK7ORrae6wvCFfzjIHbzrebP1QRaKIzRVFg5g0LticXQEY+nRVhvai+1WPDIe
5dVb/tAqzTWclK0QliYMr877cPxLZChQYGFgr2vNjcm3sBUO/JBwM7u5GYKyJpGZImvBzZnnU
Mr5Bdp/ZdoYMzZLlC9cuLxx2Wg8VAKRehz0AuaMwVyxi7/8Cdt+aPP/p8xJTOZY2iFwzMUXrX
nT0NulT9AAiBVYWSwEUcoqXrSeqjTI7u/hOROzKS2R9j5nGfhJJubeAr/1cSjRERhwerc6+TA
ieDCqOykFfXzsduKMBKw2IB5NHCtoPOZiuqLI55tmwvCcYDENLOj4itzwflFy8jqSDABrDauq
C+fadtiyx92DxU3ckD1Z7b7Y8VyYIzkx2hBxB2925iDePmBcZeBS5GC4BIGioO/7Hlp+zgkBd
oY5BNE0q68Cj6Ie0kXbhbyLRbCh7Fuhfj+zVFmX0RjLf8viC3ajlVlgfODdgmslUBv/I60AHW
XEfqtFAFBwTvgz0gkRqkmOIIm/eAXKNK88kzmvlWQLlcjQFo4Syq0PBVbUKVhxh+cirrq/rmf
5LAO6xEtCY4VoW5ie/lVY7T0uZ1Tao/zNiXv9cmQ8dZ6g26ifEAnILxCYBA35AnRaLGzKUVb0
80gRHD5YED+mbGZ9m21PANWNVg/4Yhc2c1hBw8nCMVkBCk4bW/hIlAPvKU7xT5UU/LhsU4qe8
Hf2VrtAmHb6nCqt0zJ5/5EgU4mflHQhAtOx+5l0j7c6Pgc7R/sQ6+euh8dF9NsoJbzl8Edtpc
7RLpjMLRjitYIk9u6/w3u/VNx84=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 63dc990475..f583dba24d 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -214,3 +214,25 @@ (define-public tree-sitter-cpp
(description
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-bash
+ (package
+ (name "tree-sitter-bash")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-bash")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-bash")
+ (synopsis "Tree-sitter Bash grammar")
+ (description
+ "This package provides a Bash grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:30 2022
Received: from localhost ([127.0.0.1]:60812 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQD-0000LK-Il
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500
Received: from mout.gmx.net ([212.227.17.21]:36075)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ6-0000Hy-O3
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mt757-1ojRzt3znF-00tUAP; Fri, 25 Nov 2022 02:22:17 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 11/32] gnu: Add tree-sitter-c-sharp.
Date: Fri, 25 Nov 2022 01:21:21 +0000
Message-Id: <20221125012142.22579-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:IjOpre4pGoIed0D8p+nQV/zwI79Q4m1hgiDL4uzyBzdRGxPPG6U
Rrve6b+VuX9zmvT6sIiLNGbTHKQdADaRSJBN1VyGTfpic66TzfuZXBbCRQsrkgX+ighWC4r
LbVCNon3aqlqUaaWhQlcJq2bgcTOzmkJIModrTF3+N4H29Yc3byAFXwZnvuponEq6UehkPy
9e2YXRnwqlaJzo2rtTdwQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:BuvqiKnp5bo=;53JlNU/9NpDxPsNIx+R4DbOwwSu
+8Chx/CLKAC16Az3C6yyGzN3NKlKE5XF8coRyUpZQSchAHxCrQJL+Bl7LABKjhZOcaVP6XiL3
qg8LVhS3o8V+QUDxtfE021/HPnOL1EjSikshGjmwPnq0dYdy1gDSs8n3Mq+NH7Jjg9S+apbSZ
wXRYPu5o4T7kcL9gTUz0/G2avICRt7ExZSKGMFzta9NzduI5nd9k/LQ0O5XDFsI7n5QtZJQwx
Qd1z8M7je2ryzz5NURz9RPUjj1cQIwWwwP5ghh5dURrdG/D4RtUmvvtDNlQF4MHV7xhcgHEVo
SWUl3W8RKIT4xZW61pc3FmW34pJmT1j8+AYQgWogOl7DiKR2wvHVz4wAnqmrVx18yT6gsuLHN
uLFFMa3X/E6SPbhkwihcah9Ko3kpBHP4ugGaAijIpgyn09qx2If2RyP5E19jFdf6k/Aqa1rW6
/k/6oHTNtkmVS4cg0fNLw8IsmV99Gk7qfK1fjTFHEmruNzU54GuackSMBMaeNZfgB38aMiOx0
3oF9kYldKv7IisTzjskOY157e/q9+o+3yQQqZvFAxhonbYMpUtTuOPezHAH4Vt53FrZNqCgXW
DDvqnG/IvuqEa1NtxAh7O7i+J4s5JglPDMS/2sn57pcf5ok0z9EcfrQeH7vRZZ1dQ4MbBUthb
vtV3rtkF1BQMzAULCfnA6p4ZEBxKxTSL6IES0D0CWRcmTd1d4+58ZDZDBfRWXkffx7wHP2FQP
zjayQajIZ3tx8k0FKIPJMwv9Eoouert/aBWm4U92/HK3sc8tezH67FSjIhzE3V+LkKXnn6stE
8TaS5RWdgUXwY3R7aWf1IBaCjE3xB132r8Bw0x8JaZx0k1s6IgQRUKFmwZ/1X3lTAPRF0YEV8
/qYP8fBgnEGYVyWPV5MEW/TvFDymh4vyQD+WKw6IYxrQAiWdXjhVSikICl06elirRherTkoFJ
eWqo5nO7CehwoCB34w1LR4S9fi8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e3ec418419..0f65e50440 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -215,6 +215,28 @@ (define-public tree-sitter-cpp
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat))))
+(define-public tree-sitter-c-sharp
+ (package
+ (name "tree-sitter-c-sharp")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-c-sharp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-c-sharp")
+ (synopsis "Tree-sitter C# grammar")
+ (description
+ "This package provides a C# grammar for the Tree-sitter library.")
+ (license license:expat)))
+
(define-public tree-sitter-bash
(package
(name "tree-sitter-bash")
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:29 2022
Received: from localhost ([127.0.0.1]:60808 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQD-0000LC-3E
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500
Received: from mout.gmx.net ([212.227.17.20]:56183)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ6-0000Hx-FV
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MHXBp-1pBrxZ2nAH-00DWdp; Fri, 25 Nov 2022 02:22:16 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 10/32] gnu: Add tree-sitter-css.
Date: Fri, 25 Nov 2022 01:21:20 +0000
Message-Id: <20221125012142.22579-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:MMtvAltoHxJdodTZARB4CfBMfplTdcqbHE6jLEzMmLLIFEImdUR
WOvwUrL6US+CsiAVj2uo23fX4PvSFelQnb+vB7aMGnTcYcqATBuZU9+8ipvn6jvQNkHRKxK
7ipQjU38Ax9AibYCbeZ1izwlZyxIzyI80J3X9wHi6OHa8Pi3EC+sG5WwxQhud13D1U1tvU7
aaTa4eWRop0iKcDkRteeA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:zV6q4wkBN7E=;5oTwuSUjtzU/tYgB/7yd93S0fBK
mzZh/tUs+YgQzibFJilkGooQiO67zjw1kH0QmoAd/jjYePAAI1c2E6HBlk308HVxhKvwV/N+s
zRnra8Bx2V0s7Z8sj4m+OewP1JHMxsyzuhN0B2/zx+eKWRrk6G0Uq6OBMPh3mMuCx52MsxSMd
buFtcsnf9qKPxmRREvqWcpB3sNmHU61Y5x3jTfVdQ6kE06kjiBEQsqjZZAXxdLqZ61hkeIO4r
7ZBcuvDyThWRMthLB3kdm1q4gPrIdxPHdOPMuB/QkyXDCE4NuWyL9THwS99Ptmz0hjDU/5nma
oFYSeTwOEkw0xM9ILTLE0NNEnG1ZrodsK2ed80HSOaQDOR1w3pSCdeyVtOdDRtHjub7Fqahjf
x8omU12OAlD2xswAXE3199n4RQcq7pXNeXcmFupcCP3oRQLntHPascDwhZlLrrQGG6n7BW+jS
ke3TDYpLnN1B7d1xf1EdZcL9uU+sR8A4eJGRe3yudOgiC306Sb0WZ9tPU61+oIEjOnWfPJba3
vzIrHR1EY+3ZCaiAs4PN3AX8u8epaDwABNsfi0eNdjXZZt/KR2d+452HG0C01I7IeLBVgjEsK
zOqiGjC5VCsPi1hnElxcAoVAHEAh88CRzDpyNV1dOIxeAYt5yiY+rEbnUhaUOheEbStlGfn9h
HiCbXOB+w5bIR9tTxrLYk2IIbto6naKbcRU/CPQbxf9UsqJOh9j4nf/7GtsTEQ9rMX/PAkGpB
jnWjEEEhQIcKFrhd5pQU9pnjFPh5Jm0UA1UwWdw96oAB65vscdfdI9u43YapMbMSoTzWUT/Xg
qZCGYfB2iz+gFRwrvqKNnDureutLoZoHsQn/x0YiSyNvRftiOCWlw/MWSv4+NjIQze2SBD4uU
6J8viZAxbs32QbWApc7Q3aS7bZHZG6hKKdvW3siNtPUVh6525kciS/IA+0oJh6vNfuhbh/RcC
FUv7qM4hjOclrgAUrpeycdOVyVE=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-css): New variable.
---
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f583dba24d..e3ec418419 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -236,3 +236,25 @@ (define-public tree-sitter-bash
(description
"This package provides a Bash grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-css
+ (package
+ (name "tree-sitter-css")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-css")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-css")
+ (synopsis "Tree-sitter CSS grammar")
+ (description
+ "This package provides a CSS grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:29 2022
Received: from localhost ([127.0.0.1]:60805 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQC-0000L0-DX
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500
Received: from mout.gmx.net ([212.227.17.21]:46285)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ5-0000Hs-CC
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MYeMt-1pU5Z60syJ-00VkHX; Fri, 25 Nov 2022 02:22:15 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 05/32] gnu: Add tree-sitter-cli.
Date: Fri, 25 Nov 2022 01:21:15 +0000
Message-Id: <20221125012142.22579-6-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:qoBq7buxWXVdHqvLlWZM8r/xXeCzIj+r3df4fB75cLkdNhbVEQ1
9DGXDm2NqqE+yZErpI+hB9t+nehat1bB+F7DN7mlyGbUPewsL7+aRNdMv9hXwuMpDsvIb48
Bhs2u/VP2eUTcf8finlwajZFjf9ASvHfb8ZKS8ANHUcw1/ZqPpVaPQMMcTdIuHo+3U0NSaf
RDBoXo1qnt+DqlujzXMiQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:/F9I8hV/+eI=;IUD0FUj28z5OyhC7s6FXNkhO591
Jbgsybm2SDngbFffrhA7ZTqXi14Z5iWWsxNxNqiuMvwyr9SRao1AHQImUYWTuOBzamjpk7kaD
J0huQs10S2jGXJv5VSmIKxBMdFB2BfgbT0Ki1UEu3g4tkzwaV8yd7Iu222phQxiWk11aVLrBZ
DKf8CzsIKO/V/PZ3+sOaajGDapZ3DNX7asfVP1fhDFBBXHg1J4Y4k0EoKX87ZPB1ytEk3vSCq
csXzPnQzLs63633BPBLlCkglQf1u3F3uRJoi/+/ly6ml+1DPP4sd4fSOkO6QUsTyFHgt3e40V
ynai6iYLePEYzSdUZQDuanWScKlOcXjTNRRQeYSdl1Z76BlX2+pr7C7UOewaLSZ4521kB9GZh
5xLNSWS60NAesdowRpSQcl6VDtcPjvKVEr4ZuxZL2nEBPMyTZEYlFMKEbOoGmEOspTM+a5hX3
4CBRq5tGSV6Ta8J2GTFxhgIuPCmzXi5IPQCOC0T2A/hTrgFk8CQjxnjxo+kb64/I7LTG4FzQr
ktIvoIT4vIV8/1dmy+zMe7smKzjxbj5/En6O8P7JSxdbsy/J2PbLCMZv0TTFYs/pPaBnK08FH
yK5dYn3kcO4FYJcLmXuJnothELp4bYyqxqnl+zdy5zwsy5eEOLQL3AqXqE4b4pGElRx5lHUE8
Droeo/IwVF7VY3mTbRJ7UwOQmSnwRxoWGhPoYzb+4Ksq0F/iPYltPpMTzdR/PJ5d2yKXhcb9p
NOsl7POxBjCsedcs3PU3ImkNdanXqyflNynoZHlCg5y4a+QJAHTZdN5egCLml7j0kGscc75DT
5x5en/3mJ6zk4W+JnPRPsrpdz2U2IayNtfoIF6GEMXJRYcaJklqlY4uaWqG67PbBDmr14HzBF
yPMU5YjaOH0lGIMvGoi8WucWujXScyRm7ze6Z3nxXirGjVVtsxDzvtKigPo7ZHlwh9wi48P/o
EXPwF14I5nuYTTaKx8oR4ZNvPps=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable.
---
gnu/packages/tree-sitter.scm | 80 ++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 8ef4e87e41..30bf17b79b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,10 +20,13 @@
(define-module (gnu packages tree-sitter)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
(define-public tree-sitter
@@ -76,3 +79,80 @@ (define-public tree-sitter
This package includes the @code{libtree-sitter} runtime library.
")
(license license:expat)))
+
+(define-public tree-sitter-cli
+ (package (inherit tree-sitter)
+ (name "tree-sitter-cli")
+ (source (origin
+ (inherit (package-source tree-sitter))
+ (snippet
+ '(begin
+ ;; Remove the runtime library code and dynamically link to
+ ;; it instead.
+ (delete-file-recursively "lib/src")
+ (delete-file "lib/binding_rust/build.rs")
+ (with-output-to-file "lib/binding_rust/build.rs"
+ (lambda _
+ (format #t "fn main() {~@
+ println!(\"cargo:rustc-link-lib=tree-sitter\");~@
+ }~%")))
+ #t))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; We're only packaging the CLI program so we do not need to install
+ ;; sources.
+ #:install-source? #f
+ #:cargo-inputs
+ (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-anyhow" ,rust-anyhow-1)
+ ("rust-atty" ,rust-atty-0.2)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-difference" ,rust-difference-2)
+ ("rust-dirs" ,rust-dirs-3)
+ ("rust-html-escape" ,rust-html-escape-0.2)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-semver" ,rust-semver-1)
+ ("rust-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-tiny-http" ,rust-tiny-http-0.8)
+ ("rust-toml" ,rust-toml-0.5)
+ ("rust-walkdir" ,rust-walkdir-2)
+ ("rust-webbrowser" ,rust-webbrowser-0.5)
+ ("rust-which" ,rust-which-4))
+ #:cargo-development-inputs
+ (("rust-pretty-assertions" ,rust-pretty-assertions-0.7))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib")))
+ (mkdir-p bin)
+ (install-file "target/release/tree-sitter" bin)))))))
+ (synopsis "Incremental parsing system for programming tools")
+ (description "Tree-sitter is a parser generator tool and an incremental
+parsing library. It can build a concrete syntax tree for a source file and
+efficiently update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@enumerate
+@item General enough to parse any programming language.
+@item Fast enough to parse on every keystroke in a text editor.
+@item Robust enough to provide useful results even in the presence of syntax
+errors.
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application.
+@end enumerate
+
+This package includes the @command{tree-sitter} command-line tool.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:28 2022
Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQC-0000Ks-2V
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500
Received: from mout.gmx.net ([212.227.17.20]:35365)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ5-0000Hu-QU
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mwfac-1oo6pm0P1u-00yBGg; Fri, 25 Nov 2022 02:22:16 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 08/32] gnu: Add tree-sitter-cpp.
Date: Fri, 25 Nov 2022 01:21:18 +0000
Message-Id: <20221125012142.22579-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:q9+zV2G4nXI1ER3U9VHN4mTbVlGRCjChS6JIUORsnqgbDeVQ8/q
si5zMYCtncVNzhxuokEIKLNmtuVHRTJ5mKjxD8JADvrBxzU74PRa1rbDOdf3aNMbOBhZpDi
259dkTQqw0qkoSxl4EDxFyN5zm6WLf+jIL6BvcE//0/zoPyyaztdHUigNqFCca+j9elM0JA
I0j/BGdS/Zk4c5bHPfaEw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:nc7Zd2laMNk=;2TzC9nHvdbYMWtI7vSjeh7kL3Kv
Q0rFB+TYp09h+xyz57Ib4cAdWQ2EvXgiDI6bydlO+qcmCn0QkRxqdtwwRYU0uh2s9wR5beuLQ
whg9T2MUXCXvZs3dMKicTIziDJXyHQT9Zpm83gaaU5zjod5Of2aI1CpsnIc1kuyMYHbJs7KeB
fbz0T3TTf64KZQSRLllShYctn3NjGsyudYE0t72jsM29MvWWhevdk93fwCekjP/uzGnhnwSmC
X8V/6x47qwYJz2ZWjslkWKxyoEZitwJnGnlMY7ueBxVtypu43iOeHkPvnvfYx5eStJLH3HFmF
nlKHuk/e5evAE9DX6Y7HOPbv7zMt+T3u6Pq2670mLxYIeAyV8Ke8zHzObwIwkSwSNlPG9Eru1
DOALThIh+009//olhyApaiaYIZmlItmgv0y/frpjIWuBLE264g5tu2F6p+kbvwl0fd7kZyv9Y
ek3FqIgMfD36OuC/A9/OU748YjuUUsKPFjlHHyCXzWahs9VcDH8rjAeJskeb/OtCFJ+gTSP0Y
Jpf//XBIsVF8GJQoyrNWf0OslrMws8ZqLLiiwlRABjZb8iLBMZe9noiMvZeQ4YlPBY6r5/k8H
UM7BErg6IEIJkNPr+kfTk3mvkvtyRRlk3ngkG7jT0YMl1bUgYmkS/ygwG01h2LXhbRGaR/scF
ggzcB0rDqJsvPrdGPotBmbOanR5yKIwNidgw+CNsYewuRCyRgKv6nsD575LTOiWaTHd+i96S3
BB7cELHoI5oE5+jeXlTEYIHq/k1qytR5fueRQZOpokP9Cygd0gtvdXJBW4ClrfTI+4GXQd2KU
OMrWbWJ0mmXQm5SQXWf5ykR7iGL5Y6diOT4Hf3jfK4iUHeq4Y6YbD+N12B49PPV3ZInO0zrxS
n8vNmPVFIYYS7FFCn/riERvW2wgiSatE/F1C+8IRK4V3n/uO9ZMb8eocxF52gZSY/MfsJowyB
9FC0DU/2BGex5BqaavTaWEOi3ZE=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable.
---
gnu/packages/tree-sitter.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 4f75b0251a..63dc990475 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -189,3 +189,28 @@ (define-public tree-sitter-c
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (let ((commit "5ead1e26c6ab71919db0f1880c46a278a93bc5ea")
+ (revision "1"))
+ (package
+ (name "tree-sitter-cpp")
+ (version (git-version "0.20.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-cpp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1572qhfw1jjkm1q6c110lnnj2n384a97fgn645c5q9ikciv8kac7"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (inputs (list tree-sitter-c))
+ (home-page "https://github.com/tree-sitter/tree-sitter-cpp")
+ (synopsis "Tree-sitter C++ grammar")
+ (description
+ "This package provides a C++ grammar for the Tree-sitter library.")
+ (license license:expat))))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:28 2022
Received: from localhost ([127.0.0.1]:60800 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQB-0000Kf-Id
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500
Received: from mout.gmx.net ([212.227.17.21]:53837)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ5-0000Ht-J8
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Ma24y-1pUMgF3MsW-00W1Wq; Fri, 25 Nov 2022 02:22:15 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 07/32] gnu: Add tree-sitter-c.
Date: Fri, 25 Nov 2022 01:21:17 +0000
Message-Id: <20221125012142.22579-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:YTmjXcfBOD5hKsLZWQ41th0dIBMkDBJ8yroL7TCbkim0PhN9L+b
FjqaC9tG2G86VaneE/USCF7vvNxAB4kiwiQj9Y/PaRmM6auYgmKzZNJgWkwaZc8+TpQA2bQ
60+4KfYZ4YhMpV+olSoak7pYPzZIk/tl36TI75aQo33l1HFRVdNSl4/IdaLqHyEalsjk3cV
88Nt1F/jeDmu8nb9+3OFQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:MhVCACDWQXY=;8HaIE3znW5dBSZwhG9wWpISqarp
IfIe3Th02OeJi0HT9osBYpyz/b5Mh4vLutbIn2Ilmbxzmx7TtSYvI4Ph+/rCmiO2NvyUlKGj3
6QfKUIjquKVQipq4zkMPCGVXCNlbeYTE9FOjONOfb7bOTvmsumsJZ+O9YAFXfhSkKFijC1hS+
5KiTPsUpOa4xMa2ddw0pJt3mbF4pn/GYvQ2L3rUiYxZT/8ydbEwqqmfgW+zSOkdYFMl6lxnGZ
Bttb1yQ4jv+s/uOnBg+QflncmLSqmImyZaECcTOFhco2HB/PVCbihHLlbReLXuZIjmBKPskYs
IRSr8j6HMEI6woV5hbT22DewA8A3HEewWrvOFWq6FMjif3fFI8j4QWMqC5IHDxMVu5CzGzMdm
PEmyzzpG1W3vMS8TwSUKjhuP7jUrjly3wiWP4zsYpxAya2qE5QGoxDZtNfZIGFcdg4qLczu5t
DBEAEvr2uJZ6VJj7JsU155CY8I9yDWD03XlFXdMPTf9CdGFbComcKZ4H0qY+mnnq3t9Pue+yb
oNt1vJQWx6/nAUYrgUd78c3lWJ+9/e2y+jRcKeDi11KiV2K/oh1O1juzZ3SHesqPPpiVm6+x1
g2piG57Pssxwa2UXrp44f6qj0G1vMtFsxghhCmYZltr4nkceGGsgowLRLwLnl0WtlBMTSABhJ
9JbCwOJxy58LkaLHRq7AABDWUsbTP9/nejj6BoR36WMYLxOP7jhyzeqrsELNuNiXagHpopM+X
CZ1QIqxJGZW43TZHfgCz9PecNdedGkb4ZhSyWZT+04Zh6KlORzsJFgyz4s51Eab4Tj1rk7T4h
tPZCm9wvmWTDxuyb2HH6nfZcMD/ZxY3D+bf/tg6SC1672BGLsG2AyVH73LaVwpT/vkkgDBUv9
afuZRxxJibAWZJ/WBLXY8dk3Nh7nLcmFZygJ9817pkFu62WIUpdeezT1iGCUN4lKU7sSD0Sa8
n+qWcR6D+hzOOw8UHmCZj6qHtzg=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c): New variable.
---
gnu/packages/tree-sitter.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 30bf17b79b..4f75b0251a 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -22,6 +22,7 @@ (define-module (gnu packages tree-sitter)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -156,3 +157,35 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+
+(define tree-sitter-delete-generated-files
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")
+ #t))
+
+(define-public tree-sitter-c
+ (package
+ (name "tree-sitter-c")
+ (version "0.20.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-c")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-c")
+ (synopsis "Tree-sitter C grammar")
+ (description
+ "This package provides a C grammar for the Tree-sitter library.")
+ (license license:expat)))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:27 2022
Received: from localhost ([127.0.0.1]:60797 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQB-0000KY-5b
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500
Received: from mout.gmx.net ([212.227.17.20]:52485)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ4-0000Ho-O7
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N95eJ-1ow8G12iox-016BUh; Fri, 25 Nov 2022 02:22:14 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 03/32] gnu: Add rust-html-escape.
Date: Fri, 25 Nov 2022 01:21:13 +0000
Message-Id: <20221125012142.22579-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:j/GBuCaTupN2hxm4kSPiIiOjEgb3TCYrHA0a04irikdHlnG8rQo
zi2tQWqCaGITJDfQd7e+TP2ZZubxp/nJGgyNJJmI45g5/Isc8tqMmhCFcokp5LL7/3hGLdj
7aammJTuvqZuOYiscLXLCCxrfcKlMiRMaTeQutGn+Pj7JoSyDV5Z+T+9N+HBvYXQUbSx1Wv
DRmK88JYUL2fyCOvSLBxA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:oUbA3+6DPl4=;qLrMYBz2B4K0V7a9xMnOWCvolf5
9YaLeGaIqx7bQHG4t9D7bCi2mTrDh+eopgd5w+GUHj5Xpb+ihcMqnT3HuZbLl7+h35KcrCKYz
39zEKV58Q8C/Ceak71oCvneC7gBkCgDl9njmlH3/w41v85JLOmJg2hIW/4qZeaGLbPPKXTG3T
my0ViudDcpXdBJv4fnxiiSpDdfMNxEbtybkM0fVzl+zxD2agBRhGPa+KhGRCNl6wBRAJQfwI2
x6DoSNYiBVryFDFcTSvyA9QhOOWpvn9oO7/T7i+fe7XZArIBJTMtdnAPEzPUxZ7XCnNu6Qmqi
WLR0udbZX8/O+yxVQ0JS2WoD+Muxx1/PnUEs/lTcyWeuen+cBOLTWtCyF58VSBCMXJJaVm5kz
gVpOhl+jqgCC9COAt0mLNBX3/60MHHCFNUrxyHHsj4Yc2HBi2Jmz5vrLmkLMX1dnORaY9TuRv
brPUdn5ZDstJFSnOlwirHZR2f9XaEpIByaIstU1N8g1Sj/i7C0CT2V+bRS6Z+suiAiDthcSlQ
IGXNKhEi42nfZfI3QbXOcaL6oietW3cgQmskTYoetdY6lDMT15kVQHSR8FJiifspekS8tpOJ7
VnfzOMfKksWD9uEDX+OUIUncV+orDnDAjWdM3qHU1GsVz3azTuoz+oVjDu3oKedrH8YY8YTS3
vZvzSc0MBEV3tlBoaz5POXzDHpNcyA+6NpWLV3RlXEuqTbpdW9tg5wGDc5DOLizfsnHsdifEC
GFlCZ5+/eikVMgvoZh4e/ql7KzwC1ic9ChhQ2AHc/YELGtI6C16LFPHpZKm3wFSYyzv1Gd5ro
+QzSblZSxee4JNcnu1ykqWXhm1mt1aWblSSvwFGaboc8KdGQcnORFUWuHNc6pI5ijNSebGOAm
ABH0nNVa8SsT1frracsNu8Dom/QNvEmgXT5ZYpViuMDm+dX0ZekHAvQWqJRzGjgY10b14gwfe
i3smHg==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/crates-io.scm (rust-html-escape): New variable.
---
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 792779a28f..cb3d83de5d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25913,6 +25913,30 @@ (define-public rust-htmlescape-0.3
"This package provides a library for HTML entity encoding and decoding.")
(license (list license:asl2.0 license:expat license:mpl2.0))))
+(define-public rust-html-escape-0.2
+ (package
+ (name "rust-html-escape")
+ (version "0.2.12")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "html-escape" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "01f2v3c6j2rk5h2lhdbh62j07cm1fvzqw4vplj2sms83jpx5qc8m"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-utf8-width" ,rust-utf8-width-0.1))
+ #:cargo-development-inputs
+ (("rust-bencher" ,rust-bencher-0.1))))
+ (home-page "https://magiclen.org/html-escape")
+ (synopsis "Library for encoding and escaping special characters in HTML")
+ (description
+ "This package provides a library for encoding and escaping special
+characters in HTML, decoding and unescaping HTML entities as well.")
+ (license license:expat)))
+
(define-public rust-hts-sys-2
(package
(name "rust-hts-sys")
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:27 2022
Received: from localhost ([127.0.0.1]:60795 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQA-0000KL-P1
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500
Received: from mout.gmx.net ([212.227.17.22]:54707)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ4-0000Hn-M2
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MfHAB-1oWiZp3uih-00gmqF; Fri, 25 Nov 2022 02:22:15 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 04/32] gnu: Add rust-smallbitvec-2.
Date: Fri, 25 Nov 2022 01:21:14 +0000
Message-Id: <20221125012142.22579-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:gK0VlDPPT7teCYlck52FBCQ4uVc09jn/5f3Cn0aLzOK42ETfeVI
27yOi062U7Z79ay+M/q3a6MUsYDAuHTwhbQFCsvoagyXZfjnINVBuhX6vVF7NOjfhxgWZG5
L37idD+E3OsfpbI/NL2VmTGFV9/H01P382KLIfIvWMJkLSnw7xLZ06HInkiPFK6gXlMjfkN
3o/5roEpVZjK1c9mVSZ2Q==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:lsVgqErf/7M=;kp2Mi7XnGuJYGh5eAgRVXdXmJGC
mYjMQT2FkrKOyzxUWzjWepBuPwByGjONEUXwqpFsg6BuvwRSaZptj9+4ng+vDvYau8XFadvYi
C4NFtnfKm+oQwLwrDLlpMpAe+I+Q5pGAz7nKoSgGGWzuUmKWgiIlrCoyPTvkv/zFNLuT8jhMI
/NYTjqCzGBBweDSl/2V0fabuCbIO+5WqTJqLVIhj4PTwa8CIwi1wWvUlUbcyVLLMYlGdIhRlQ
5gcqL89XlSfOS0pa9cgLuRYhpby9Sm2Rwi1MCKDX+3PY/a0GEDFULCEiVA/ewZ9H0vhPmP4bQ
GYqA7xyVdO4kjazs6AJaxHn5IjIFrV6vFsvo2WlsFlKSgKabPsirqSdyFKZcLgoIR9Qjn7ZBm
wRB4EPsY0/b9kFctbA3EDd9qO5lynvNwYcyNRSOTIsqKSo2aHhXis7rpm2C7i31245GzcRWOC
Ae4C1kScU9zN0Ix0cMwz5XeEFtrrqPPdzpp6iV1M8VRKZoLMBpYftf0csoq+MgVZ+dfzzvFsp
DllyO1yuwdiHd0B8hAkrQGl/BLBLrUQUd5H+oAKhemcaEky9KJdyEEVZO+vLXR7n1KCqIvHJ6
0GNiadu1mBieevZfpYCcOQy3psEAajH/Rt1M79gTmm4bDRgvH9HemV1Ncv6oKMDHt9HsxpjSE
K7XIvnC5qa4zzTz/6qTS/nWOaiWrjLmL9Qb0Cw0kkB/CFo0WBMVGb0ubp9iqP8nfBHfHqFSwa
GKbnAAB8PvCvGwbQM7HZtzBfRWtPC7qq+jSARU+xv0emqh5kWyaTeoRmwGY/rqxEWih2Vzodm
2v2y1znPieDyMHD/uO7G4ZkyWhVkBxPVYsIkw5jDHJWRcBHrJU4+3Jx/SWGEmN6Pq7ziwswW+
HRNz2wIJssh3/q1knyTbsujISfbF/8Nv+M/eMxgXLNR+elR/8dIv4GMF302Yxt3fDYh21yoLG
hTDR2INGpV++IUab8dnVyk3A3iM=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable.
---
gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cb3d83de5d..9ca52587eb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53163,6 +53163,28 @@ (define-public rust-sluice-0.5
I/O programming.")
(license license:expat)))
+(define-public rust-smallbitvec-2
+ (package
+ (name "rust-smallbitvec")
+ (version "2.5.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "smallbitvec" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0plrbldsjpwip3afbzd8fgrnvdhizcg5z4ncfqs4q6x4qjflzkkm"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-bit-vec" ,rust-bit-vec-0.4)
+ ("rust-rand" ,rust-rand-0.4))))
+ (home-page "https://github.com/servo/smallbitvec")
+ (synopsis "Bit vector optimized for size and inline storage")
+ (description "This package provides a bit vector optimized for size and
+inline storage.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:26 2022
Received: from localhost ([127.0.0.1]:60790 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQ8-0000Jo-S7
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500
Received: from mout.gmx.net ([212.227.17.22]:38713)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ4-0000Hk-5C
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MZkpb-1pVC1h0M4d-00Wqk7; Fri, 25 Nov 2022 02:22:14 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 01/32] gnu: tree-sitter: Move to its own module.
Date: Fri, 25 Nov 2022 01:21:11 +0000
Message-Id: <20221125012142.22579-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:6WxYIqMF3fwzXWIk77MKVzNKTEVf65VP94CilXoaVldj95zpd0O
VZAfcWnGGE4POzbaiKwqGiue2oTUrk2UGQ4/8uGLCKhpS0xJdCBXWNIiKHVa2AH4qfkm8hZ
ougV/oCL+56k21pDLl1NGD22PiDG1ggidd0IB/uit/sm9TvZ5HgptoeF+klAj7azcEubCcJ
R+jeRnPY1wiXROebDtxQw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:dwukKEOGV+k=;k99kAgy/DMoRmXwNjIjFyRnsvgv
ODGs+YJLLnNqwUOBFyAEYptFeWPXrC77Mkay2aZVadcBH9Z5poh50hfsga4we/HY9/AlNB6jS
BmUQFZQvHCzAndTo00Tdb+a76qaRpa8mrmv952Lg1bQ4pQGhZKX0B7iUJwenuYlG+vgEZ7e8q
TAvnycZ/s9lwFu/PE14gOPbWjlR795RCWvshWmvy3bkozGksFV0bL2ZxGwrr+MjsQN+e5mO3u
4tJC/Y88davMVUBzKr47Q/D3506gb0og0wFxZGt7gyfnbUHZOROesCyZOIQYK51uVp2e2JahI
ctk7rMIhElQXRK804mS5/g9y5WsVWk/LaMH2E6dQiaEQHfSsQDX1oPbjT5TkWTK8MJkXOVJSD
zupBqc93aG9Qo7WDEI5LGKcGiG47Cf1tpVs9wXCU/QU8rY/2KIF2eGhXGK452FeR6lgNF19Di
a3ip+FvgqvAnODcHMHAyvu69/8jRaYiUyR39Y8JeVqqUVFmS5F2xVCbXLNtJiJY3QL80MZ+IR
z5Xk3ET7QrnMwq+Bjkv4MIvDKW4bYYnSpTeg7UqD1208kgj0A1pqWDVJ5zr0lfi4OSFkQ2zC8
nBDw9i41GJpDJSpNG9JgdatV+oIZ1SzQJf8AweFQ+RJa/L6eVOz+6Sv6X6KOUXTtHBouf5igh
oJVePk0c9U6yzfxv+HQe90kxhirrWdQtdvXOFyl28EE/j7Ah1UJiWM7+5dHCtzzjRJuGiwuCY
E0E61BL4ntu02i5b0cMaN/f77KJtuOL/bdnaV6NchzPBILkaj56P7g+sme0M5SaqayAz6nvh3
bWCDGx1bGLO4S90CZyWtdjy9ezao+ogWBXGw508nUNczz/Uu5MHW1x11p2Pq+am3V5Dol+v5u
M9XE2RiR7eRiiohmrOHsrkZrSIJPvlhr+cXq499L34ra515alyxNtvD+VsCd7oAfiwh11Uo0x
K5gQXhkmD+AUWVK2BVW+A+9pfeU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/text-editors.scm (tree-sitter): Move to ...
* gnu/packages/tree-sitter.scm: ... here, a new module.
* gnu/packages/vim.scm: Use (gnu packages tree-sitter).
* gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module.
---
gnu/local.mk | 1 +
gnu/packages/text-editors.scm | 52 -----------------------
gnu/packages/tree-sitter.scm | 78 +++++++++++++++++++++++++++++++++++
gnu/packages/vim.scm | 1 +
4 files changed, 80 insertions(+), 52 deletions(-)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 7278c50e4f..7d11f4bb27 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -603,6 +603,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/tmux.scm \
%D%/packages/toolkits.scm \
%D%/packages/tor.scm \
+ %D%/packages/tree-sitter.scm \
%D%/packages/tv.scm \
%D%/packages/uglifyjs.scm \
%D%/packages/uml.scm \
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index ed77113726..57178e7b87 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -70,7 +70,6 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
- #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1219,57 +1218,6 @@ (define-public edlin
FreeDOS as a functional clone of the old MS-DOS program edlin.")
(license license:gpl2+)))
-(define-public tree-sitter
- (package
- (name "tree-sitter")
- (version "0.20.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tree-sitter/tree-sitter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Remove bundled ICU parts
- (delete-file-recursively "lib/src/unicode")
- #t))))
- (build-system gnu-build-system)
- (inputs (list icu4c))
- (arguments
- (list #:phases
- '(modify-phases %standard-phases
- (delete 'configure))
- #:tests? #f ; there are no tests for the runtime library
- #:make-flags
- #~(list (string-append "PREFIX="
- #$output)
- (string-append "CC="
- #$(cc-for-target)))))
- (home-page "https://tree-sitter.github.io/tree-sitter/")
- (synopsis "Incremental parsing system for programming tools")
- (description
- "Tree-sitter is a parser generator tool and an incremental parsing
-library. It can build a concrete syntax tree for a source file and efficiently
-update the syntax tree as the source file is edited.
-
-Tree-sitter aims to be:
-
-@itemize
-@item General enough to parse any programming language
-@item Fast enough to parse on every keystroke in a text editor
-@item Robust enough to provide useful results even in the presence of syntax errors
-@item Dependency-free so that the runtime library (which is written in pure C)
-can be embedded in any application
-@end itemize
-
-This package includes the @code{libtree-sitter} runtime library.
-")
- (license license:expat)))
-
(define-public mle
(package
(name "mle")
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..7116a10ed7
--- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,78 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
+;;; Copyright © 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages tree-sitter)
+ #:use-module (guix gexp)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages icu4c))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 957f00a92e..0c44c3c114 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages vim)
#:use-module (gnu packages tcl)
#:use-module (gnu packages text-editors)
#:use-module (gnu packages terminals)
+ #:use-module (gnu packages tree-sitter)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:24 2022
Received: from localhost ([127.0.0.1]:60782 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQ7-0000J2-85
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500
Received: from mout.gmx.net ([212.227.17.22]:54905)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ4-0000Hl-5t
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MnJlc-1oZFoX3MI8-00jH1E; Fri, 25 Nov 2022 02:22:13 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 00/32] gnu: Add tree-sitter for emacs.
Date: Fri, 25 Nov 2022 01:21:10 +0000
Message-Id: <20221125012142.22579-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <87mtfi63ut.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:i9Z8wB5ok3W/Jn6CKKcKnHRfvz8+CrS9Bwj7owZDzfWaqLlga8x
T0NL24SiMGuCIdKAtaVDH2aE7WiO14BfvFJYAZwnDcjzEQHROk9e04ZUwZYarNbG+IAzmhV
NY5uQ7vdJwgIBea6JZrptBsFGPT7kjKY1h/hHHjm93zdWqQ3xkWmGG3Hxg41Dtx54B9HKsb
B2vDZPwARHB0/FYq+GK5A==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:FVVuZICHRZw=;9jqZ8BWs8nQIaKCCSeb4ju52WVB
6QOKW79O5ETYE3oFWfA+2AGxfmypGA1Axc/qJKAP+AWKHQYp/5dgpSl/UGp9R23WtQodBmQ5A
DDDkhbi+RyKWXEiCrmaSvC2Hc1ExrOUwu4jONFP1v/PGC0FbcaCxdZ0bkWGhf+zih2rNdEUEb
Ur4bHCvg4gjs0db96xOJEB0ZmQGzNe6MYHtk9Ku7LByBIoEg70CLWVRk7K6T3N4myxapYp1Uu
yrIJbVdxFTtFoEQGKsOluNu0zExtyPSDSofwD7Zr45k+mrcc8HkiPwynUAo8nYiafuNr9inem
idxQi5UptgsaGVWMYw97i5/stXJaaUgfjqBeCJRdfVkNxOtrTk9rsjBPyXrfIO0puqtoBVWfW
2Vm30fJ1H4QaHZAAHNxojyDbmBrrc2wvy3c1yihonznaAWLDEeZ2MrtfsaouaZzq5m5kQsmKl
rTHyQ1jSIYEAvXPT+4Bno2WPvYjoHka6xGaYvBSK4+Lu5w5XIY4NAx/lSkn+zV0qzTKvdAqZt
mTmYOYs5ApmuerILWN0V4eDuQ8ZytaF6JFJBaAwbThZL2zZLIMQf3x8NOTtV3ZZEpKnwng9Uw
Ikv7OVurFAFXXBNZ69TcbdeiN3ImPfMkvUg1sdV267hy8uzg2cQMA+iQ6q55qQCT9R75eqDBx
0ENeaqhnN4oaw5Bg+cs0MwE6VMabP5EprSicqGtNMsZhC2SgqOFx5fLxlvD60QMrcoDd10JHf
fXSbcGypDIO0YVCz38e8m82O9a/b8ayVc5nDcH9RfrZf5Mtjt7/jmBMgm+k2+H4b1wMLYoD9v
gf+EXUCbXgFvw0So4kcXY+/xJa5jVkDR4Jaym82+QkMVgxwXGECHw+D0q3xzMe9Bu8i8xgA7k
t1bmrPolGjeBKqW/xgvTT86WkmVJ9zGESIQzt0xOd/vkK7NzDeoY3ttGI1djqKoQMGCk/eCIQ
e8c36DrI1Jk3ylpBjkHS192NxUw=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Hi Guix!
With the recent news of tree-sitter support making it into emacs, I thought
it'd be a good idea to make sure this series is rebased and up-to-date,
hopefully nobody's working on this while not being aware of it.
This does not use the new native emacs support for tree-sitter, so the emacs
packages it introduces could eventually become obsolete. However the grammars
and the build system should be re-usable by emacs natively too.
On top of rebasing, I also:
- Updated to 0.20.7.
- Re-introduced a couple of rust crates needed by tree-sitter-cli.
- Added support for R and Haskell.
- Updated some of the grammars to make the emacs-tree-sitter-langs tests
happy.
Thanks,
Pierre
Pierre Langlois (32):
gnu: tree-sitter: Move to its own module.
gnu: tree-sitter: Update to 0.20.7.
gnu: Add rust-html-escape.
gnu: Add rust-smallbitvec-2.
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-haskell.
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-r.
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 +
gnu/packages/crates-io.scm | 46 +
.../rust-tree-sitter-text-provider-fix.patch | 98 ++
gnu/packages/text-editors.scm | 52 -
gnu/packages/tree-sitter.scm | 1001 +++++++++++++++++
gnu/packages/vim.scm | 1 +
guix/build-system/tree-sitter.scm | 190 ++++
guix/build/tree-sitter-build-system.scm | 153 +++
10 files changed, 1513 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
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 24 20:22:23 2022
Received: from localhost ([127.0.0.1]:60777 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oyNQ6-0000Ii-35
for submit <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500
Received: from mout.gmx.net ([212.227.17.22]:56749)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1oyNQ4-0000Hm-5o
for 49946 <at> debbugs.gnu.org; Thu, 24 Nov 2022 20:22:20 -0500
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N3siG-1opojG1Uh6-00zpy0; Fri, 25 Nov 2022 02:22:14 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7.
Date: Fri, 25 Nov 2022 01:21:12 +0000
Message-Id: <20221125012142.22579-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221125012142.22579-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20221125012142.22579-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Provags-ID: V03:K1:ikdjNxpj2bid3uZ1gZ8L4ND392cW2J/aRaPfveMkTetG+Ko0Riq
rFrFsbZzj73dC3zAVptcutPUZFEnG9FPskIsA2A0fI0htuBi3i2iBUN/RHfJupBDuKLLMNG
yVgo/8U3eieEDr+3JJijTfzqFgWYZQjfhEjnYum44Lxj5WGeEWY+VN727PXaauPgtfVBk0e
Rwq88DBfExYuF/QhKjYyg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:QRVPRZtbeCY=;bHTQLJkdPeMEth8pZrZ9QWDriMx
SY7Gv6My+SxpnieB/GglivMlmqa4MfU0Osp4hdQg2q24XI7zDaLqOl3UIrSHsGELH5KcVunDi
q6NrFMUK0f6ZnTv2ujGq+j0bUuHkbcP0+B26EoR/LuqaW71DMs7aIFWhHFdvLTyKBgGXyBas8
NETe2xlN3k8D5wc/yZwWSl+I365A+TxIvIzoQdvc8EFUNq9u61c1og3sgQI7Cv6LaSWZwE6Gv
SEz4wRpartrOlzfPLI0iS69wyCTVcypFSR0tr1mICShWJF+lvRjB2tp5Arqhlk8Hl72ySYS6N
RlqHW7IIeqT5fgdpHoqf2mW0yto252XOJj+23rYG7+9Rrs+W6o8RWTYnqNPmI2Pt30vFnEo0M
eDqJhPxEn/2fQck0atzqV6yUkYNaZs/5iulOEhDLkGpEgQnedFnT4CmiNe+LMAVSxQ5FMkDZD
Dq9VQa6OqttXDkpXsFvTVW5j26LBMxdtKmwkgKhB/XPoZnNJbtvvQFm1+fu7eIo92p2fxX71v
24AmQS6DYJpFyzWyiEvqTGALNFYAsEGKJwz+5pidoRvCSztJ0bzcJKNmHlmATpuAYLbRFe4jY
3EijJ0LwZ0Uwh0wjmge24mER9jDVucVJcZ5TgWtDfeVm+LH8eg9fF4FYL4tFYDmR9r4MmlDv0
riiQQz63cDhL/YAgEKWss9nm/toqVXEMw3B0V9AO+waJlJ5HUiJV/+WiSvlEcyY72I5oRFhXd
2n7mgbL6JzLOuezaOXO7uuZLJb8Zk9O2ickenlH0JTKvjbQ9YEnQcI0SWiQvUQVjAlJFSyaJ9
Z41R1Tv+UfhO9qhKOkdI4D+Dimao7Vo1QBwAKJIz98UeODzFklk/dwRoA934I/kpLdNStQqrJ
GvTTP0kMHF4OT1IfAZxjyhrOjOOAf+uWQ9tuWXLiwq3G3Ex5DEY5mr8ap9uWNw8XPDINNmwpT
fo9Sg2wgCF4q89BbL+K5G2KuLvo=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.7.
---
gnu/packages/tree-sitter.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 7116a10ed7..8ef4e87e41 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -29,7 +29,7 @@ (define-module (gnu packages tree-sitter)
(define-public tree-sitter
(package
(name "tree-sitter")
- (version "0.20.6")
+ (version "0.20.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -38,7 +38,7 @@ (define-public tree-sitter
(file-name (git-file-name name version))
(sha256
(base32
- "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ "1nv2a2hr22w8ix71b6rkkxv9rfvhvwlmyql0g6lva9qzj4vy50p4"))
(modules '((guix build utils)))
(snippet '(begin
;; Remove bundled ICU parts
--
2.38.1
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 21:22:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 17:22:55 2022
Received: from localhost ([127.0.0.1]:50888 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqLhT-0006eE-3e
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 17:22:55 -0400
Received: from mout.gmx.net ([212.227.17.22]:54489)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqLhR-0006e0-1Y
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 17:22:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652649762;
bh=/Gkw49QmnEmPsRAmo0qP32TKLtY/FYFJM5hQSILTTBQ=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=MfXch8nQknfKW1q/36DAHttf0w+vpisYU+vL0p2pUynoiNhTkHk2K+qNNXBjyMivC
ZWad3abfGI0REJEpV7BBoVybcNpFfNL6jeypPe/6CUk9pyT+zN6G3FwFf8uzjnP0Ja
m9QTMRrIdQ1G2H6+nBFGBkCpMq8P5c3MoFYOMnMU=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MKbkC-1oBANC0j6a-00KwIV; Sun, 15
May 2022 23:22:42 +0200
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
<20220515183834.18771-3-pierre.langlois@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: Re: [PATCH v6 03/27] build-system: Add tree-sitter-build-system.
Date: Sun, 15 May 2022 22:19:59 +0100
In-reply-to: <20220515183834.18771-3-pierre.langlois@HIDDEN>
Message-ID: <8735hav6ch.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:Ya6eGpNHeTdZXYk8b6KTwI1b7LSTXD8+lCA8xeqfKnSWTGsfpkc
lKMgbL1+iqFFm9egmzK4seAGheEuy8oTJbw8vlsnJRFTNPbtEEBbagurGMBY/KyD5/Ee6SJ
/96bvqv1uywnZ7amIpbSTStXwaHL4nqUqq7md/ZpYwna6ncjDZZ0NMHbMfZRObYRdkukEdO
2TvRskrfZeHvVDwPwCl6g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:upvYuFje34s=:aqGrRVM/pzBllPHoYgiWQu
cJFNFGPbaW3cU95zoNrfYEdARguPiSRXuXvmrx/fGuNZAYeaBnXr2zkGo72EN5ahcX7Ffb1Vd
2LC++mCjWj5vMGZ4W7QIIM+2+Rcen/pSXKgp9/0bJQH6oHTMW75vLgeVOxmh7uYQila1q+xlZ
/Ud15zjziPsdcv4PRPZzbrh7yk1Cy+eTlRs739YoqizlCtc4URMBbFKz7aJMZRINQrDig6K2m
WSsp1tnUBiZhaqpAwJb3RyKgZZz+v30sVxbE1fPOw/UNnjo6saqwFQmONA2UHo42tIe5wrm+a
dexqHJHX7TVSvoChnt4bgKUMB0Mrxf33GJ4A1PO/DGsvAPYR7AYalSXzLUsl2xSwLxWkXsbYf
tJ0HvutfUV4xUd9PExtqzW3aFISD/Ut2eRIr1WQroY0Ec8q+hZ4bcf5CxZAl39EbcU/fhp/x0
nZUXcq/k09r9IsR9/7BrYy9tM8HYYZMAYmbOKJAhvuZR2IWh7mCIXh9/zeGBbwm5JPMNfsL3y
4iJW7WHph/zIIgtcCKtgv8ml2rDNMH0YU1k1j2kWv6K4DR0PhVzVAt0ZCP49XlP9kedrzxC4D
hSZ3UOwhme78gmIjS436pypf0iiOxybOdHN1HiKMnHN+MZ0zZ6m///2xZFOcHQ8FrLqC2PO66
i5GY3WpE4C8kwcCNcTMtxcpRgqGCl9PjlCzcBqoKI0E7NjBozr4U6WWMD+oLz/Gi++umHSUdj
EM/R68cohZm7hbmlO7Ban4LulT0lulz45mPvyl+TqhrejjLuCRy4bhrixYKkDNtOzLVpbLc6U
3EtYCnaB84C7elloT9zvBUpiG8JidSza/fXaJCHA8n1BZV0+0nsRGuppe6s+YuVxdvTWSr8f2
bAfd54M4JYwXzpCHw/kTtlJ2S/X9kEQyFpBPmCD8rfpX3s/UTn/unJv+bOEfwI/6RDPiR+azH
8YWlkvPKIJYfQTUx3DPoRLqDjm2Tkxl+nPRkRv9AZhfk3AZVu2mQd8He9eHscLxGjl6AfrU8E
6tuwDrosLkW+y3d60Mnm+jz1eiTZRTn8kHaSg3GTMC3ulf2Og6fcQNcGNb17Z73Swc2i1QrZQ
QofENmIpK27WPs=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain
I'm not sure why, but when I look at either
https://mail.gnu.org/archive/html/guix-patches/ or https://issues.guix.gnu.org/49946
this patch always seems to be missing. I wonder why, I used `git
send-email' and didn't see any errors.
I'm sending it as an attachment in case people are not receiving it.
Thanks,
Pierre
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKBbx4YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UpD0H/R2UmjNB728+xRjunXOXfXuj
8c5dnvbRYALM0crpZIlvn2I8P1E/gtdeTYnnJ8rLfC3cAqQDnNhSFM4YtjiepXz4
QOvwhcsM+wsZboR7v4/aYjPK59O2h65iJFtD0YnWu7NPGWRIuhXVRCcXsNfkNMJQ
9MQADyFGYqhP/z7xASDVdfKuDyTW+k5iqlhhVxn8s8NrwU9D87C4SEfgpNOjf3/E
rx6mW0W5texRqXGu9FPFNTII6AkEOFRSKaumgNS99HqHO4KhJEi0ahY3Po6R+3L+
LS3di6Cz7tImSkN4f3WpbbsoHtYIDDMnYz3q58lG17XaGEkipumWDrShWjNm8EE=
=nOaF
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: attachment;
filename=0003-build-system-Add-tree-sitter-build-system.patch
Content-Transfer-Encoding: quoted-printable
From f16fb42db676303292de5cd9063d0f21f0baceeb Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Tue, 29 Mar 2022 20:13:34 +0100
Subject: [PATCH v6 03/27] build-system: Add tree-sitter-build-system.
* guix/build-system/tree-sitter.scm: New module.
* guix/build/tree-sitter-build-system.scm: Likewise.
* Makefile.am (MODULES): Add them.
* doc/guix.texi: Document it.
---
Makefile.am | 2 +
doc/guix.texi | 21 ++-
guix/build-system/tree-sitter.scm | 190 ++++++++++++++++++++++++
guix/build/tree-sitter-build-system.scm | 153 +++++++++++++++++++
4 files changed, 365 insertions(+), 1 deletion(-)
create mode 100644 guix/build-system/tree-sitter.scm
create mode 100644 guix/build/tree-sitter-build-system.scm
diff --git a/Makefile.am b/Makefile.am
index 85a22be99c..de5cdbd328 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,6 +168,7 @@ MODULES =3D \
guix/build-system/ruby.scm \
guix/build-system/scons.scm \
guix/build-system/texlive.scm \
+ guix/build-system/tree-sitter.scm \
guix/build-system/trivial.scm \
guix/ftp-client.scm \
guix/http-client.scm \
@@ -221,6 +222,7 @@ MODULES =3D \
guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \
guix/build/texlive-build-system.scm \
+ guix/build/tree-sitter-build-system.scm \
guix/build/waf-build-system.scm \
guix/build/haskell-build-system.scm \
guix/build/julia-build-system.scm \
diff --git a/doc/guix.texi b/doc/guix.texi
index e1fb50a634..1783d74551 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@*
Copyright @copyright{} 2020 Naga Malleswari@*
Copyright @copyright{} 2020, 2021 Brice Waegeneire@*
Copyright @copyright{} 2020 R Veera Kumar@*
-Copyright @copyright{} 2020, 2021 Pierre Langlois@*
+Copyright @copyright{} 2020, 2021, 2022 Pierre Langlois@*
Copyright @copyright{} 2020 pinoaffe@*
Copyright @copyright{} 2020 Andr=C3=A9 Batista@*
Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@*
@@ -9281,6 +9281,25 @@ be specified with the @code{#:node} parameter which =
defaults to
@code{node}.
@end defvr
=20
+@defvr {Scheme Variable} tree-sitter-build-system
+
+This variable is exported by @code{(guix build-system tree-sitter)}. It
+implements procedures to compile grammars for the
+@url{https://tree-sitter.github.io/tree-sitter/, Tree-sitter} parsing
+library. It essentially runs @code{tree-sitter generate} to translate
+@code{grammar.js} grammars to JSON and then to C. Which it then
+compiles to native code.
+
+Tree-sitter packages may support multiple grammars, so this build system
+supports a @code{#:grammar-directories} keyword to specify a list of
+locations where a @code{grammar.js} file may be found.
+
+Grammars sometimes depend on each other, such as C++ depending on C and
+TypeScript depending on JavaScript. You may use inputs to declare such
+dependencies.
+
+@end defvr
+
Lastly, for packages that do not need anything as sophisticated, a
``trivial'' build system is provided. It is trivial in the sense that
it provides basically no support: it does not pull any implicit inputs,
diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sit=
ter.scm
new file mode 100644
index 0000000000..aeb96e3ef5
--- /dev/null
+++ b/guix/build-system/tree-sitter.scm
@@ -0,0 +1,190 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix build-system tree-sitter)
+ #:use-module (guix store)
+ #:use-module (guix utils)
+ #:use-module (guix packages)
+ #:use-module (guix gexp)
+ #:use-module (guix monads)
+ #:use-module (guix search-paths)
+ #:use-module (guix build-system)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system node)
+ #:use-module (ice-9 match)
+ #:export (%tree-sitter-build-system-modules
+ tree-sitter-build
+ tree-sitter-build-system))
+
+(define %tree-sitter-build-system-modules
+ ;; Build-side modules imported by default.
+ `((guix build tree-sitter-build-system)
+ ,@%node-build-system-modules))
+
+(define* (lower name
+ #:key source inputs native-inputs outputs system target
+ #:allow-other-keys
+ #:rest arguments)
+ "Return a bag for NAME from the given arguments."
+ (define private-keywords
+ `(#:inputs #:native-inputs #:outputs ,@(if target
+ '()
+ '(#:target))))
+ (define node
+ (module-ref (resolve-interface '(gnu packages node))
+ 'node-lts))
+ (define tree-sitter
+ (module-ref (resolve-interface '(gnu packages tree-sitter))
+ 'tree-sitter))
+ (define tree-sitter-cli
+ (module-ref (resolve-interface '(gnu packages tree-sitter))
+ 'tree-sitter-cli))
+ ;; Grammars depend on each other via JS modules, which we package into a
+ ;; dedicated js output.
+ (define grammar-inputs
+ (map (match-lambda
+ ((name package)
+ `(,name ,package "js")))
+ inputs))
+ (bag
+ (name name)
+ (system system) (target target)
+ (build-inputs `(,@(if source
+ `(("source" ,source))
+ '())
+ ("node" ,node)
+ ("tree-sitter-cli" ,tree-sitter-cli)
+ ,@native-inputs
+ ,@(if target '() grammar-inputs)
+ ;; Keep the standard inputs of 'gnu-build-system'.
+ ,@(if target
+ (standard-cross-packages target 'host)
+ '())
+ ,@(standard-packages)))
+ (host-inputs `(("tree-sitter" ,tree-sitter)
+ ,@(if target grammar-inputs '())))
+ ;; Keep the standard inputs of 'gnu-buid-system'.
+ (target-inputs (if target
+ (standard-cross-packages target 'target)
+ '()))
+ ;; XXX: this is a hack to get around issue #41569.
+ (outputs (match outputs
+ (("out") (cons "js" outputs))
+ (_ outputs)))
+ (build (if target tree-sitter-cross-build tree-sitter-build))
+ (arguments (strip-keyword-arguments private-keywords arguments))))
+
+(define* (tree-sitter-build name inputs
+ #:key
+ source
+ (phases '%standard-phases)
+ (grammar-directories '("."))
+ (tests? #t)
+ (outputs '("out" "js"))
+ (search-paths '())
+ (system (%current-system))
+ (guile #f)
+ (imported-modules %tree-sitter-build-system-mo=
dules)
+ (modules '((guix build utils)
+ (guix build tree-sitter-build-syste=
m))))
+ (define builder
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ (tree-sitter-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:phases #$phases
+ #:tests? #$tests?
+ #:grammar-directories '#$grammar-directories
+ #:outputs #$(outputs->gexp outputs)
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specifica=
tion->sexp
+ search-paths))
+ #:inputs #$(input-tuples->gexp inputs)))))
+
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile=
))
+ system #:graft? #f)))
+ (gexp->derivation name builder
+ #:system system
+ #:guile-for-build guile)))
+
+(define* (tree-sitter-cross-build name
+ #:key
+ target
+ build-inputs target-inputs host-inputs
+ guile source
+ (phases '%standard-phases)
+ (grammar-directories '("."))
+ (tests? #t)
+ (outputs '("out" "js"))
+ (search-paths '())
+ (native-search-paths '())
+ (system (%current-system))
+ (build (nix-system->gnu-triplet system))
+ (imported-modules %tree-sitter-build-sys=
tem-modules)
+ (modules '((guix build utils)
+ (guix build tree-sitter-build=
-system))))
+ (define builder
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
+
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
+
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
+
+ (tree-sitter-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:build #$build
+ #:target #$target
+ #:phases #$phases
+ #:tests? #$tests?
+ #:grammar-directories '#$grammar-directories
+ #:outputs #$(outputs->gexp outputs)
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specifica=
tion->sexp
+ search-paths))
+ #:native-search-paths '#$(sexp->gexp
+ (map
+ search-path-specif=
ication->sexp
+ native-search-path=
s))))))
+
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile=
))
+ system #:graft? #f)))
+ (gexp->derivation name builder
+ #:system system
+ #:target target
+ #:guile-for-build guile)))
+
+(define tree-sitter-build-system
+ (build-system
+ (name 'tree-sitter)
+ (description "The Tree-sitter grammar build system")
+ (lower lower)))
+
+;;; tree-sitter.scm ends here
diff --git a/guix/build/tree-sitter-build-system.scm b/guix/build/tree-sitt=
er-build-system.scm
new file mode 100644
index 0000000000..ad59f56dfe
--- /dev/null
+++ b/guix/build/tree-sitter-build-system.scm
@@ -0,0 +1,153 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix build tree-sitter-build-system)
+ #:use-module ((guix build node-build-system) #:prefix node:)
+ #:use-module (guix build json)
+ #:use-module (guix build utils)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 regex)
+ #:use-module (srfi srfi-1)
+ #:export (%standard-phases
+ tree-sitter-build))
+
+;; Commentary:
+;;
+;; Build procedures for tree-sitter grammar packages. This is the
+;; builder-side code, which builds on top fo the node build-system.
+;;
+;; Tree-sitter grammars are written in JavaScript and compiled to a native
+;; shared object. The `tree-sitter generate' command invokes `node' in or=
der
+;; to evaluate the grammar.js into a grammar.json file, which is then
+;; translated into C code. We then compile the C code ourselve. Packages
+;; also sometimes add extra manually written C/C++ code.
+;;
+;; In order to support grammars depending on each other, such as C and C++,
+;; JavaScript and TypeScript, this build-system installs the source of the
+;; node module in a dedicated "js" output.
+;;
+;; Code:
+
+(define* (patch-dependencies #:key inputs #:allow-other-keys)
+ "Rewrite dependencies in 'package.json'. We remove all runtime dependen=
cies
+and replace development dependencies with tree-sitter grammar node modules=
."
+
+ (define (rewrite package.json)
+ (map (match-lambda
+ (("dependencies" @ . _)
+ '("dependencies" @))
+ (("devDependencies" @ . _)
+ `("devDependencies" @
+ ,@(filter-map (match-lambda
+ ((key . directory)
+ (let ((node-module
+ (string-append directory
+ "/lib/node_modules/"
+ key)))
+ (and (directory-exists? node-module)
+ `(,key . ,node-module)))))
+ (alist-delete "node" inputs))))
+ (other other))
+ package.json))
+
+ (node:with-atomic-json-file-replacement "package.json"
+ (match-lambda
+ (('@ . package.json)
+ (cons '@ (rewrite package.json))))))
+
+;; FIXME: The node build-system's configure phase does not support
+;; cross-compiling so we re-define it.
+(define* (configure #:key native-inputs inputs #:allow-other-keys)
+ (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
+ "--offline" "--ignore-scripts" "install"))
+
+(define* (build #:key grammar-directories #:allow-other-keys)
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ ;; Avoid generating binding code for other languages, we do
+ ;; not support this use-case yet and it relies on running
+ ;; `node-gyp' to build native addons.
+ (invoke "tree-sitter" "generate" "--no-bindings")))
+ grammar-directories))
+
+(define* (check #:key grammar-directories tests? #:allow-other-keys)
+ (when tests?
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "test")))
+ grammar-directories)))
+
+(define* (install #:key target grammar-directories outputs #:allow-other-k=
eys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ (mkdir-p lib)
+ (define (compile-language dir)
+ (with-directory-excursion dir
+ (let ((lang (assoc-ref (call-with-input-file "src/grammar.json"
+ read-json)
+ "name"))
+ (source-file (lambda (path)
+ (if (file-exists? path)
+ path
+ #f))))
+ (apply invoke
+ `(,(if target
+ (string-append target "-g++")
+ "g++")
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" ,(string-append lib "/" lang ".so")
+ ;; An additional `scanner.{c,cc}' file is sometimes
+ ;; provided.
+ ,@(cond
+ ((source-file "src/scanner.c")
+ =3D> (lambda (file) (list "-xc" "-std=3Dc99" file)))
+ ((source-file "src/scanner.cc")
+ =3D> (lambda (file) (list file)))
+ (else '()))
+ "-xc" "src/parser.c")))))
+ (for-each compile-language grammar-directories)))
+
+(define* (install-js #:key native-inputs inputs outputs #:allow-other-keys)
+ (invoke (search-input-file (or native-inputs inputs) "/bin/npm")
+ "--prefix" (assoc-ref outputs "js")
+ "--global"
+ "--offline"
+ "--loglevel" "info"
+ "--production"
+ ;; Skip scripts to prevent building bindings via GYP.
+ "--ignore-scripts"
+ "install" "../package.tgz"))
+
+(define %standard-phases
+ (modify-phases node:%standard-phases
+ (replace 'patch-dependencies patch-dependencies)
+ (replace 'configure configure)
+ (replace 'build build)
+ (replace 'check check)
+ (replace 'install install)
+ (add-after 'install 'install-js install-js)))
+
+(define* (tree-sitter-build #:key inputs (phases %standard-phases)
+ #:allow-other-keys #:rest args)
+ (apply node:node-build #:inputs inputs #:phases phases args))
+
+;;; tree-sitter-build-system.scm ends here
--=20
2.36.0
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:44:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:44:08 2022
Received: from localhost ([127.0.0.1]:50747 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJDq-0006or-4S
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:44:08 -0400
Received: from mout.gmx.net ([212.227.17.20]:45367)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJDZ-0006nK-Jr
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:44:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652640223;
bh=mYc4QxerQD6CZjWzT2A4030YAAjJX9gDMJigJNV1VaI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=U3ZHxMcR9TkIwtVHrjiPJcZ2abhygqd2chYtaXAQj4hO7Zjc71973uQEJr7HBrLQU
Ju/4d+Pko3vuiUciYdfj5TqftrRAtgF6Ki7neLt1VOpM/LzPm10jFSdciEFWzs1gYg
F9pkbFwowDW4tWUVLcvvhVQui+WqNB5WJqUOORP0=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MyKHc-1ngUQB1qKy-00ygTe; Sun, 15 May 2022 20:38:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 23/27] gnu: Add rust-tree-sitter.
Date: Sun, 15 May 2022 19:38:30 +0100
Message-Id: <20220515183834.18771-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:i6vOMFocUJH1mPkdjDl+b4/VhA1bN6Piobd/Ziwg/5UUblr9A+S
OmtZOzNHbbA5cGwW7YqncYih8fcy6S6sv46eI2A0NlbFXZHEt4U1jUfBDl6IcReaH5H/ug5
c7+9lmGEGh6Jo+Wcr9sdYXA79xfIDN63t3x9uDeHMPonkdD1C9Ss8vQzH0qdAyQUaiGLMD7
zoCiG2dqTvCo4BD0vOyow==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:zr5IxEU0PUU=:MNqZbHVQ85dEmn8KTaFGvP
JQVyOxa7rUaTUKzDVYsjIDLuJOIW5Sf7Ya67caXJP9ekaNJBMgZQOk5dnPwkqCo8km+fvZuPN
rBD2AgePjg9y/bp6+ZZERe/mT/bi9nI8cCLtyp07VQ6gcmzIUG8+XIeCzyIDCu33sCqkVyHjo
ruASCxX4s9p16joK9y+YbElxQxzv5sSb2qrWm44cZjaRzquMRYvrFksuv3rt9Qi40f0H6YUmo
U9rZ6yxwn/GbBLw/b9aG08nJ6qmGfkpn9HJOefTdyT6Vj5y4lLWW2W9oQEnwA9KE6z/rzrZ+M
AcgevSXEDs1FBkOJXPGY7pXr2ZkExR13X/gKb8RGoqdUG5tP7k+aiUxmEbT1ydKRCMwQR6gzM
wkbMzgoBfiDATSPRZhWXTVhdMvBB5ec6DV9Zfe6kIMjEo6dVsoSppuTh1Xm4eqFigo30EfQqi
jDncw+vHxERpo8bTUuwAuaicsvNWBb0zNvask8k3zcO3cnsrphZGYSk624c7YVFm7y97kWYx/
P2juUJe4FcM0wom3HXBWXkLBuPlet49esB9AYTdT0hsretDEnvePT89G8cmfNpfhKEiFv6d60
3HAd0p1Gds3RmRINK0VLbXf08zw1xpDp9n0gHEVaYfBnevA9LH4KPIRUB4pXOmaiNTib24IMi
xuxCD2S50x2klwEhNf9GnFCrtk0T+vcN71A7Q3X7MwFMAXYR1rtMvWIaBDpd3nVki85MnpRpg
CX7NK9XyIFRju5ehUuwk8I9r5arxYmdJ/D3SGimpW4ZsSDQu3UwGy5P7Lf309eUmEvOrUDAFR
zMPneXPpNufCht1VS/9w6PWw1+1XvXJNhwumGD+cAekqzWbM/Oed3AqKHSWOYDp3b7gDkBQKH
vumFYBL17qkrLs4mCuKUQArXe61APgkvS5QTBNz0PsU1/ey9Zp/2e5L3nf191WpRKzTiCcSiJ
2uS8pSUp/1FRz6z0hoCUML80JQE1m5fExFhad0RJKa0A9pw001GVXlW3mwxMS18CQqD1UyzAj
wIwhb8vzboXoto8IlUtyizUKM8D40oCLkfNtCca1T+l92ttp6D8bFLfq1hVEvMa9d4V2uALGp
0urdueC2uToVcI=
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable.
=2D--
gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 04747f47e5..58ecc445a6 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -157,6 +158,44 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+(define-public rust-tree-sitter
+ (package
+ (name "rust-tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0wcvxgnvj7ga1y7xa7wm0pmabkfj8936ifg8jacd4201cj0vgcq9"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove the runtime library code and dynamically link=
to
+ ;; it instead.
+ (delete-file-recursively "src")
+ (delete-file "binding_rust/build.rs")
+ (with-output-to-file "binding_rust/build.rs"
+ (lambda _
+ (format #t "fn main() {~@
+ println!(\"cargo:rustc-link-lib=3Dtree-sitt=
er\");~@
+ }~%")))
+ #t))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-spin" ,rust-spin-0.7))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Rust bindings to the Tree-sitter parsing library")
+ (description "This package provides Rust bindings to the Tree-sitter
+parsing library.")
+ (license license:expat)))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:43:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:43:57 2022
Received: from localhost ([127.0.0.1]:50743 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJDg-0006nm-8u
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:43:57 -0400
Received: from mout.gmx.net ([212.227.17.20]:44473)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJDZ-0006nM-S6
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:43:54 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652640224;
bh=y/ECVwaHOny3TmX/UyPrdkgjwEF4tIZfluzAOATGwr0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=HSIr0qLh9R6/mdDlqWGrFlIVgbY+mb7Q18V/Fvb38cssj/1L30L3RO7720sE2ZISg
5Jx8cIom68czDzPoB8xX8wAne17KRnq6/gA8EgFCq4YT6NgW7dFerH89p+5V8sH2H3
/+LkdqNgguX9nX9Uoc5VGeUTHFd1ZtvzxT252rMA=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MOiDX-1oFpRE2yER-00QAbd; Sun, 15 May 2022 20:38:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 24/27] gnu: Add rust-tree-sitter-for-emacs.
Date: Sun, 15 May 2022 19:38:31 +0100
Message-Id: <20220515183834.18771-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:6+sS+4eXz3wBz+G7eJ2I5PG5bZzluuXc89cugbHLuewkB+vDr0Q
0OvhgsHL8u6q1aWLhhcnQqd5syU3uXPPtDjKLGa6zXc48M5wuQ35Dlr/2x26GsDlxS+IUbz
+fLweWwy+pSrTf/oSx4OC+Na3zvHmr1S5rwagLjAVr962WVCmxF8Ru0xHesGs28QDG1EXff
Vco6a8S/mOQJskcnih3FA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:cAdn0MrGAIg=:IYqsPnPArKd1ye8QsJ/WjL
ymVqh+S3MEASI3XL804bXkoqY0WyNZE3Q7sy7YEblgK1cSOgI1xqKAyRwTtgzJTI6se7cFhLG
K2Ljip4gDTqExec0jGN3nEejG30XfDT7AumksVXTaDoiloP0VOXuwpb51sKSBGqOoqJrLwK8L
pMRQqiwNeRljrlQ/bjrjdALq0Ma9lG4b4UM/UHO4mPugyZwPnLQf/FaFNAxTZgE7jWrIWnQ3U
yI3MAAftCzTdNlQehtmXp9emjDQx/hKVChfEA6IMusgsyz/edWe5brRNYmZvZFR7UEf+IAcT3
kGqWNLImhVyG5PswkbdxNf4lC4z3zOSIL+LarfQF1u9l18WKBzwDO6XrcVuShi1J1Sx9GidAx
x1mVw1AW+DsPXvEg+QO+GjuuVDhOOiZsYe88RC4rWqWFJPp/8gWpd+uFT42FfNJg8CtUrG6/0
6EcBIpqpfVkeZ3tD2UjMl2mUojE9yEClomJIyK5+o5keSXwnPDGwI40b97sB8M/1syYxcXYdG
KclmdQb1YC7s7LMckbTr4gwXxy0hKn4Ku+DXERtpl1qZDd+nwLnRXJCRFjHyjs/ooN0O0CsXy
U1Df7PfdEGVcf6Urg7OJH1uX1Wa03/SOEYWeWOEPQwENCj0OvJxqPk+a19mWirQ+6GaMKIbQE
def88QOOyG+jqlaXeb5TEx2OCRmBAqEklK7drgvQdykG69zOLag16txli6I41XAGkHL8mxz6x
XiPIghB/oHcndTEkM6RMv4ApFEO6D3togNXtSp2rVQh1g6WAaHoLeVDBWLZWoDgWykMyuQuNx
U3DCIIvGcXcI1nm8PE7wFyEtE5gZA98LsSIPnnWcfJDZXYYGsxZbpHbyT1In8wuq4FpQy2IM3
cQiPasw+k88aFjMZGHeUhgjYN4wx/D94XwqvKiXmj1KPgDeY6LA8oTiHEet38WEoP7VUxzk2a
VY11cnmh6m0lHsjnH9DMi5SP5kX5ya3Q9vZXlF+sQqulnoqXxtUF438rP/aDg66DuU3YPXzZF
88bZCynZhg0zfxWWW4UOw9JWuaXhgqxlgPbSU+OK5wPK1X5p14qoBlAg5JlrmYIpZ9L8LqKgK
o82QKTdCn+w5SI=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter-for-emacs): New variable.
* gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
=2D--
gnu/local.mk | 1 +
.../rust-tree-sitter-text-provider-fix.patch | 98 +++++++++++++++++++
gnu/packages/tree-sitter.scm | 14 +++
3 files changed, 113 insertions(+)
create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fi=
x.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 429a0b577b..7681eda58d 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1787,6 +1787,7 @@ dist_patch_DATA =3D \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rust-shell2batch-lint-fix.patch \
+ %D%/packages/patches/rust-tree-sitter-text-provider-fix.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \
%D%/packages/patches/sbc-fix-build-non-x86.patch \
%D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \
diff --git a/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch=
b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
new file mode 100644
index 0000000000..215e7fc18b
=2D-- /dev/null
+++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
@@ -0,0 +1,98 @@
+From e3576b180488b8231e1fc0ca130748577579d129 Mon Sep 17 00:00:00 2001
+From: =3D?UTF-8?q?Tu=3DE1=3DBA=3DA5n-Anh=3D20Nguy=3DE1=3DBB=3D85n?=3D <ub=
olonton@HIDDEN>
+Date: Sun, 25 Jul 2021 13:11:52 +0700
+Subject: [PATCH] Allow TextProvider's iterators to generate owned text
+
+---
+ binding_rust/lib.rs | 33 ++++++++++++++++++---------------
+ 1 file changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs
+index e88a411c..cf214d92 100644
+--- a/binding_rust/lib.rs
++++ b/binding_rust/lib.rs
+@@ -5,6 +5,7 @@ mod util;
+ use std::os::unix::io::AsRawFd;
+
+ use std::{
++ borrow::Cow,
+ char, error,
+ ffi::CStr,
+ fmt, hash, iter,
+@@ -183,7 +184,8 @@ pub struct QueryCaptures<'a, 'tree: 'a, T: TextProvid=
er<'a>> {
+ }
+
+ pub trait TextProvider<'a> {
+- type I: Iterator<Item =3D &'a [u8]> + 'a;
++ type I: Iterator<Item =3D Cow<'a, [u8]>>;
++
+ fn text(&mut self, node: Node) -> Self::I;
+ }
+
+@@ -1840,19 +1842,19 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ buffer2: &mut Vec<u8>,
+ text_provider: &mut impl TextProvider<'a>,
+ ) -> bool {
+- fn get_text<'a, 'b: 'a, I: Iterator<Item =3D &'b [u8]>>(
++ fn get_text<'a, 'b: 'a, I: Iterator<Item =3D Cow<'b, [u8]>>>(
+ buffer: &'a mut Vec<u8>,
+ mut chunks: I,
+- ) -> &'a [u8] {
+- let first_chunk =3D chunks.next().unwrap_or(&[]);
++ ) -> Cow<'a, [u8]> {
++ let first_chunk =3D chunks.next().unwrap_or(Cow::Owned(vec![=
0u8; 0]));
+ if let Some(next_chunk) =3D chunks.next() {
+ buffer.clear();
+- buffer.extend_from_slice(first_chunk);
+- buffer.extend_from_slice(next_chunk);
++ buffer.extend_from_slice(&first_chunk);
++ buffer.extend_from_slice(&next_chunk);
+ for chunk in chunks {
+- buffer.extend_from_slice(chunk);
++ buffer.extend_from_slice(&chunk);
+ }
+- buffer.as_slice()
++ Cow::Borrowed(buffer.as_slice())
+ } else {
+ first_chunk
+ }
+@@ -1888,7 +1890,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ match node {
+ Some(node) =3D> {
+ let text =3D get_text(buffer1, text_provider=
.text(node));
+- r.is_match(text) =3D=3D *is_positive
++ r.is_match(&text) =3D=3D *is_positive
+ }
+ None =3D> true,
+ }
+@@ -2002,23 +2004,24 @@ impl<'cursor, 'tree> fmt::Debug for QueryMatch<'c=
ursor, 'tree> {
+ }
+ }
+
+-impl<'a, F, I> TextProvider<'a> for F
++impl<'a, F, I, T> TextProvider<'a> for F
+ where
+ F: FnMut(Node) -> I,
+- I: Iterator<Item =3D &'a [u8]> + 'a,
++ T: Into<Cow<'a, [u8]>>,
++ I: Iterator<Item =3D T>,
+ {
+- type I =3D I;
++ type I =3D iter::Map<I, fn(T) -> Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- (self)(node)
++ (self)(node).map(T::into)
+ }
+ }
+
+ impl<'a> TextProvider<'a> for &'a [u8] {
+- type I =3D iter::Once<&'a [u8]>;
++ type I =3D iter::Once<Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- iter::once(&self[node.byte_range()])
++ iter::once(Cow::Borrowed(&self[node.byte_range()]))
+ }
+ }
+
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 58ecc445a6..4d1d3b2177 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
@@ -196,6 +197,19 @@ (define-public rust-tree-sitter
parsing library.")
(license license:expat)))
+;; We need to apply a patch in order to compile the rust bindings against=
the
+;; emacs tree-sitter module.
+;; See https://github.com/tree-sitter/tree-sitter/pull/1294
+(define-public rust-tree-sitter-for-emacs
+ (package (inherit rust-tree-sitter)
+ (source (origin
+ (inherit (package-source rust-tree-sitter))
+ (patches (search-patches
+ "rust-tree-sitter-text-provider-fix.patch"))))
+ ;; Do not show this package in the UI as it's only meant to be used f=
or
+ ;; emacs's tree-sitter module.
+ (properties '((hidden? . #t)))))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:43:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:43:56 2022
Received: from localhost ([127.0.0.1]:50741 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJDg-0006nk-0F
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:43:56 -0400
Received: from mout.gmx.net ([212.227.17.20]:43483)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJDZ-0006nL-Jz
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:43:54 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652640223;
bh=qA8wgNvEue8rvtkFy7sxiDRiaUCyD+YoCamN9ACuLs8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=SSzaL9TGpkzV/aQRTQe7zp3ktkKJHdBepa0RrGzWtmUGUBQeJ6olz7Y9DLaxKcNFG
G8bEWVXmBzfcmAKhJhf4SWxJM/9J15Ec/s+dEYRuSO4vJnOEchVTm6XEiC78jDYxgA
/OygR6HORlZWWuluOn79oQ7cdLK8vMvJOdEXnw3c=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M42nY-1nqJ8c3cMi-0007fW; Sun, 15 May 2022 20:38:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 21/27] gnu: Add tree-sitter-rust.
Date: Sun, 15 May 2022 19:38:28 +0100
Message-Id: <20220515183834.18771-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:vay+A5e/8JWLo332lLY0sdAqU9Sy1vLQF6pSTT+aHx9f6Lpywc/
xt7tEVZN0GzTIkecspB0R6SOkU4jH4XNjWroqz1DNXaWTWm0BTpiSQ5ZNK7SHJCdmPmiF0i
95CR7s6OnzZjf9RortEkmVLP+Jlx0OAn78OOe5GoXIDjCMF0SL33l4L/bnml00lgN02+FkH
rFsvHc33neF9yJq/IPRHw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:1YNJvzPlIfI=:H3A/3wOYJ18VqjHKVvC/1e
CK6HIroLL0dlxiHdou2pzGa1MhYA/YFO9iRfiHbGkbg5Ffb3ASGU3tHrL5rfTmHVFqkX2CJjL
U9HSyO6EY1ETUUJu7ndPlmnEnOZI+U036xw8VuAVH9A1M9iIXzgwaGPAxHE/eAQdszJ5MTF+9
JWIfmXTU3gDXlV0t3rZo/We/A4Ljzi0CItmxe175LKV5Jq7ivgkn78hzu23GZanuiFnbx+fU6
4nq3Dz/aAoDWx5VwhczvYX0nEHymcdbyTkvBMTETrZObHYCNewjetvuLhmI+L+lVanbo6amJn
pI6B6DMC0wI8t6ECjTdW8onZfH9bpIlQqbD1EIdGPH/q642losBQvV1AK5f996ndVE83h1iy0
v62WfbAZBCmRDBn3FUYyGizRT0ABztMRbiy+qMuNbFsc8jYPy8U32NGeP8UK/Liij53deaKP5
D7r1+Qzx7jtEa6tMtY3BnhGfXammY/XeK0kMVg3zpWe7yj1kuuiYsRfkyqWDOeGBQLGcM1Vn7
qsC9OZ/q6jiBuSxqc1RYEUDnJPevFT7Qs3jJKUoOtu7zOwQlcdEipAe36L1/VoY5BFtftmtKq
zcSsY6//FexDKTBTZDm0PqnK3M9YM74f9hIbBiHTBjSB+2GSrWN8MVKF1Z5gGMbkIwrXKEC7v
61fQ1uALxlWRMRSzpsHQa8FI2wj8hJJ2Ti6S2qsKfy0UMOLFkXmsefIToSPpu27OBpsdF8AyJ
pULu7c64yMs/OdItV6CSRoEFmPUSn1zf9HHcBrddgGbXWOprc1FrZudFZAAhKL/r8h3cu+MD6
xR9mizs0/UxZEQJQJczv4Lasf0qEP0I08+E2igt3ZCOLyxtQp3h/apB2I2FYkKTlO3oZ5/EUK
PVNOhGh7KejA58vcJKz4BUo8KwMxL+2ME6djQnyELeu5wtZVVEfgZJtK1PpBHzBxRL9KxEV2U
txMtSbLWFVVELdt09qybTDmxrlxsCXEuP1npY5VpHKQCqn0ZUTKbLh8eTcN0o8NjX4Uo3h89M
qYS1Oq/D9safnJlXegi6MP+PiFT9Wvt3+00b+ONbIeMWZyVtJYn2f2B6ase3r/VoaFfCwE77F
fWDdvfvfq+jjeiNw3PNSN6MjyS2rmEHtyvJByx16KGU56qcOAGiSIjpTKH5bbCuF/sJA5RDDM
KFd5BvUKoc32H4/oKU2BXig+vKH2JeCNWOeJGD8QYizbQSv2e28gT1uBipKWVpn4G141vrVE4
C5hJ1NODATM8v6Nmgq5eCsPXixN1EuQJCT2znWbBeXtJ8JjmI/dfoKbCPIXk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c7b1998253..c37183e131 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -573,3 +573,25 @@ (define-public tree-sitter-ruby
(description
"This package provides a Ruby grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package
+ (name "tree-sitter-rust")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-rust=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-rust")
+ (synopsis "Tree-sitter Rust grammar")
+ (description
+ "This package provides a Rust grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:09 2022
Received: from localhost ([127.0.0.1]:50710 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ92-0006e3-NJ
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:09 -0400
Received: from mout.gmx.net ([212.227.17.20]:48423)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8k-0006YD-DC
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:51 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639924;
bh=rzjUKvyN2JiF/2ShQClfYtFdkOYOOpQkYHzaM+yOqTw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EcBfsyvTO6Fnt//3Q5FtqFwEA86RXdpB7HR+xAiv/CmJA4mxsgccSPahbGkjsLXNV
OU3CtOZ9mai2eewU5DlYLgHbw4JCTCEorms2wBykSN4fIw7Q3lDo8y44Jfrc2peiOf
J3wUbtlBvTRPS+uoB8lqmRYS3UielPpOppPPGlMw=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MDQic-1o0nWE2GjG-00AXWO; Sun, 15 May 2022 20:38:44 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 27/27] gnu: Add emacs-tree-sitter-langs.
Date: Sun, 15 May 2022 19:38:34 +0100
Message-Id: <20220515183834.18771-27-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:DRh/8TP3dGHfCCtrS61RCGkLTm0dYGvZf3Cq8kgL7kebeYBJy37
7MU5NdNVVyh+cPJl3h+vMjwIyyZxvxSjHn4TvqPk1HnzZ3OdUbnfHwZIlsgRxZtdQG07htu
RRtzsyRuyNf+WDgJA15jPQ7jxaQgTQkOsPXmPT+Fc2QRHiNJlYzKmxcBIhfyKmKEywSPwAs
tnO6/TH5pEd2i6Dv4yyxg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:nOUgpELOlNY=:qIM9NglQq9hk7Vwr3Nrz7T
O1DgwRqOwfpOQp4TK2F7SV+4F5shZSsBURocBOKp3O4FN30AlDLiS4c0GGNBgx57GKdKNllOP
Nui0J4Kk7bWE4p+SZ9CijE3KMannbjvPuqIiWiDJHW1kzNzoFSfn/1I116DUnAMK7DBCle2b2
BE72E1WAXXD9wH+k4zQ5zOpmf6lvV1iYRnKXGJ/tTe32Bjwovxc+l634bRpFK9OzhKwoS6e2j
QDlSg5fhE1d7KjHzT26EMQhhVg9nZQscaGAd4zTpnH0loreLkeR+rMjVmXlA3VQjHgSCZD1uV
o189ndJZHZXKjR4G2paIVgpv1ga9gY8mYDPZeF6rzcJUc14DhmkmQ9nKIO3exLJHyYM/aoGTy
6nJ74aNg0NpP/J34VHuV0wAurE2/fBCNiZ+g8P5KQ2RKwkKHyAKuFRa3ej6NWMBDyj2V1S5TS
RM/+GOYyUAEZ6byAd4oQiavP53wxw9p/Nk4NOH8us4pcxlJJ7DGOj7hjOmbxnmK4VRp4cy9bx
DiJf/ahNrXAifiTyS/SZ6gGhJwOhyzxOEv822Fnn6OeoJ/K1w1igsHlxA2cZMUwF4r98ztUJ2
/hE7wYrDx2iQmbNAxuBzMVllCuHUNN2z39gkPCiXSkr1s9F9ZanQOOMjLvgnJXXIeZvGa90IS
GBnxbEdaazeOwnSo7ZjnQ/rSAqsRKLeFQfNF6703ZiCEYIbVtwGZ5TUaFOI7Vp6aUGs9Qwm94
Llh0+ZHL/dfPG5mKbs1fF8bYeYAXLLERazrDKCeddu7qhpQlLf3c1mFL9YCGSit+U8ymr4BFt
GDyw3BBDKoL77UVGGtFwSFbWK/B5P3c8NkCHIXUoly2LFiQoWPvSlqomQw1FJAazpu71vPZQm
K2BxXddy4pVR7ZkbHOePD2HLisAPDfIW8r8XG9FRqsgA0Zz01Ughxi97t4rIa3AXN0S5EqQB5
cJ0hCN1/Ys18FM9QWexPjwuyLLyAs1lJNbVTqkMMu7Bc9QAMWCAy6uegwuOU8n9puQRrgn3ud
6MIsn3f+akBbdH4TKFaxMm/3c6PjkHCus1ZnLDi3+K+NL1bon+rdloecFjIP5PKCVYvaaJu5e
wVao6x0A8Npleo=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bundl=
e):
New procedure.
(emacs-tree-sitter-langs): New variable.
=2D--
gnu/packages/tree-sitter.scm | 148 +++++++++++++++++++++++++++++++++++
1 file changed, 148 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index cb3f326367..b80d912bfc 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
@@ -797,3 +798,150 @@ (define-public emacs-tree-sitter
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define emacs-tree-sitter-langs-grammar-bundle
+ (package
+ (name "emacs-tree-sitter-langs-grammar-bundle")
+ (source #f)
+ (version (package-version tree-sitter))
+ (build-system trivial-build-system)
+ (inputs
+ ;; FIXME: Support for some languages is still left to package.
+ (list tree-sitter-bash
+ tree-sitter-c
+ tree-sitter-c-sharp
+ tree-sitter-cpp
+ tree-sitter-css
+ tree-sitter-elixir
+ tree-sitter-elm
+ tree-sitter-go
+ tree-sitter-html
+ tree-sitter-java
+ tree-sitter-javascript
+ tree-sitter-json
+ tree-sitter-julia
+ tree-sitter-ocaml
+ tree-sitter-php
+ tree-sitter-python
+ tree-sitter-rust
+ tree-sitter-ruby
+ tree-sitter-typescript))
+ (arguments
+ (list #:builder
+ (with-imported-modules '((guix build union)
+ (guix build utils))
+ #~(begin
+ (use-modules (ice-9 match)
+ (guix build union)
+ (guix build utils))
+ (union-build
+ #$output
+ (filter directory-exists?
+ (map (match-lambda
+ ((name directory)
+ (string-append directory "/lib/tree-sit=
ter")))
+ '#$(package-inputs this-package))))))))
+ (synopsis #f)
+ (description #f)
+ (home-page #f)
+ (license #f)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.12.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/tree-sitte=
r-langs")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp")))=
)
+ (build-system emacs-build-system)
+ (inputs
+ (list emacs-tree-sitter-langs-grammar-bundle))
+ (propagated-inputs
+ (list emacs-tree-sitter))
+ (arguments
+ (list
+ #:tests? #t
+ #:test-command ''("script/test")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-downloader
+ (lambda _
+ (call-with-output-file "tree-sitter-langs-build.el"
+ (lambda (port)
+ (let ((on-load-message
+ (string-append
+ "tree-sitter-langs: Grammar bundle already inst=
alled "
+ "via Guix. Installing external grammars via th=
is "
+ "function isn't supported, if a language you ne=
ed is "
+ "missing please report a bug at bug-guix@HIDDEN=
g.")))
+ (format
+ port
+ ";;;###autoload
+ (defun tree-sitter-langs-install-grammars
+ (&optional skip-if-installed version os
+ keep-bundle)
+ (interactive)
+ (message \"~a\"))
+ (defconst tree-sitter-langs--queries-dir
+ (file-name-as-directory
+ (concat (file-name-directory (locate-library \"=
tree-sitter-langs.el\"))
+ \"queries\")))
+ (defun tree-sitter-langs--bin-dir () \"~a\")
+ (provide 'tree-sitter-langs-build)"
+ on-load-message
+ #$emacs-tree-sitter-langs-grammar-bundle))))))
+ (add-after 'unpack 'remove-cask
+ (lambda _
+ (substitute* "script/test"
+ (("cask") ""))))
+ (add-before 'check 'patch-tree-sitter-require-test
+ (lambda _
+ (use-modules (ice-9 regex))
+ ;; This test needs a git repositories with submodules for
+ ;; each languages in order to map all repositories. We pat=
ch
+ ;; the mapping function with one that invokes the tests for=
each
+ ;; packaged language.
+ (let ((supported-languages
+ (map (lambda (lib)
+ (match:substring
+ (string-match "(.*)\\.so$" (basename lib))
+ 1))
+ (find-files "bin" "\\.so$"))))
+ (substitute* "tree-sitter-langs-tests.el"
+ (("tree-sitter-langs--map-repos")
+ (call-with-output-string
+ (lambda (port)
+ (write `(lambda (fn)
+ (dolist (lang ',supported-languages)
+ (funcall fn lang)))
+ port))))))))
+ ;; Tests for queries will fail given those languages are not
+ ;; packages yet.
+ (add-before 'check 'remove-unused-highlight-queries
+ (lambda _
+ (delete-file-recursively "queries/hcl")
+ (delete-file-recursively "queries/pgn")))
+ (add-after 'install 'install-queries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (copy-recursively "queries" (string-append elpa "/queries=
"))))))))
+ (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/"=
)
+ (synopsis "Language support bundle for Tree-sitter")
+ (description "This package is a convenient language bundle for
+Tree-sitter. For each supported language, this package provides:
+
+@enumerate
+@item Pre-compiled grammar binaries.
+@item An optional highlights.scm file that provides highlighting patterns=
.
+This is mainly intended for major modes that are not aware of tree-sitter=
.
+@item Optional query patterns for other minor modes that provide high-lev=
el
+functionalities on top of tree-sitter, such as code folding, evil text
+objects, ...etc.
+@end enumerate")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:08 2022
Received: from localhost ([127.0.0.1]:50708 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ92-0006ds-8a
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:08 -0400
Received: from mout.gmx.net ([212.227.17.20]:35033)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8k-0006YC-3M
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639924;
bh=7NTaIGtcFq/iCfGpWV3zcOgFXnXsVcDerwnUrsVPyGI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=QSNoskom65OTe2wukvJwlaknoy/6Gqju4D7YppcgYkKnjt9r5Hxj2RkGOshI7fX0w
0LXQLZScGYKE4hAZwU/aoxFPHVNEX3y9uu+HxMeTTL/rkw8+vQjmIxfrbiAgi2kaxm
1suvwFV04J3jnelMMzlTl2AWM02k60MEmH83QQWw=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M3UZG-1nqrN0163u-000fdI; Sun, 15 May 2022 20:38:44 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 26/27] gnu: Add emacs-tree-sitter.
Date: Sun, 15 May 2022 19:38:33 +0100
Message-Id: <20220515183834.18771-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Az0wfarDMeEyomzrSEdUgfDSHzyIxyptFoU9B+JdQTyoXCcepko
wTc53KdJFUesaAXKE4jjMdGcv20F1DUgZQ1nCLLEKJiEEZZUR4r7ZBZisw4tdFvZRpDbonV
CzD9iHDTw+LTb2avNyl8H8S7aV16tGrEtu7gQCE/KVQj10Hom/I0GFNSXOKS52XH1jLt4pc
Jk1NkSkoap0crF5jLTgHw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:j4/I1vKrxTY=:si2XHgSPhC+7jssWjtPzUA
8F2z5ezgq2e0g+kFuPZV8clS8frekgT/iUyHssgxGv4PDNyCZTezscAg+12cDn6v+prv7Aw0d
Gitn83e3qkTsgGZEEBXCMbTb8CozeyX/bSBdNyaL5zWx94RBQyWkSzjBnXXHPa6KYZlO3ctzQ
yaJnuuyvwAbz0rCHyFa7vvHam4RLwk0R2sklA5lppCIVepOZoowwgWnHH/3XPfa2lKCitEwkT
srL/8DWVTUVA8OJZnXhDp+XbQpU0pifPE6V3qmasFkSJvSfI7dZMesQbVH+YuXKQDR6hHa439
w1vYoYqCL9uuQG4VK/OyndKDy8Bv6AQiVKRbm4fgFpX1EJ6Yl3RdSWNxZPNEZ6iOCYjk74gU6
XLJ3ShqpKwdGp0LLPV41F9PKxZesliBo5smYl374x8Z/5tg/ILz0LRPN52/n7N/2IS6UpTyaZ
dQnrHK6bjy5ghh6skPF0d7NtxPxac82OWVc0KGzeBEtM+1L5zseH0ZjE0y5NtR+eoIShtDOZ/
pdAxtDkYhCefNhXSrsY5KimQqNRB4+eT29joXh0QuhzcHuxyyAotMu+V3gI9VKXmJxVYl5NTQ
VanXH6FekGpwIXGvPTDsKC+VAk3UY6h6LOQce/TkzdMi1xI1xuj2yKCRdqZ/bP5WzaEHEtOeO
BvbraB5ywf6n0KG9yqidj1qB8odhl1I4+rsyvy+9lcJDXkxRcjr7zzKyH66sTuutFtnwvZpkI
aWU8lLSThxwiTcTzsiBzdLs/7/QSHzX0gzSnaSjK5x+8SotO7u9ByOqkgimwt+2Qsdron8agN
S8LiuZp+mMW1w8eOOPZQsSUzIDzgWYPkmkOC8/aEz9uVa0VQbsLESN6Eqd2PEZ4eQfTKATqlK
G73QB77YjgoXbhYNKuQqwP3yDL7RH9/e9B8+RiO9zUuVFRF6J3SQbPlQ9mBa3gdPe1hSMt2HT
ZdnFODkMQPFYJjcggCcplzHSsqdYs3G4//dbhVJtUyg1lAkvHedf6K29MxwQXyUPDBxWZ7YRg
EYpJ75Re87W0vhljaEc1E794j1RckmDs9OMYQ7TleSatI4aqY07HpT2Lx/fCQU8805rM/W63i
nBPHna4wN6rAkw=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable.
=2D--
gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3e01474285..cb3f326367 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -770,3 +770,30 @@ (module (search-input-file inputs "/lib/tsc-dyn.so"))=
)
(description "This package provides core APIs of the Emacs binding fo=
r
Tree-sitter, an incremental parsing system.")
(license license:expat)))
+
+(define-public emacs-tree-sitter
+ (package
+ (name "emacs-tree-sitter")
+ (version (package-version emacs-tree-sitter-core))
+ (source (package-source emacs-tree-sitter-core))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ (list emacs-tree-sitter-core))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "lisp"))))))
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp")
+ (description "This package provides Emacs bindings for Tree-sitter, a=
n
+incremental parsing library. It aims to be the foundation for a new bree=
d of
+Emacs packages that understand code structurally. For example:
+
+@enumerate
+@item Faster, fine-grained code highlighting.
+@item More flexible code folding.
+@item Structural editing (like Paredit, or even better) for non-Lisp code=
.
+@item More informative indexing for imenu.
+@end enumerate")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:08 2022
Received: from localhost ([127.0.0.1]:50704 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ91-0006db-KL
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:08 -0400
Received: from mout.gmx.net ([212.227.17.20]:33919)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8j-0006Y6-PV
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639924;
bh=xHOSSWPINNYi0eI7mVvQieRMCRpqcVSb2xGp9ucsqeQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=S1YcqnRAPreeK27xwtA0yI/zGMVhBk1O3qsCIucxW1UeBYOQZLWBuEQFVDBrb+0J4
JZJlvEwS/mQgdyp3DrmGe2Ner9mogmotZJwfdxM7rVlPZK8/ocXlaNPb9jNiLMZeiK
uIjkjqBy7Jaz2YwGPjCLOXdBVlhsJRi9063SHDA0=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MHoRK-1o5DMb47oU-00EvF6; Sun, 15 May 2022 20:38:44 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 25/27] gnu: Add emacs-tree-sitter-core.
Date: Sun, 15 May 2022 19:38:32 +0100
Message-Id: <20220515183834.18771-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:tZY4NKm3Xfe5xiEq01Ayivu6b2xDwf8iCVbZjzE5WScCyYx+hW/
FeOgTYp07RK/aaXSxcrqqS80RWIcneF4XwuPC2e0yKzSdx/S6iBZe8MCfoT2N5/cXensOKv
IGRtzcXzEQlEweZLiqSWS3O0yf5/1kaktR8bunI+SPjPjxGXn10z8NZtA21zstncNV4cXfd
b2A3DlgEibx64sGiJn1Mg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:le14dKRT1Nw=:M4YmfSA/l3BgnYl6r2M6bT
BF0T15OKO1Nb7SeNCkqHOtEloxeEvr1N9VF/uZXOnYv5GaFOEMX7lWRmg7koZ4xnyNDMPgJ2M
c3BH2Ut6QQ4Ejt3r4+NZGIreqkRQYgcSNCtdn/WOlpPLEvblNyILxCkeviWzmnmvOLJT2O825
gcs/76SF+j8U9HzVzlCwqqPTOp1NGpp+4Rv/sxacj/ysKVG3E1EJxcxkT1UsAFQpRhZ57Y8K1
JBkC27U85zn1qsekj8uNB3qaaZdNlRZr2ptGuU8Cucx4ydK6oHOTgDhGzoWPU2enjBr+D3zpP
6RfC1JlKGqd0jXQZkmM1RpCQkyfxFLPqO0xHMFad2ubqgJuRantMIjL0SwRXfJhfStcPBlCz9
FfeF8QhfSP2fL0BbnDyz4SVHL0pdx8SoKECyHaciNk2whpX280FnkUh9Q2xs91lTXRXGkdqFQ
rUtBPTmmTYe4SoDRp8azjiqAyNyiV9OL/70r2lqofcJpj2lEjxrZBTSz0MhbUjdYPq+OX7V/L
o0quPFox6dp/bS9BmFVy0Hskif1JzMjmlYSUwCBHXVck/x+DN/UgokzXtzPHf4EX/ri8/52a0
j4Zo9XeY47LJZY5cyEPx6EogSqaauAsFHRSUCPu1GnrZpU8OqlXhOTSJwe3f4L3YfXlKh45W7
O3xSi8t577myhECFfTez/Bm2AOVU7ZMGTI3OaVHMaOjKSKBCokmH/PBZjFP23h+048c8MMDui
oqDAnoVD6lKVcprt9o917JJXk01HbyOfTRPXmOzJZOKE6LouBQWhiGIOmmhWJdt953HqFvNED
4W1nIz1x0sVG8k8XXMLpvFkkbxZ8KYC2ToIpiHPCpiyzB7vN8zGhKPgEpGQeA4RpPY0sRapJI
5hPeL/1LhNeKsj4qOhZX4O1K5kF7JJj4MzOqzFzEMaYcJ+8JsTycpV921wyLEZ4TbGK0tesZ9
0KugFc9/ZwBsDHaSd3tYVA5nA1AmjgrYYBzBcl5/t7/i0EzRqZWksdfEbiUgFYzcws8g+XcXr
Ny6LMfDdMdkRYRY6AC0q+/jVUqS/G22+OPQd52E80j/kSrwswpFhO2/sOuzW4Un9TAOxWALVa
Nkk2FqI+vP0IeA=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local varia=
ble.
(emacs-tree-sitter-core): New variable.
=2D--
gnu/packages/tree-sitter.scm | 84 ++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 4d1d3b2177..3e01474285 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
#:use-module (guix download)
@@ -686,3 +687,86 @@ (define-public tree-sitter-typescript
"This package provides Typescript and TSX grammars for the Tree-sitt=
er
library.")
(license license:expat)))
+
+;; Local package definition solely for building the native emacs module
+;; written in Rust.
+(define tree-sitter-emacs-module
+ (package
+ (name "tree-sitter-emacs-module")
+ (version "0.18.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/elisp-tree=
-sitter")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif")))=
)
+ (build-system cargo-build-system)
+ (inputs
+ (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-emacs" ,rust-emacs-0.18)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tree-sitter" ,rust-tree-sitter-for-emacs))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-after 'chdir 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (add-after 'delete-cargo.lock 'do-not-fetch-from-github
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("\\[patch.*") "")
+ (("git =3D .*") ""))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out") "/lib"))=
)
+ (mkdir-p lib)
+ (copy-file "target/release/libtsc_dyn.so"
+ (string-append lib "/tsc-dyn.so"))))))))
+ (home-page #f)
+ (synopsis #f)
+ (description #f)
+ (license license:expat)))
+
+(define-public emacs-tree-sitter-core
+ (package
+ (name "emacs-tree-sitter-core")
+ (version (package-version tree-sitter-emacs-module))
+ (source (package-source tree-sitter-emacs-module))
+ (build-system emacs-build-system)
+ (native-inputs
+ (list tree-sitter-emacs-module))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-before 'install 'find-tsc-dyn
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out")))
+ (module (search-input-file inputs "/lib/tsc-dyn.so")))
+ ;; Install the tsc-dyn module in site-lisp and the current
+ ;; directory for test to pass.
+ (install-file module elpa)
+ (copy-file module "tsc-dyn.so")
+ ;; We replace the tsc-dyn-get.el file with an empty stub t=
o
+ ;; prevent the code from downloading the module.
+ (call-with-output-file "tsc-dyn-get.el"
+ (lambda (port)
+ (for-each
+ (lambda (sexp) (write sexp port))
+ '((defun tsc-dyn-get-ensure (requested)
+ nil)
+ (provide 'tsc-dyn-get)))))))))))
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp, core library")
+ (description "This package provides core APIs of the Emacs binding fo=
r
+Tree-sitter, an incremental parsing system.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:07 2022
Received: from localhost ([127.0.0.1]:50702 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ91-0006dP-2e
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:07 -0400
Received: from mout.gmx.net ([212.227.17.21]:39131)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8j-0006Xt-0z
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639923;
bh=YlonIHsU6WCnPES0mZ9XvRhq+5wL1dsjaxX7TUiXt5E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eD3j4T9tgWQAYVmP2dKgGKp0uKg10Bp393HYkpnHHLFbsOw13RP2ofa5Ct+xzJMvl
zaHO3/LLFCiY9W+vE1349PgRxRuWXy03TYH/hER/hXGXXiJP670Sw6RzLawTDBBZJV
0+NeuAfrdbnsJ4WTQ8A2NyUlzQTq6GvNP9K5IpdQ=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mw9UK-1nZsiV0efs-00s5pm; Sun, 15 May 2022 20:38:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 22/27] gnu: Add tree-sitter-typescript.
Date: Sun, 15 May 2022 19:38:29 +0100
Message-Id: <20220515183834.18771-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:vfXGIVhy0tAVAqbcXVwkLH8KQlXsGeXy3/N6hIeuWr9Ifr3OL96
w3qmO5QQ3v6nfyLkxu2HaXffOsSBrjolWYcCCG9cpGwGPjThywvHPwGpf9SIGGXLLPuTjPu
Kr5IQruVtEMb0kxpy3t3hgNnOStmpiIaXCAMPPQT6cQ3NswyJ651GGOn5fZqlM+L4ufZkVv
bDRmVqgDJ8zoYNntG1HoQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:8cbU2RQXiBc=:IXtffQ6j56kTp5IC6224pr
St0Mh2QCxHSv/ID9ZPaonuRj/uV8J4HWrAGB2/pJzpMKi8WexbDR8P09b/lynV+CSuY36PU0K
Mva1UM0+AQ6SzVCqGUMZflwT/gOR3rVrG8Nhi8sSZ58z7qPfgTcTvP+AA8sAH5T6AuoI3ok7R
h0CepOTF1n4t75fVoCZtQ3g4nNv6Y6no9cizORkNisoIqPw/kBTkpQxtNEeEWoTIMNlv00gtm
FHA+E85T16MwsjkDsD5CA2j/6lehY4hSaluRu/J+yfaUu1OodR5xOvdCsvz+m05AQhpLAynA4
YPTlH5UVKUIYYgVRT8t7MSgC3c37EGdCe8mSTzWJtuoPtwwgDdK5VwD1FQCAi8VUYCeNvB7fr
9h/gJH3Re4dOH6b34U2WrreiVuT/M6iHMVqJRdtSEfw/oVOKHh82aE+Zr8X5LMsr6G4maWvo3
vTPytvkuIy35NuXz4+tQtSaDO/YMzAHXqBiAGHRjBOKW2K8/9zN2EJh4WCf5F1FolcYSJJo1H
dunvvLC90NvqhFSbaPyGWZyMUg5H3VXtLb5C38sntJGhq77YHfYSK/XKfIhZQIG7B/e2tAoRE
GgEjTsujtKJ+s4eeApOZfjNnPvKvQv8voTbgZeQcaUs3I9kQOew1jtZDL3oi83RPbI5d9zNRy
9MjthxTgXojmB8XRwY24SNefrCsoslAkQ9HTb2sTaHcxx6948ZJEMadkd3ZxvQ9rMvuGnGDb1
8P7r+fA8gtCkXtN8KWBg9sFWSs40NpORp8oIFm3v5XNUko+Jq+iHrl4g3ciVhtq1wdNrP0GSr
Fx8iPUtxzMYHxG/shVcUSF08khsRXahNHhDz2aJVVTJof1MrvSbxWmJ0eZhR++RwgRnljmHSK
uipmx1yk7aWwSeOoz1fMfkkCNoxo8JfqIDD51yAQt5pQA8w3M9jbOtsZBcb5H5ssNAbMMZv1h
mP8/TKKUHaozwx+S60//9NjA8z3A1P1t2c90VVYV1dQZ3jmtnUICm0WBRHFUErVvootcY/2tE
Gh++iT4Tz2Lyan4wd3jzchIMafnyiDaswOYn3lBSyYQ87mS6WGdnfrZdMuOnivv/7EpOs7FoL
5XdwVvvtSXqRYc=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c37183e131..04747f47e5 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -595,3 +595,41 @@ (define-public tree-sitter-rust
(description
"This package provides a Rust grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-typescript
+ (package
+ (name "tree-sitter-typescript")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-type=
script")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5=
v5x"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("typescript" "tsx"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (inputs (list tree-sitter-javascript))
+ (arguments
+ (list
+ #:grammar-directories '("typescript" "tsx")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-typescript")
+ (synopsis "Tree-sitter Typescript grammar")
+ (description
+ "This package provides Typescript and TSX grammars for the Tree-sitt=
er
+library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:07 2022
Received: from localhost ([127.0.0.1]:50699 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ90-0006dC-KL
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:07 -0400
Received: from mout.gmx.net ([212.227.17.21]:46979)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8h-0006Xk-Rp
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639922;
bh=YteDEIkvxq8C1F01dhU0kDj8ryFQ4AGMA6CaCmA0Y+I=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eZqeoYVg5LcfpuIHCvODSQ69mpQDq2pvDblGVy71R/AaTVYDpKGbRCxHKhlOTlukD
8P50D79z/F8HCmDGAuXQsslw0vdxLyrKuN+7ca8hR5VlU0g02dpNoxjkO0ziuBCi3Z
lN4cREmTeyVj7XMqLr8tjJe3FbLvETfiOQaNFB6U=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N2E1G-1nlSUm0Nhe-013bxa; Sun, 15 May 2022 20:38:42 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 20/27] gnu: Add tree-sitter-ruby.
Date: Sun, 15 May 2022 19:38:27 +0100
Message-Id: <20220515183834.18771-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:tNnXjbqmNEPd6OlaCV/UrnyIM4l05fZzu8piV5RD2SfWaBrywT4
tO+MkAjoCPAlJclGLCFF6JV4aDL5hVxu6qNHDXIBfnewITCGvypS1jRWaDzRyd9jpnjxv3O
VbaCCDZgBYXxZQYCF4RCW8fOoJ4Jm40Rv/5bU+FSQkVBA+QaWf5WcZp7fOq3eWa+rWA3taf
GjblZdgKSoRZzBTanx1MQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:9pzN8XwWjQI=:31HX8bOfwRQVDKVxcOzKgg
7dzQoh2SFMl54n2UUF4dm3TPeW3zEhIwO2S3MWx2AeJ/xxUumuGGoGhCI68CXdwfPFrbwTyCX
uS7CtD/8s2SDlnRJQhj4kemZo9VZK1D+1j0WtQBptRlsRxtUcIaz9eXjle85Cqy+ezfNSLNpZ
r94lbZNtZuGuiTQjFNLJ3htcl9f1UAZHaVknLFxwkWwIQaE5rtSeFmEP2PnVv9ObtNaj4euEb
Or1qkU2UaSzF+jqc4WYPOe/WLjp+Ct0qA/p2W/bAjVsW413qnFuTn+EJhAl0RCSZTRr6si5Y2
h7r7M2Pd/C/fqTZtbtV/2n/RJKt+Bk1f20rbs4YtRO5N7pSsx0lgJ6tPWzpE+wbiTC+7T4vXY
RG0XRbHXYH1R/YRfoKEXpzwPIPDACJ2HO4mzBol3wxDubuDjIn0sdJuNFj3piWGNPcgFK7pUW
tmNUUEMAvmz5zoHjlmj8Ym+hzqCi+UjjqHOwLInynojbDk3mNv6GYDYCAyjpsU8Gb32zpuS+Y
H7s7Q/vTJEngVB5TyHHW1KQqMYNh+fhW3MMduD6JV7EZKCMyXeKGQoYXcCIOugL1C5AKOhr2Q
dRaqAPYyyZTtA7qAh3xwlisZ5Pz+sppUa5x1c84z+i5V1ZbDAV4Oa9X5/07bg/2EvoZIVBM93
mmW+h/9SHHyMg0g82x1lRikygadfMhGO9u8SHdyVT6OyDrv1kr7LUMAzL4a4chDFEsvgeQa2B
8avZ4a6e9gFCllOJYpOk3nD3g7fLgG9gP9xnVAXV7DpAfDJAD6NBdPiqD41XyBH5HoNcpOcLk
zLa8cWlzmjFE33P8Y0x7SwitxksYibpisaAbGYs13csx+Td/JOLOlbKqBWk/heIfCe4lvPoOx
XjZjJCCeuHWmDkKAtoFYm1IA6qvhNBzDvAmms1Jn/MQwC+JgI1INzzif7JBb2GwCU3KLHk4En
myNDqqe3Kwon6Eg7ZJFCsLYndGU50Wwau/Xzm2HOm43db+L5b+kg0T7ndZtzMblBbtTyVhzLZ
4r4CRphi8+qrtXSuE5UulAwVXGheoWeENS48W2lirf04Qf0SOENyAMZ7+7Rl+gSPu4AZske03
xP1cbeKqV4R6s0=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c43cafea2d..c7b1998253 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -551,3 +551,25 @@ (define-public tree-sitter-python
(description
"This package provides a Python grammar for the Tree-sitter library.=
")
(license license:expat))))
+
+(define-public tree-sitter-ruby
+ (package
+ (name "tree-sitter-ruby")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ruby=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-ruby")
+ (synopsis "Tree-sitter Ruby grammar")
+ (description
+ "This package provides a Ruby grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:06 2022
Received: from localhost ([127.0.0.1]:50697 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ90-0006d3-67
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:06 -0400
Received: from mout.gmx.net ([212.227.17.22]:55407)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8h-0006Xj-KM
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639922;
bh=GfdfhnCuksq7p/nUWFVcopKXe2x38FUN1bZi67NsP9E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=PtPCFfUWFT7YJYwbSTQJpmS2+YnF9XaAQ3me+KXL6c8qMF2k0xmsa7Zdb1ipQbtmO
NVKxS0zA5GmvDaO7uwZZlPewO1YXdBFv53EgHcAJIR5hR67UrjdqOfnV3Cw9rLrVGn
3qgCQRGxnpgV42hhGIA4ogEVhLrCMvVKrfXZd2eY=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M59GG-1nrPbJ3KaK-001Deq; Sun, 15 May 2022 20:38:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 19/27] gnu: Add tree-sitter-python.
Date: Sun, 15 May 2022 19:38:26 +0100
Message-Id: <20220515183834.18771-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Ansc1NoNFXndQfs0/ijlI+VXGsAcxyH6WWy2wIELi8gi07mRc+C
6GCF0N0eZ69jnqk79k1IvXAnTzF5o/frCH2rGz94EVNqbCX0V4Zzd05wqGtneP2KygY6SZp
3Bk5FUvNg6I/Q5rY8gured53NQjfTNgMkxKEkq7eUDVKdCY0J1huBFoztLwGlAYgaXnNt+A
OlUnD7v6Fo/MblaSEEOiw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Id1AzC7/684=:05v1TiFHK2JNoKrJ0dvCCL
4oF3LzQMKEgL0w7oJRa7ZrllP3na6wUiqJ+M9goLa86AUzIhluCfcsPqNAi25R1C4cl6HWkuY
ECzNrSTAtxoAWsO0tQjGOUD31z1fMthUibHQZIrVVlhM5FqCXdcmWSgmg2o/YwvWF3XNNDXcE
sNRr7CkPGRNRyO4gQEztw+olyIvZFAZREnhm78TwdFcadGpOEon+gTZ8Fcm8yG3XOsu4ZhmJI
I07cW6emQ3POtRjezl4lwPOLgGqJFn/G3loNgHLgPnHnRGEV59Kkq5+0rwpdvlpYnzO3bMdzp
FH1moNvX63AB+AzsBPWZipQdnro6y5qDjjUdBqCL+0+kll+iy3OndiqhNU6owt1yW1i7mocbU
QD+N6mLGzzjfK9xaVJqI/22U8NquQoFwc/ekcq6wCBWq99pAG6I2fSurjIGJ+8Y+sAbo5nwgk
nLYx++aqClMxyj2MI4Jvnz/kyZUCScFVkjfzcS9GIXCCWHqXgAQeWnKz0KlNF1Swx1Q5X9zNq
OOThaeEzP0tFWDTP4jmqr2TPNyxotoQhzmGCTr0EWDhRjQz0NAsTM9oxctA7NXZ8iIlehEl6m
uSc7ASe4I9fr1grq21ZMfbT1c05fCAS7c+NqBi7a9CWrPNdH4qJUtSgYgxVROVM+0S8oPLh03
smLT/Rqx57W2Kv4wmD7yzkhoVPldIp191OMoW1w1tAJOcXtNP2Xg38jGloLhMgW0RO27kbjXr
Oh6XA9efIpUOEG8KbXaeQaZCD5IyBHRD9LaWXv9AhrhRfdN+YZFA+oXHaajg950g4RWkAGX0G
YMIQbMd7zJ2pk8C3vWzCdPherCCVMRgRIqdWVUmxWScC+ugP+tR8ewHSbCWeGqBYj200TceTy
LUFOAoRqND9b7JrFBcW20Q7+cVDRW1TpJu4t0L1IrczHpoffKIQcLano/UeRXL0yKXE1zpVNT
elspxRZreu9PXm8oaifcFgiEvKcMJT2h2RzMQYSsJumv8XcmkUIYEZC2bCtUzIRgY25Wmg3bv
ejzZW9/8TuxvjOkDrebGXWrmulCsJWSN3xyHnO54nDnhns5M8MpHyj5m7fpItyZs1tQgxAA7P
WSW/LIAdzDgArE=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
=2D--
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 654445f71d..c43cafea2d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -527,3 +527,27 @@ (define-public tree-sitter-php
(description
"This package provides a PHP grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-python
+ (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42")
+ (revision "1"))
+ (package
+ (name "tree-sitter-python")
+ (version (git-version "0.19.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-py=
thon")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wrfpg84mc3pzcrdi6n5fqwijkqr1nj5sqfnayb502krvqpjilal")=
)
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-python")
+ (synopsis "Tree-sitter Python grammar")
+ (description
+ "This package provides a Python grammar for the Tree-sitter library.=
")
+ (license license:expat))))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:06 2022
Received: from localhost ([127.0.0.1]:50694 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8z-0006cq-M1
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:06 -0400
Received: from mout.gmx.net ([212.227.17.20]:45129)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8h-0006Xi-AJ
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639921;
bh=gFdEHrCOPd3ePMY4gGZSl3Kbu/n8CTI4SP7/QSYJnQ8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=LXaCs5UyXzQcT2syXIAcJBycI9pk50R29EkFpFa7qhF0+bomkurtquKpqFIMQk8UM
vQ/L0rci5GcMr+rypaW1tzVV+wKZQZTx/dvzx05kKTB8NxPlGG1NX1RQx48R2RwDJo
gbtHlskNui78Vgyl7drWKj/Df9ujrExf5Hz5n35U=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M9Wyy-1nvpRd27fQ-005bN2; Sun, 15 May 2022 20:38:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 18/27] gnu: Add tree-sitter-php.
Date: Sun, 15 May 2022 19:38:25 +0100
Message-Id: <20220515183834.18771-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:rlpLj+2/eiel7TxTFGdwIxE88ogqt9pr2bzKEg8ZlQGot03sKcX
RT1bfwVqLj79iqsTxVHtc/Qp5QytF1h3wTGAxDF/GRPunK/Iec6sdPTdf842ewdLmsiK1Br
D9Goirl5iZIwy03W1Km0CmxY2vGG+pXiLTV/wAh4l1D//yapwMDXs+geBw9ur3jxxuOD7YG
djUoH5Vlyh3pQv1j+Vz6w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:VuGDFx5JMLU=:bPCDTjtk//hVMsaBYR67PI
uvmHaTTwCtCSfDiittrH8LSPHudV4uyIX8QTO8Hi1w0P2lRhA/ywTTkaOnHf2YOrdwLhKoYDF
ajgjmpNUL2xgPjSrgnxgev2gRvlS6cZeLoEW/At1zEJiteMOUVi9cAZ9BmOqwwvDBh7Id3H8y
n1EFebAfrpEFO2WsNLgSq3yaT/UhpjEyD29E9ge/vaWjPRXPLOPLQaddKIUZPeeGvIOd5jnXf
xyp+PJnvCdD1WstWL9YBKO/jICDXIMewxZbiw7CRc8RftghloDNp0atEeEhddVkjMNLxeNR1n
z4HvB/+KPK/9oBP7IRYMVv/YndbaVuiAVfk8xfwwh+eWZ8BwRfLTgT849ziqUvWCcFY2L8Lz0
fCPab3PYFD97W4aQC4TIpE2o9VzwZuHb5Uh8Ns2YebI5R/fDJwTt+SscFV3Py1qJkMqHZXnWG
/muy/BCMEkti3yZ1eKWtdKrbf9Ga6YYx6G5rK61iODzsdCqGeZub2Fh9C16KpFwbnYv/XWV2K
u8yQvTppL4l+4zNUAk6Bfcrex4NbRjELqpKkhuEk9qdXDR5t017iCTdD7lL/aHbBHBWb4boKT
M+tT0EdXl1JerY8HgXjIJJQWGHJV0Kq+BvQpAUyMqJhhGQ92IQvcWnKYRrto9e2jBJe7Xwk3z
1gZ1qDTeDi81hOJ8G/HMTSyCBfAw5G/1nD0iJbWendnep/R+dlmKh63QSvKE0MDl2edEPpxnj
xD+ecG0+MEnX8+FDkm2zr5zGf3rcZq0X5+huRrlK9zQUCO9bNR8/6nI/njEz+/7mZjRVhr/C9
gaPWXmI3y/mYg+abb6fM0wczLo85PSr5fbLBdDrdiIABbjgdetOls7Q2PbMsyMBSkMtz91OQx
yT4zYwJZdC57mGbgWvWi99coowWX4tGvTWx12wIZRuU0+glWpP4vzi62/xrt84Wt5mrm+uxYY
h+beDtPo24Qqiv0W8YIuCfKnF7qpI+bXGhRC7WktqR6UUP90sKq9Z7/C3CP1TSewr+1fRy9my
J+Kh2ya9CKQFR6gQrLNqoDo9RZz9G7BSpbL6n6YPd2RG5CdpTvmyuxE01L8GDJLKp3s3pUgae
VpSOxI/JeUyHN8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
=2D--
gnu/packages/tree-sitter.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ff98044cc1..654445f71d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -497,3 +497,33 @@ (define-public tree-sitter-ocaml
(description
"This package provides a OCaml grammar for the Tree-sitter library=
.")
(license license:expat))))
+
+(define-public tree-sitter-php
+ (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
+ (revision "1"))
+ (package
+ (name "tree-sitter-php")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ph=
p")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad")=
)
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")
+ #t))))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-php")
+ (synopsis "Tree-sitter PHP grammar")
+ (description
+ "This package provides a PHP grammar for the Tree-sitter library.")
+ (license license:expat))))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:05 2022
Received: from localhost ([127.0.0.1]:50691 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8z-0006cf-5d
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:05 -0400
Received: from mout.gmx.net ([212.227.17.21]:47915)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8h-0006Xg-1b
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639921;
bh=YM5edGU1bLo9i1mczZiWlxXT/0S71h3oHUjjj709los=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=W99wU/aGlcxH/GM0KBoxRiRMTu06EnIu+9hsnuajl6pyR97cxQqPECt76SEby43qc
yTVhaAB4PcqybPLqDDu60C4q4ScHOvXmjvOBvc/vSu9Z3Bhtg1xuc1ZB2t99nLn1Xm
KWzIgvwmmaJ5X6xA3xmg1sP06qh6SLpgKIRfiYN0=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N4zAy-1niiP70v00-010qno; Sun, 15 May 2022 20:38:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 17/27] gnu: Add tree-sitter-ocaml.
Date: Sun, 15 May 2022 19:38:24 +0100
Message-Id: <20220515183834.18771-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:xwB9Xrrh/9E9TykPjFfqp9aU3C0xRLWYcOaAEnJEhgdOYT/GnGc
n5rgnDeoIpt7xIU42lp/oQ2pR2tdERDuvJ57vugla+liLKjTwkIkZhjOJx5PqXGjohCUWtL
GI8bN237xQY3ihPlR0A20l2K2roerrWT13Ghp/NMIugkOEiriFMroUKEHb/VZirIJ6kGg4V
jS8drbVLVWQ0vJ44XGkYg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:9j9aHcRJwRQ=:GP2B2LVRQLothvcLRRj3GZ
UpsSZZui35dFLstIToCJnLzux4xQcubKFSlUNyvnabxbR+KcqPQ5e1h8R/HQkTuwFStnnNsRe
goFsE3Ew6TgNwoFCcRIWnRWNpJY4APnUncAiUjWZNAqnMIWgaxX2O+nTVdwduVnXOMfCKM7b5
F+eq/z8+kVoPwDqTkaQK+tQdr7uxlIoVwW0JkgtFHEpgCfCWxbbO4REyoq59yZOnPWz18ZnwW
7Bly1T4tnDLl9i23Ba/8tmT02Uu6SCqC6dmbff3aqFk3vykHWVWBVgdz0oTA8/QoC7ApKLwp6
e9LOvokq8l4jx2jJ3BDjzs7u0qwa/3FUabs7TojsTrVwtP+bZO1OrhO6pCDFCTfEZnUZ4x5vy
rThrkFM/KI65rdmgPt+T/5RVwjMRHnw6Vv2J4/z1JQms/AQZmaeDyd++roHTacL7rCZ9t0fae
ULKt9/gfitsJPn2HsWigqxleC2UX9RRuGhuagN/4IQ+jX9D8+Kyxxj33Vg4YaHQ9kGY/FXfCE
mB4mdgg12D6YwanjMbiFxor6QSs7KtOS3JX56XETLuVWhRLMKIxBTJjmQPTAN1q8KRIU+5+Et
Y2HHzfwww2XPmcC6uEKd+X+m3TauhWRJ4kF1MZ48c7KArBuAiBDl7PJ0hvfOhHoL/w7v1Ffcx
htY6RWdea1duk9pQEJR6ivpfhZc/ZRDu26zMqKn7qm+OvU7bOcBkRCnMN6KfEZFFtytDVAkZs
0AyleewmdiiOLsu8CUs3CpWEdfFASZHKmwKjccp3xY8kw99o78PrVRcRrCUy7QGnR39tKwhkS
WoYGfd50RdCDGcwU8agOwsankzYt/F6hDAzdXTWyyfCpoYc/VvZUC5A0Jg3/YCVfzdmn1h8b4
VsgW2VrPwY08Xsv+60BqGSHihaklWmuDpD2RCk3T5xtu8WwyLAzVs5BXzk7lVO6jnhGF8kClF
i5ZtzExFgUoiSIW2OkLVSpJC6SSvAfQINVWUJRmBv6fn//XxPI7p5tR0kv43uUYVR+SuPvTMY
nKfb7T1VX3eiN4trf7kiMvbE1IDuLVUYj8kxV+WmJRpDR3jShnqRubHG82TXIiVC5MI7VRDbM
0x9xl/ngPw0z+E=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable.
=2D--
gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a535d8bc4a..ff98044cc1 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -458,3 +458,42 @@ (define-public tree-sitter-julia
(description
"This package provides a Julia grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-ocaml
+ (let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192")
+ (revision "1"))
+ (package
+ (name "tree-sitter-ocaml")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-oc=
aml")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df")=
)
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("ocaml" "interface"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (arguments
+ (list
+ #:grammar-directories '("ocaml" "interface")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-ocaml")
+ (synopsis "Tree-sitter OCaml grammar")
+ (description
+ "This package provides a OCaml grammar for the Tree-sitter library=
.")
+ (license license:expat))))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:05 2022
Received: from localhost ([127.0.0.1]:50689 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8y-0006cU-QP
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:05 -0400
Received: from mout.gmx.net ([212.227.17.22]:50147)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8g-0006Xf-Ph
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639921;
bh=WZvF9Q+NpAiRDEA0Z3vOQHaBDlJNHGoIMYrMQYGYZPw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=akzx4vCqRxtx7TAgH3gopk11OhLWO29WmvBi3JXZOLvTmtkSf9HpjtJ8uJCN25evC
PkGKNaAO5lmPXhx35gBqUaWBPDEIDxtoo/DmKNtfrYlGx9bck3uLTtRIsEqz/aMLdT
GD8VGVbdO7BpImxsFkIVDMT0Sq1VDu4R9npjJMRk=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MOiDX-1oFpRH3uyF-00QAWp; Sun, 15 May 2022 20:38:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 16/27] gnu: Add tree-sitter-julia.
Date: Sun, 15 May 2022 19:38:23 +0100
Message-Id: <20220515183834.18771-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:rBUI0gl9RBIbBzyABb/NCojB2tpZaGEQKkE+Xd1IjGKQGVCyFO6
l+GgpPv5EmNwSZpeGeiCj6hsJjVH391KQlbcKS0QrcCm+NCNhaXzX+I82ItUowGjlJtiz3X
eWmJRFnJ5hM4fjjPKrUPPQa+ijMhaVNq0cDj+CbxFdopbbqgUtn6R91i3l7ECG3F/UV30Gu
YqiY/WRxxKibiQ35Fd4kA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:DdwcSGBUDWE=:q3TYJbosLRJxDBGuXIevDG
eRb2ShDRgTPMB82Jnvv+RLHXexSyl2r1I+p0/z49eob3hX2SR3R6XETJZcYyh1FT9PN2H5+eX
YuBSwXWoREGWZR5p2LJD2PIaU6P4YzlY5WuVvF3vG/Q3Cg64IrYUZYRhmtB9wDGvbVOR6MIVc
Vy15bhGbjoaYWGUOnDK9XBt0KQoXAuP5sI8nWtHvCZ2Zlu8ixIQ+VHt7UgFB6cFKKmYdI4Q2s
s90JFZ6UOZTPv+pj33h6cKao4QgHBhyoHqHlqEkVeQUBcNzCcsmWV2Msyx2EksGrjC+reoMf4
DvsvrpN0//uoKdTfQaDsBWKEo855zUBbjD9gZd9Lm9Jkoab8Td0HxSn8TURZ2iNd5WYN1HHf1
WpPcVb7qiO5RUWn50qEicRUAET8+HgFXTEyZJTzqMbwtDrGbJn+h5PuZ0kCAEdTWAZWu1TBGc
A/Xf+6asAJ8cfDo/D4fZB9R6C54yEhmDlpnrSi5IfOGm/T3H6BMO24rkrhh1iVGccL6tAcylf
iTQJV1Lll7hiGdnBqb+LbzlqYCiXpqq165N1eefFiXlfGuUNhfIL6Yd1rVPycXyfQ7da9rO2V
4kYsopfkppUVZEIgq7l1q1tSjiUadx2j9VrqWZyKys4VlUihYeOsdQOCT99OeLq9YR+5rMgG2
dbHSkdlLntGQ5hAv75IfV7pImZpqK4ith8LMmMt6L9AoDviSxaOR+RBTZcp14IrTQrSkSP8pV
DBROwEq37tudLeMut+IohwP8gkxk3+ccvJqdLVxnm5ohed9g6RBTH8DExlOlxmQJjyTYeorRq
hi6deBBfExFsaxN0hyXR1pzZ/D+TErO0EODTwsEZVwM9wF0CydstfdgezMDAOCU/3MlD+fn56
c/jckSn9QVDBZzU28Faa6N+sVBjpmMUsDpsOI0O5kEthmL3vzPFHu2m7gC9LVwaZ5xVceQYkg
f8Sz5LuhLWP2MinaAIyGf1AeCB1HMdFmUFmQO275D21lizWebNvRBzRVVDoiWf9qkBe9IEBir
HHJdLr26AgvR20SqFqp9sGmhAljzXR2if6RFCGHQBRddUBt+PhgF4fM0cu9jjY3gSnatxMoJd
ahrobGFPsaJk08=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d43e16af09..a535d8bc4a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -436,3 +436,25 @@ (define-public tree-sitter-json
(description
"This package provides a JSON grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-julia
+ (package
+ (name "tree-sitter-julia")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-juli=
a")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-julia")
+ (synopsis "Tree-sitter Julia grammar")
+ (description
+ "This package provides a Julia grammar for the Tree-sitter library."=
)
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:04 2022
Received: from localhost ([127.0.0.1]:50686 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8y-0006cH-CI
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400
Received: from mout.gmx.net ([212.227.17.22]:41733)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8g-0006Xe-GT
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639920;
bh=nnf9EgP5sn2lsJnZ0CQXYvNaTRVvn0G2kVP3cwrrJKo=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=PfipJSlBhKFyXlJzqoW2RIsCAvpAHEoXfbP0ZaDaEaARXQCtMDadOZkjgzDmkrQiO
iah+yGsuIu3DBYy56QMEaGFb/2rzmE/y7Fty7pAeTYPb/3yoT/HKLUspwxBfplUFUb
3qk7F+7Ysqru/Nx2h4ZgHJ5W4/Fhxru8B2VDcnGU=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mdvqg-1nIu3y2j3e-00b6hu; Sun, 15 May 2022 20:38:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 15/27] gnu: Add tree-sitter-json.
Date: Sun, 15 May 2022 19:38:22 +0100
Message-Id: <20220515183834.18771-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:kM9tGR1mfCleXe6/R09ZeNUDHJ6CcPUSNq+1/1QVetqdZMp3A5P
PcXwjmE6hObVWxEgrvh5dB5rQLLU18q1VCCQZHXRXWm54sRO7vGinFiSzb/1PXe7dNiEWNn
l4dVrngFBKR6kkcLdKhE3NpCR88xjbCOHcDszUaD/xLAcbfDoXFQIgbfj+b46E6sk7iqj0F
TxvyKkyUA/YseiqqhuxdQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:G4ftU30zyG8=:8reXYNz00P4Njd2L5KRn57
yOfW0n41KtuulsAFQQo8qm/bunOFjurLlK4iJTuKFJk86bwcd4l2Ab8YOmFow61/Not0flASE
wQ6YYZm1NdPZwZwZpmFRRXMXjMVfha7hTKMtAqVAUvVzH7p+bTjH3TH80yX6ymwLXOyIPAiOT
u4x5nMoQebveotRIInAFQQoin4+GjINMhs8n26xS0UjnlpO2SlYBb4oXWDGsSKzpVnwani6r4
cL3eBYEp/tIz+L843QJA+fJfVm0GuU1MnmomHhqHfAoGla382LpShF2CfMWMaR1Cf0YRT1EVk
VPpg9Q8KfImsetAXspp/6b2USqHaglgVU5xa/ScbzdQh5a6hOSPUGu8R66Pnp8Q1+O6vO+HwR
2F2ZjJLzSM8OWKidyJ3ZwqTpVWnmFFs/CHT1eqdwgu+0sWmcMJmbmkNePUeXhG3k3yK6l4544
4EAsRo64szV1einQOT/GAiSc1NEC5O9iRQrFUD2kZITscDA3pBPvIMxhMGPPLy9z9OepkJb3l
oiB3oEk8QHqVamFccrkugnoJ2uS2k05jVWtaZV7XfMH9u6t1/acrlVVgqcfJzKfWbWU47qIlW
Eq+YHhLVxMJjXs1Z66/Xrxd6o4S08dt6KkXiV07hwZZMIOTKYJSoApKE/TtXsiGWxI5E26XmI
VYjxKDEYmp4TcbQ7uNf6nweDH4V7AB6db6Ojrm1Pv3u+YxrXne/40WxtEmPFgruAmqUhikoh7
gCxGn3QRNOyrummKjprBgm8uZBzvGVy99MLGD5XR4LlTIlyqdzzaWkVAkSW/y7Ok67syEUZaT
g0cZXSgUI1kxRgl1DBr6xudP/l/uRr/NQBjL9AxyZOyFOzUIxqlmvO1HGYeoTrILw0Uqwyh9l
PdEU8P/KYMoQGuhhfECG+IuWzfqdky9T9SqAor/8V3Z0yly6EPMbVtZPm5oe08PvXIjgoF+GU
z+9eqr0t3m3NWYZ9OdTOvMgyvFVNdASaV3nRnZj6ti/H0OOvhJLLfSAXmbQzNbL0BRKjg/spj
w+8hwc2MZv0vn3LSKGNvLWyqNXqdLeIoqCo6uHVd5z6wesCR95SRmV5MLmrd6n6p1Fj+2ar1w
U/Z/kpPw6QAM+A=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 30220a5a8c..d43e16af09 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -414,3 +414,25 @@ (define-public tree-sitter-javascript
"This package provides Javascript and JSX grammars for the Tree-sitt=
er
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package
+ (name "tree-sitter-json")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-json=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-json")
+ (synopsis "Tree-sitter JSON grammar")
+ (description
+ "This package provides a JSON grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:04 2022
Received: from localhost ([127.0.0.1]:50684 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8y-0006c7-2u
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400
Received: from mout.gmx.net ([212.227.17.22]:36685)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8g-0006Xd-5x
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639920;
bh=+fezN8gt56Lj4DRO3ppa43OYTz25UULvLVubVgGQG2Q=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=bKG1evGCkJEwUolRoTPWAsE2iCPYyx6i4Q2uVR6rWuN8NSWwQP3IxTfdRz+itc74w
eSf0pDK0d9HCSM7gpzDqvtEhnbzkklYOB7z4K2z8HtP5tQSSvIfMfC1gtq1KbSXNYs
lV4b0t2SyCnP+2zAwR6377GpgqMS9t6zKVEUGyvc=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MUXtY-1oGfi41ZFw-00QQ3Y; Sun, 15 May 2022 20:38:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 14/27] gnu: Add tree-sitter-javascript.
Date: Sun, 15 May 2022 19:38:21 +0100
Message-Id: <20220515183834.18771-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:J6ivCthOEDxoaCPHu/Cg05RvKISO/+IS0Q9U3JtpyCEesrLJL0o
afxWb6CNnih0UC2ZUVNdjC1LuXmIXuROykTnPqsQm/RmAjnKJShXUCmI/VRd2EqpGUh5AsP
Zty3f0VHovJSu++FhslcTjq6obvAuu++PqsvFyXSaICan2B8oHtdBmPyAxhshNyrEQmy7oy
YY57V8Y2STpdgykXyzv7Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Ivfn/CDJb8Y=:ALahBkmo07e0pD+aKa+W/B
IxjYCWOE2cltJ20nLwdeY50n7udovHGDdCrEhwxMLclf28sYoyXnVjGaFgxPlWy9PaMGSy3lf
r6V/G48+6kkWfasKhoM60ECMVHcDVIT9M9xGSl7hofVru+ixtk86iGJdEzSp2yHw2pXMonVuj
ZxiWQr8oRZPlDkU3POnkKBClhrJAIfYAYDjniS4+ooI3SIW7M8j6RHY+1kyAaytWweS+9mnMl
08isAdz27M6tsFVXQDIBs71yRnENJDydZfWMO2xT2mf1zabXMjVqsWCmColzRlyJ04QA3uDwy
yvxmwJ0azO5cDXn44PTZPt2cKkaLf/PqseATyuNxXUjI2KwRA7tmzEt74iPacUYjPg11VuM+o
/kyezdBFIB9lAflqBTHPXeEAz8hkOSBTs+VpQIKZPxKI1F8yCAtRXhs2UtM4eIoZZmqCK+4NT
13OGs7MrQWYdR9oE3s66wOQOsmQQOkd8it6u+/L/kkadBsEb/SlHXzGKyhZROY8q7jTOR7gbM
aimFHdkhUCGT6Nl4oTcnUAQYJv/4u3jtYV8Rx1uCJ4FAWsr2wlKKIqjjkGs3Gsq3znbf1s7b6
eRM+SSwuGF5u34H2jeW9F2LfrmVp5nzWk3IEtQJNdskYz8SqlcFovDRphAe2d65TQ71F0SKUw
rmjND2mFW/2pninhZp5d65Pa+D44C+xAw7vaayT+d6HbktT3rZOG3daiqUeVvCGTE5k8PfzHr
DzM66v9n+tzZ4vEacZgXI2fpK4ilRO2Du/q+GQ6zwji5uvkmL8T6Y9MMNU1XjlWXDu+61DP61
KEXq11tU4wTSRClizS4K32jHHSBMhyLGkTpMDhpasfHO3FM6tnzu7u0yrtgKLtO09KwWj71SS
YjsArUwa8VgVH0OwiL9c4J6u32kkWguaztNz87bySDAsj5KwZ9KLG5g40Ax4jH58fl07uLTZ4
ng93FOZ0NyRW1CqiADIQfCDPEXbrVaUZY42hsZDRM0G8NedVxmPOC/uGHw9L4TM0QGsytC5Lj
4IGwXO909Tp75rRYs0QbuPQxmLphzQApMxMvdRrldLIeEeFhe0Smsa+En/hTbO4HdA1iyXLqX
onSJ2M59LhIJl0=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 010a7c3751..30220a5a8c 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,3 +391,26 @@ (define-public tree-sitter-java
(description
"This package provides a Java grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-javascript
+ (package
+ (name "tree-sitter-javascript")
+ (version "0.20.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-java=
script")
+ (commit (string-append "rust-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides Javascript and JSX grammars for the Tree-sitt=
er
+library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:04 2022
Received: from localhost ([127.0.0.1]:50681 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8x-0006bu-O8
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400
Received: from mout.gmx.net ([212.227.17.21]:41915)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8f-0006Xb-So
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639920;
bh=BzKyQh/Ljk704tevodvAAUnqbhsH5CabiqEVy2aFQ9s=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eLpAU8GfY1bdvuDvuxUpKP9er9r83reKFYjpvlzHIqIm4PthOpdrkBvqBFgiGReKC
MieSNsT87H+WqO6p6w1HoP52O5FMR2Bp/zJ1TEy0JqI7Qk9I5wUL6h1HiObJCUthUw
TZ9qboFqnYQHti38kEX90y/CHdmfiM2Rz5h+IesY=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M2f5T-1ntsi70KFT-004Fvn; Sun, 15 May 2022 20:38:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 13/27] gnu: Add tree-sitter-java.
Date: Sun, 15 May 2022 19:38:20 +0100
Message-Id: <20220515183834.18771-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:6S9es+QHUbH+l9mY8GWNye64fMnaHq/5R9hy2k7JIoDjs3BUL76
Msdh4BD25OGoq+JylvqJEROSZPxFlN5Zgda2q21nQ1757tDE90Nk8xzutSkppHRM/rHT7ZG
x0jHYLE1rqWoSnuvNae4tl/f02My+Siz2RjPnZy5/unXSluyXaTehu0zZlEQFT4+pg2ph3B
sEttttUA3xl4gwSAbrylQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:4mwn9zbf5Oc=:cNM9rM4BGt86Z8nteiCChd
DofHBKWiSRvRbJhVjL1HxZR4UPr3O2gk9ja4cwSrjNPuVV0zoR7nZ51eRBfiYQrepaGUiky8Q
aU0BuEVhNGKsrp0jOktfe/SnauU1wINVRICHcP/pKbioWAQTHAufeJoYxkmClCoWDeqOy6V+L
LOGo2lIQKl31C7JnpXBfdiPxpY/N3Awdlxal0yAi2DrsJnwZJJYHIE8gSkBh75+3st2ef0PUq
fL/+//Ur2jlmJRqZZ+QnqWhqV5cD9BOAo123fsXao/1Zg5yoKleR29tC8xgGFmbvWz0+gszK/
gbbYlQDPNtHxxWvZqw9FLHmlkPPVjXE/Ua+UKN8D0m91CqT0J8kVV7LtxME6qTB2q0jRTw8dV
Xh6SHd57yKReVi2y5posQowguWouBghDf9oUl/4TVl0BkYtFrgF4ULpRp4aGaq4nQscySbaDZ
+FN/7UZKWrJoAaBY3nBOGGBToNz52fgCzw4n0vJZGexAQkWvzbO/bmEZ/F/yzjwq4AeC+ffZV
JLU+ClOLd8UnwnXA02gpxSNXSJEop9B2bKtD2VTglGlj58n1/btJEcSoYoWSGhPaVqKYEnRg/
vc4Ol7uDOD8FnwLEEyJrmoRqa+c0uEFnZrScUbD6FlPjJD4v9eH/VdlVsF11ZHf5WGxgW5vkW
fTQkEWpe5+1djR0CJKBF84l/ucfAvzhtpO19AllAs4s/IX25OgHROyj0Tp3irXec3lSe9HKZ+
sE0PDpKbI+MdkpDt/5rXP7sc9mc4LiYm9sSztjo1/rh5GAreDcNLxV7earSc0es9I9Z/7UQ6v
9c6rWWGo4rCnqqX6CThEBw+MsKKWs0E92kiYoeKEgm0a44hMR1BWmzmBVDAjsFVh0JqHng8M3
ecmqZdK9kQrQ+J/njBV3smfzAVmM9XNk5ENqeGAOcpKQ1b+oycFhPUWUkVSbjSkQkWZ40elp9
uXZEKHhFZZZnrqd0UccXQCFRsKbe4FaGj0AZelgn5PZ0t/7vjVsdKSqfOBdf3qe3k02GJj+NI
j/BG+iprt9eqyRDvQEDh+oJcQpzduaKOG5bgYHbkcdBob2ByZqjFNKEdZGHfHIYqFq6Gf/Ug/
BtUM7+K0iS2vNg=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 15f832f8ca..010a7c3751 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -369,3 +369,25 @@ (define-public tree-sitter-html
(description
"This package provides a HTML grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-java
+ (package
+ (name "tree-sitter-java")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-java=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-java")
+ (synopsis "Tree-sitter Java grammar")
+ (description
+ "This package provides a Java grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:03 2022
Received: from localhost ([127.0.0.1]:50679 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8x-0006bm-Em
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400
Received: from mout.gmx.net ([212.227.17.20]:43203)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8f-0006Xa-Il
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639920;
bh=QwNtxVlluJ3OnQm7qlniZiUdQiqfuAQz6S9loJ0xKxU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=cqJhKR/WZRswVvQ9ERGfyBMacRG08VEGjC77taPbuwlS/TtflfIqrowOhK4IWVHwW
kwWRMOhNhqoqVWdi2i0DWoWV3TcerBWIAa7OwBppeNcnuS6FDpvIXTuNwRujxW51gq
GHvxQItHa+MvfDnHSh/nuBQPVY15EaHGSJ9G3wpE=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mxm3K-1nh2eX3I6w-00zEEM; Sun, 15 May 2022 20:38:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 12/27] gnu: Add tree-sitter-html.
Date: Sun, 15 May 2022 19:38:19 +0100
Message-Id: <20220515183834.18771-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ku7e7NyAICjvpALHe6n4xlL9qZ/y6xyg4XBr8pxDV6VUXvvUYjF
qmkcq3KUv6MkUr9H6ne198fbnkePbmxVw6Kh/s0jw4KNXzcF1VSh5OY5/pHEtcrJSadTM0t
daX6kshSBgimDSDG+np5134YfqXErAQZ5PnwuvrelmJlMXrbr6Ucec6247XnnpUthq53SAQ
QeAzIAlEwtF2ObskcVBPg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:zqxNw9PyTPE=:KEIC84JXspUn7CicxWXBbD
quAV5SSTWF8s/CvG+yBSwtGDJInSuCEernA0jQaRWfRIWdBxB9V/1iWGVOejdBESUiWcZyo+o
+bPV8wJzkQwCJ4MvBccsoV6qgZJw+M9OwOPMZzxPbJfGkwmswmVuwWMmPFIj2fp4Ri/7J9wFM
lgeKnjkq9KYurJ1ahZZUW/XypP7Z3jvRil1eV5O+hEeKtrILkSm2y+8btaQwSJUu7TN+J+7xA
ofrMlPV8DUsjAe3CJByDk4dCCE9NC7/GE+DolbKgN1ysjq8a3KatD1Q8JlUQwyHwFrhDrlaJT
Y4pLPdfYNNASYmPNCa5p1WooClCYLEOwkVsITdyWn9XQBQwSNqO1Emy15WRgzEE9gfOVFHmJd
ZCL4FysecyckTCt6ad6cFhsO4TVAhNof7XJqskHpWhPXz/HrJ9+M3aqPYQclrQg/bYDhiV3Z6
UudLwFYvTkSr1yRFcUmhQf36MWCWyKt1mtxn/akuDK5sNuAO/nME17/wnSqDu1HAroz5jOsMp
qDBOL6BfYBh0BnDR2HAwWhAXGhvdC4tNE8SaOlemlP9KxnH5BHzf7m/+i0rjyZpknSwuPf9sF
7LkYeQ2zwp5jOTIwHB1LYtauXsGlM6peHEkiCriQVsl6XIMXrMcaGoigzxRpTBQfiWSG7X/0P
DjF0KoWBenFzrPXM3mq2Aik6bdUXnZVyTM1wnp6ASMb1aq6rwqjasasbDGlXuKqDzb44QEMu3
Rb5IqlvYFmOXmqsmYX8wI3BiUJgOBZLDzlN/cuROK1yExWjlp13shQETpvQ0TDf4C8Hnzj7i8
LgQZAhyDRWrotJUkVDesLQDaCDIzDkLFQuuXPRnrthIoLZ1HMmPWq9+x6NRAAQmKA1U6Je9eI
f1Ka14DA4S/JXQIBkoU39tkQQbbv7gWMtWbJE5+aeDh2ieaFWGvJREowjUjMpmTaFDgbUI4pk
B1s8wN8mg9ddin1aOq7LWOUEwQmQAJb6hCpi8Je28Wp3OhmyzBIH0dyR0Hu0A5ZTploWj7qjz
Ic/bFzyNy/V9ju3DmCNVgckdF31DK/rZlt6cZhQGwHe6AsOgUzInBWK3WhW431XW7XnMJlNOo
ReHiqX5hFghCXk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 585b44b9f9..15f832f8ca 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -347,3 +347,25 @@ (define-public tree-sitter-go
(description
"This package provides a Golang grammar for the Tree-sitter library.=
")
(license license:expat)))
+
+(define-public tree-sitter-html
+ (package
+ (name "tree-sitter-html")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-html=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-html")
+ (synopsis "Tree-sitter HTML grammar")
+ (description
+ "This package provides a HTML grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:03 2022
Received: from localhost ([127.0.0.1]:50676 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8x-0006bX-1z
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400
Received: from mout.gmx.net ([212.227.17.21]:42661)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8f-0006XZ-8c
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639919;
bh=t6rduzJr9mwKmI10G82YoLtIpLkoyrVWls/nNsas9vU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=bXO5SzR3dTgSfidkN6SGYf+SBL16Jo/j3U8glHavk8CkNMDvAUmBa1oriDI1iIcD8
1gbYEgJEHsBONXC/cu3GOxKYJgIcssAV5UzGKnvoL8dJSX+XUURNkieyYgeRzFNpsr
crShHIBjQUaZymiKbgDxASfUiTyL7gSgshfUtDsk=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MN5eX-1o8fV425gL-00J1er; Sun, 15 May 2022 20:38:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 11/27] gnu: Add tree-sitter-go.
Date: Sun, 15 May 2022 19:38:18 +0100
Message-Id: <20220515183834.18771-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:OD005RcLOJxXthPISE2+NES9CcoWv/7iQr3BIs9JhDz/3UUrE8M
zBpbZFXUCVbc7Y1nAzIGLkE91P3Z9Z4h7N8IkTw+Bbw9dpok1sSP+W8hH5ghKebsM3eUZGy
1phxrIso9TqBwpo+NjwJvCjGiekiHM7BiQXM72wmXnlOsHZJy5PDW3zaZiPbXlDv4g11yEO
mzQFQWZRl8Urx427AqpoA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ywsq/kH3X1g=:01rfFrGUAdvvcqHwZQsYP/
1Kg3U8KF/+uZC11gvYzKMZGFivqbBQw8tEQSCSrzRRedgpW24XsVnnq9K/rcW19UYgaBpO0zC
Im1Go/NWGY9CS8k61mMljGlC0EfFqfkK/URjTz4R2aNPYfvs9lrHbsD2mLyESqLJibX18Zo1i
4z4jW7e2v6j6qrrsGiaQewmczLvRjub9+EPCMw2bQrFaQ9t7ZaikbNIlnrVmrbXt/wr7CeqAg
RmhTuIGEvs1lTpN67PRFkdRzLPVahUVyuVIHedATVRFlNrO6NS/wTNrqQpdx4O8pUIvey7zl0
tPE943WtkSDS6Qh8pygnrj8YpYBPYOUJ0xhyun9WeP2LBL2oCdgyIaHcpR+iyemMe4oesO3v2
CIH4KkedmxeUwJ6j11V/7a2SJ+ZaC8OkAvi5KSbr+5czFeldedVbvijTQ1K/Sc1BybD996pPH
dta0oDL0DosrT5zKIX+jgC/Kg0JnK0z71YKxHX75ELUuBbw3887hf4KWbrlnB03vb9fu4ppbq
7+dgXq1yMoBdv72ABpV9f1KNEZYruEiL8oSErQnyhtwCblqxGWysyFlX0ewC99QeWTMlWreeX
wgmcBgEv/wmHPMuL3P0bsvkFd+lJErQVAZvhQ6HN6M7sK4Qg9RKHjyyhuPf44ASrEG0MW0HFc
KmF669zMhKXe4cJMn4LyZlG8DWfwcAmSGmdtEZ0eHYVoUyftXSSVE08zr2TyUdmVnmb3GKioq
NJOTcLyX4U9szTFeHH9ml+O+VpV3Uhr5CBQZ/ZpOzejU/A5BIuRIKZZpzaO5BkCfrqt/t6Opl
KWRd7ROr8+bf6TSyIFQNJledGj1QKQF45dYqNdpuTVbu48bp6aZvt2DS4ONMIIzIJR9HBLuLy
oEEphaDKKeZxXJVO/kPoa1agheCk2VR5NhT/cF8b4ga9DGQt8CijpqVNucuoElXdV0JJA1q3O
tbwEKCSmFWvQrkoV74Wc1ilvxcrSEQcdBlFuwYGZBylmOgNL9Id4h9vomv9KL5MXMPouy69xI
yQox/ozCMGlt/3qivZrQ6IfFqjFAwvJuBG8C0TmabNlXmDOXpkZzp56CAMvIh3NIsGeRu7VS1
8xlNwVEKo7iq94=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-go): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0aafaf7c1b..585b44b9f9 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -325,3 +325,25 @@ (define-public tree-sitter-elm
(description
"This package provides an Elm grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (package
+ (name "tree-sitter-go")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-go")
+ (synopsis "Tree-sitter Go grammar")
+ (description
+ "This package provides a Golang grammar for the Tree-sitter library.=
")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:39:03 2022
Received: from localhost ([127.0.0.1]:50674 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8w-0006bU-NR
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400
Received: from mout.gmx.net ([212.227.17.20]:47781)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8f-0006XY-2L
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639919;
bh=q1S4lQo3UZSOwAThthf0+pt1mvfdWH5mrrP2p/P5gp0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=fOfrVjDihqR/CU6Hl7vP8RkQ4pJDYnR35G688dNWCYDJPdcbGkG4Fust6zOCstAeG
3cQOM+nEiykfyOaNllJxriDXEhu7fB5z+i2mb+UMnsQU3qtRH49WFeFsXiXlZxtgC/
ET+pUI+946Y4lOhBIZOOMMpKNBI6xHjJNzKGHeZQ=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mnpru-1nXEzl0sn4-00pMrO; Sun, 15 May 2022 20:38:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 10/27] gnu: Add tree-sitter-elm.
Date: Sun, 15 May 2022 19:38:17 +0100
Message-Id: <20220515183834.18771-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:43ku4LwsHrj6aEKaGT1UDRqhUJFWwFMt1Xdw7Qp489XninmFnFG
G2DGcCCc7Ex6ZkLDGfX7+uh3p9FyDeEn03kYtA5Vt459DsnBGt6LyZhz7jz+MMRE54xDeIo
XfeOFoCC+7fFSNvYCFB5ZkzOTdaEVPv4ZfW8ISntl3wawvXBxg7+Wn6p5CryAxMrw+/OuZK
kYYI3UmdXGvWmssXxlwGQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:eAq0LJYtLc8=:7OnCjK0JuYXbHe2AXCWTzZ
Xm0NFoZP3wBrCB2ktSbyiDYDrlqiD1UbT6hE2rQD7ih4xqiLtckWYSVZoIjLwKlF4DhknSZyJ
f0KoIU6UqHyc5yQvDyn2H3fniAOnCGAqVbron7AZgvSSggGtP7sot0QnGLlzpGS2bGqZC+z2Z
CiNAQuHFYIHiHnxi/NbsuuCGQ3KT2EkuI4/+ybFuOut4cvzr2tYJ5Cvjs7QwU1/JCoagZOuzX
ItyyaQy/MWol19onlnbHK+SoJ76QLuAwxNhcCPQYqqMm0UswEV35pS98Pxb7jn9oZsmfGY5r3
zoJIZfOeD2wr6ppBFOQTZrcZ4JRfI2u66Usr6cxu1jD9WyvSosfRMdzbtqZJG5v3EADzdeK0o
iDCZBOiNfjgSAWCcqjcAMbjdFzeoN3Mn4Y931MuKkV8akcOT7ebDNf0R3FMBlWtZQiSDcxFGE
Gmp0+roX5/udhBw8gnTE95B5new0UsMoesfY+ZgqPwd5sKKhFvdUE9wc8pMDY8+pFK4nTGOLw
24L8grsGC1b13iENML0YE6RzsoEsZ2EuYg8zMXDPukYZCltLnmITbeA0XYuBU/SJ7QAt27c9t
QDzRlgknJCEDDjy9OgdiLnDJXxnRvtkpAPcpZ0lv+25/rUgFSixQ3702W6TPLmszUpv4rt/8u
n6nu5CNbsmpMUcqzGfwcKrgIahFtNbvk1LNZuJefZLAmlIuQU1WdpwlWcWPl0cJngiZkP4d9k
OnIFR5Z8U5KYtjFWFSylPsT3q2vNDyjMCgz0iaInHroTj0AP6TgvVEL6/F6dgWbjhC9IIaJEW
l3jypQ7mq2mZi1x+oTWjcspwmxq2iG4qchus3bgDsYE4f9rZWkNAFxaCl4dso2fbVv4ZMVQdo
hJoB1PrCbcsRb+Lp/yD1czljbv2AMlecB7BeDKIKI3kaxbdHpY7Bz/rup634nijJIi8h1Iu4F
FnFGthquHT0KU/n/c+uIA+qgBC549YfFYWm+Cmb/lqpGPdzb42fcdo+BZJmbjYYH2TVQa2Bag
lZltcd0Zi7QAvzRgFBO7kvwJ3xXfXyuTf4Ywe4BHRoFmKhFtPkQqUMhETyD3ojEfLoQ2VRAHS
4l+7SSFIgJrYk8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 18ea00f7cf..0aafaf7c1b 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -303,3 +303,25 @@ (define-public tree-sitter-elixir
(license (list license:asl2.0
;; Files in tests/corpus are under MIT license.
license:expat)))))
+
+(define-public tree-sitter-elm
+ (package
+ (name "tree-sitter-elm")
+ (version "5.5.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elm-tooling/tree-sitter-elm"=
)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://elm-tooling.github.io/tree-sitter-elm/")
+ (synopsis "Tree-sitter Elm grammar")
+ (description
+ "This package provides an Elm grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:53 2022
Received: from localhost ([127.0.0.1]:50669 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8n-0006ah-Cq
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400
Received: from mout.gmx.net ([212.227.17.20]:51917)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8e-0006XV-DB
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639918;
bh=/wbKaKjhv3j9G4ePyOAwnfgNRwvtTn2p5GFafOIXLE4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=RuKSC0f4cgJ70etd/vW7k/k7p3o5Z5KhwD6A/cWCEIqwnQcMS6RNT0UIF+4VMLwC1
PZUuTiw5bf8Ak49tqZmndF8xTEixvW1O8YIOPgiNohMFL23S/LgLTj8CDTU/6S9tOL
6J9JJYqCMKVoidJKvSbEuGOQq0fZO/b2qGfxzpnY=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MAwXh-1o13hP2d6f-00BNDJ; Sun, 15 May 2022 20:38:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 08/27] gnu: Add tree-sitter-c-sharp.
Date: Sun, 15 May 2022 19:38:15 +0100
Message-Id: <20220515183834.18771-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:l82w35G4KKvzZ+WDcvOc+KoWUxLLZai1pbkmNaSSb+bJbhStgre
QgBCtmyj3GYBiM+1n6KL/8DBP/7mLgMQjGeFvYtJ0o0J2S+cO1bM7UA5Ax5CDQhIOGaQmh7
UPRVjXqtRz8zX3jFwAK5QM0SPrs2EBHe24W+PCFAvxhhWwzPGchuHorpIp/I6uDh8KPL4Hu
mqNlyVEi++18YLisAeZSA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:SkP31Jieinc=:oxas16fLFexQ9DwKvpFVQ3
N27ZCl73u/9EX8FBo7IPEKRj3ugn03FHhpLsYo1TTrjnM4AWSIaH5UC/YReDN6W7TTFD2LK3X
mJDiyKns1xsvVJRd8JgkbTerGYlVAJx7j+7jkeNWWLlZWuFfYaVW+4L1zM4TByZw2aIK4pWRL
7Q+Rr7IIacZV0f3gn5B3qNpbrOWYOt0rrrCk2Da4OVNKyQt1Co2TN4Mv8AyfNpF0vW9tBzmK5
Ut2cmyyJAO9XJa+2Yrpm/V49Jg7Vm26VW0rMtTteVIfYkOSFKINgIMZA21Oz/zQaFYOCSdz8Z
n2AnRsG9Bv4D89Xci6DzeIc4WgO21ZjstWe+ppN7r83mBsvyiTugsQ3SIAO+pf+5KXEPWyRhy
WnhBHjsUbpWN8qX+sfzkqhOT2pcuq1V/tiqmrDWtEZN1Pd4oVWGFaIUwwUulwPHGjR180NTcS
5CCgF7zEtSJC2ROhNqzAA5kVjGMlJBxCciuJ9Jfm5SAXn/f32n5c7Ef+P4OhW+TqH3ic2k460
AVG5tgTs9jWQ/F1xxgrlM9KSTWPoY5w+MTqiZYxWxbJ7jWBmoVTi47tm2zcsmLv1OT/0bL2Zy
1I7/N/Qtq4y2dLVtQb7hjfJeB/2jxW8WJQT97YzTn8etUPMnUXx7pp3LTKRspS/5FtfxGdOxI
Dsk0Pieip6xs0wckFX123Po3H+iNnxyuXNyqmodS9wwIYBkZcFDbdKx8T4XRv4v50wBOjDQgV
v+ouG/JDhj3qKUHngSU5IOJpIaGGlcR4z6DNBkC6LePq8JMg4SgHC0GLGbseHN6/B5LseGK2T
pn64z0twZ2QU4eI1FYnXjKZl34JXESaJYBShJQ5IpBAoxhZafSZ3dM5Mqm2+Zn8FZR0F2V77c
HPHOWzrQllgTCtxAK1eGTDRe3qAWs168EqskH2UbZUpQNQK8P6V0b54BeQLXqgtHSDlIeCOSF
/6uC6+AzfoGSW4lajIPynQ4WSLgCto/bxHuqDwDTSGalGPXvbZ5cmwhFcTkqd6BXpC5JrxIDB
aDtxGQR8S8fA9sXL4XWVFDpVU9vkveiNULWHmXdkoGFFZwD+o3JZyqRGHeHfHScPA9te3/uVh
jDfn5xzzX2EIdk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d2f8326be0..de90ac2093 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -212,6 +212,28 @@ (define-public tree-sitter-cpp
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat)))
+(define-public tree-sitter-c-sharp
+ (package
+ (name "tree-sitter-c-sharp")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-c-sh=
arp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-c-sharp")
+ (synopsis "Tree-sitter C# grammar")
+ (description
+ "This package provides a C# grammar for the Tree-sitter library.")
+ (license license:expat)))
+
(define-public tree-sitter-bash
(package
(name "tree-sitter-bash")
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:53 2022
Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8n-0006aa-49
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400
Received: from mout.gmx.net ([212.227.17.20]:47239)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8e-0006XW-MS
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639919;
bh=+EcJWxKS4zZTeOGo8mzEP826baZs28DXdpkyI/EIxwk=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=MR3fH7brH3/CVPNcEfOO2ykZFahCcRfst9aU6F45xUQD4w6vDmuzzu17lHCp10uCg
quTKwbtMS18H9jgAQADIQm0OGKwMTSyfq4DyU+fXFSMl6Ul8QyPE+CTxFdcR80ngRh
Mz+NKqSq1OU23Eug5PQ92c7EGTymyQl24aa+auzQ=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MWzfl-1oN0R53siH-00XHoL; Sun, 15 May 2022 20:38:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 09/27] gnu: Add tree-sitter-elixir.
Date: Sun, 15 May 2022 19:38:16 +0100
Message-Id: <20220515183834.18771-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:CF/b15J/ulnPyx2N6Eks87MhWaUHGUb4UX8ikwNiW9z4XANt0hA
AIk88dq3NRObPpF4hFoX19AfygiiNB0YK6eDT67ydxuNv6GOurscSvGE/5EajP+FDzfvyT0
BqX0pgJnvdD29c0rlZXcjA+6TRjJdOwNJa+A9fHwR7KH6Ik/jaMoQpkGIEBEmTIgF25bhwp
aCPi9wKmf6Lar4XaABCqg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Eq5uI2lYQRY=:HftbVKlEWsmCX2pf5+Jd4t
3MD3/AJwhsq+xP9IS/xTFOQt0PY+6wsdDk9L/7kIIw6M+38mCks2rzBlx3OAlARAwYV4SPO7l
XgdNo7umjYyiORkb+kjSe1hOYZ5nNSS5WKht42zSHkkCLViGAdV6DSDcfB5dNC+A/1Lli5Hz3
NwqfZ609miGMD6KlMOLi79dG+wW3OexewPJVCO1DEqAmTUetta7M5tusZWJQ89vc5Z/67u9He
LiHC7dCZHoHvnJ6Fi5az0R1+gH5U9VwM6r8c7rO4UXjS9tFfCiJGEfJ4FWhdnb4eUDmiuwPE8
18a0RQpV5zymqOY3agqvxrpp1sYNZqmPsJAffngL9ZCXW6xlNlwFH1L2q0M10bhkH8TIkYaqi
07nudBI245zQCowm611z4kAbjeZaAu+cyQbK/EwmOFwYNUE1CUCiPg5AjPmk2v06a/ByYciah
LP2zvqUQoGx8EhywFoo5nISxfmUvBKUJWJzWCIdfwCRScv7W25FGDHG+NTS3J6xVYfZtK/cBx
6CyPfUbcv4aWuVIu4Yxyq0bwT8ih6vLBq/JfI2RteXX5/TiJtQ4tu0lvlKljrl3IZAusmckpa
gLFlll78FYrrFvv9A174p1yT3Srg3rzhyfDiTfbhFeykE2wX3cW12pEpWUep55oFb6PvNRFJV
RZjPKq3ETvGjFfVbNbAR7MgbBmEwBfB5HpEIKqaEtDmW7g5ZX58qzEUpR+kpo+g4LtZPsMTsN
j95/Dk3ehSt4roZskPWDWLU802dP+Jai/pv/szkBgO/i/a1i+Sdj6xKCglLE4upj1Z3r6UCTK
t72IQcTOmHTBDZSKHA9T6800PY22PkA5H9BKlH77AbLjKW6Dp24MHvdJa3MJ3s3iNxolvxF8u
gJb3mhU8Dgis2d4mxvCUwOETVzuSPpocTvH3V5LQIHAP31f9o1llvf2fvMP62aConiEZ7tJJq
Lkfag4lF+llYgwOZJ4o6uO7CE3oBSS7QG64oM3dM4ZmBVNlT78iiAzHHCSUtE5UhNbgtsT/oC
95PQLnBobaeJaC/+yMbSmWvfy+342Rd1CdhH/UWY5esP/5AzGnbYe0WqRXugrvRpKYcb60kIz
AKjLNOexiybKE8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable.
=2D--
gnu/packages/tree-sitter.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index de90ac2093..18ea00f7cf 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -277,3 +277,29 @@ (define-public tree-sitter-css
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-elixir
+ (let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869")
+ (revision "1"))
+ (package
+ (name "tree-sitter-elixir")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elixir-lang/tree-sitter-el=
ixir")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h")=
)
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://elixir-lang.org/tree-sitter-elixir/")
+ (synopsis "Tree-sitter Elixir grammar")
+ (description
+ "This package provides a Elixir grammar for the Tree-sitter librar=
y.")
+ (license (list license:asl2.0
+ ;; Files in tests/corpus are under MIT license.
+ license:expat)))))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:53 2022
Received: from localhost ([127.0.0.1]:50665 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8m-0006aS-Rh
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400
Received: from mout.gmx.net ([212.227.17.22]:39195)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8d-0006XT-U6
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639918;
bh=AZUSpLQUdgCWcFY5+j+faQ8mIW0Nh2Orec/4V4Km8PQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=RJ7xSBlkA7Z8fU2zwKp00ZjXznWaknYTMGWQiKdFbQc8kDv3VHZ69iKnLuKT0NE9K
Q1gEIYMY1IijVnv7aoI8qS8aAk3uzoFfW8OtniSpzdm6f6Nvl6nHAgisgnmHkKQUzN
e/f2JaskJXGclXTZwsByqsUyOfh9eYKeLnXawW30=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M9Wyy-1nvpRy09nI-005bN2; Sun, 15 May 2022 20:38:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 06/27] gnu: Add tree-sitter-bash.
Date: Sun, 15 May 2022 19:38:13 +0100
Message-Id: <20220515183834.18771-6-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:V1SoTjOUCKH0TJ5+GWetPV79lFUGMYVd7okWxjtgfSbEBfiHnh3
OkGEqFYLPR9tRWWFUYbna/Q2/RnS6drwrD/H7Zl1bob4s+5ScgdiZ1hoqznqqsmiqM/Wrjj
EBhgCVtUMX4/Nxv/nBquF/P+e3CbPSvadjtJYATei+Y0/CZVqNFdUhE4/sn2lAcamnhr2zm
WpSG89b/kOFdIIz2CGq1g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Ym68NGCouFk=:il2TgWaLvudShpXmvtE/bw
Zs3Xb1udPu8gOGQHk+R5Z8X2aQaLSnScsrqxF7VxifuSyMYa26rkpzk4GPGK/uFtjThLYUahk
cb56duOi8ohmEXO9mLy4Y39t5+dWPHjoj7yZjaQTc835cnzT9qEEuxCWTnBMdar4hEWNO/6l/
n1CHf3fgDFQYv1kzwqnHFPl7VVr1t4B08Q1jZRUEhHxExsWnACxrkHBOKh41p9JbReLNse91y
bzgw7NHCbGGLE/dcj19kLPu92Zuj4S7ij5wv7m3PC4x/sDNORJhiC6rgenluoXWwT+VPli0BO
RpPdzUH3ZjpMc+vUpwxVhQ0cposo+0LcOHU7EJWxwjMFkpF8CNT7FMnWWVfhc+FFKXObJIsPK
OMq5Hl5v5ynoxHoOUeRLhZ6n6fcR1XdQv3CLye8WiFowOgbNCEVCuktMi9ur6gL1BqIwYuKHT
w3temxwCEdK+t1GRBkWRuKd0l2PEKtoajTW37Sc+IkjWJemaXIsQKGgZcBHMGni2GR35DWk/T
5Wn1ySMm/FmBxry6Ww7Vekx8E+yBlr86HVqXWoBeKOb6pSoJaLY2lBhcu+nG4FfNXGqr6jth7
u3fWN9h0vta8jDFx70YYFAMAlxOOg3Msq//SoTROclus1gJ2/1aYvupf1zHfrIpYYhQf4zmS7
lZVzDITa5toVGFYJK1JfanwsywukP4H4KvTeHSk1J60nJAdiiBFgenlDoROcJipt4+hod9rm4
QqIUNERzJvul+ACcckJBtQBejpENy8AscBs80Ht0hgWqbnq6b8l965jGrXXbzcF74+lJQscXF
8zqNIiaK0AwT+RGBT918zYCmCks6wOuZAdXj+tBMKuLXM44JhCQ9l0TYP/f+5IT4fKS9gT1w2
8SxfFcgITASzxW07mb0g+HtvV26xFjkXLC9CpMbtFf1yJu84qS9xT1R6/85M3OubesS4nVAZZ
NJwlmkJ5S3fMcy43qEKq/dXGbhJTY1ngS2L1/VsKDL39TBFslDOQyvjQfB7bMfSTUA5TEGNLr
qQMeQrzGKD9x+PoBVsv0Um2zb0pHPPr8OIPzvmbmU7s3E3fDDkyZVaFLQBdzeTvhforPYvRpr
R53JH7CUX9EhBM=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 5e25d48c05..084071fe3d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -211,3 +211,25 @@ (define-public tree-sitter-cpp
(description
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-bash
+ (package
+ (name "tree-sitter-bash")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-bash=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-bash")
+ (synopsis "Tree-sitter Bash grammar")
+ (description
+ "This package provides a Bash grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:52 2022
Received: from localhost ([127.0.0.1]:50663 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8m-0006aL-Ho
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400
Received: from mout.gmx.net ([212.227.17.22]:50823)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8e-0006XU-3T
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639918;
bh=VIBCYzEe+08fZGY+DVKewl5vIzCUcn8+BGvIwny5txk=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=F213LxW4JiEi0FOHxOcf3Jz7ltBnwWpKl81WCKV+OhbasGRNzZlhvz9RiT2vPNQZs
s8JJt5nKO8chPCkGiTejGy1PSDMiyNBV0bn1SPzdrYXRkVPXrJs+EgRPdmx6/ngvuN
vxcSX6kjnjdiUj0x2UveqGKuNcgIxJr5aN/I0d1M=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MqJmF-1nUm9l1Ot9-00nR39; Sun, 15 May 2022 20:38:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 07/27] gnu: Add tree-sitter-css.
Date: Sun, 15 May 2022 19:38:14 +0100
Message-Id: <20220515183834.18771-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ySVoaN9VpmXxREoEVsSMOLy6/UwKO1lv1yZ1hr6je5AOIwr6bOy
S7Y85MeJvA7sWizVR8DY25BCreaMlUs0cKj1AbTJdl7mEewXbRguKJyDf1ntZJm+L8atBi7
Wi6iJwkZot92z86K0mif7fU4d+ZTnOFIrFuJrwJdXkrmI1OEUbpVJ5PzZtHpuEFiUC3Ir/Y
boeaEdJZyKPknuY5lwgvw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:mdSeb1KKq+s=:hy93tC9AC5+Idf4IXKvtGt
gUdhamuqPwqfmfCN1EFhDBuL4vDej0lpDCvusLBn4GpJzv3zSK2gjbfVZC3SZDvhQtVoCIFvv
9isAaoFbZaZdMVlPEUE7S0+7HK3NM4h7/aER/GbSxdLURFsowAv+U+RgJK2oi/8cIGy6j2PDO
5MyvztuXwVsjcR37j7o9yICXfFfySlLVwUvCgO8exDg+1zz/8kSIGC8PiEFwZd6Qh9l/eVS68
v8Hpq8TS0JgTQVKqZ2TYPUSUzIdueymc+bkQBMVlEuqkUmAe4RAs1/OthJO88bRgmIQYHSEr8
PYqCjOziilpoCSOHI6kUCMFPzKgjx75nY6tVmn1y70hODJOo5YHymBSA/cNRVkGO6Rwt7QQgo
wNLSoB5gUv51Nn8y2BtuiXHuS/MIY7cONBRJFlkXduTkFnfj7FYcma6Rf2UcrFamv6aH9Uqna
CF8RkYz0NCJBefr+gfgvBJ5Td52VwB++VYErM9uQL5eZTA0yXU99PLOVvqZYIy5tlC/bf+l0s
mMVgKPB8CfwCtI9D70klV8uSUsW62StG8IVBMBhb9eVJsmSEIPfilLe4K6Lrs2d2j88+tFbcP
shG4lxs9pVD5914Wl/oppMIiTk1fIcjoWrjK6syXlf4puC0B3+8E53mY7tzemUi8lO93IKIa0
3BcN6zELlyHXzuZ/AkLvBvULIMMsSuMnOGQIuj6slm+/wf/4L/O2Rz6C9E7IjzjYWwcDyF9kE
7myyPErAvVwq6+tQBhdnvk7YOayHTFUuxd+y4lIbrHwjgIqx9//FI4JEw3Gemv+6OwORvEfub
PWLccw8eRiTBQ2VU1dGMjfxgJHH9CX7n9bxQQBdaCA7C4B2DE3P9NgWlEsvMy1ZvrVusyGwku
tRbN6Gc8oBb96NG8yDYFTPTgk1OjM1JumFK7nIW5ToQmdYisQv6/khycceAmnhzQO5+Hz68+P
xhhl/vBkwgBXHh5G1NUFdVOkXCuTHHbFcWAJ8jxX/K75dipxw3zo8c0yHGJCvXmkyyeh3Vvoj
nEq7RwOP9NJANepVwRvohO6LMbtMHrA9hnRDASRt4A8bJS4kV+hGh9wjN9DDuTRp4esUyWhuP
+wBrt2LSDI7ggg=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-css): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 084071fe3d..d2f8326be0 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -233,3 +233,25 @@ (define-public tree-sitter-bash
(description
"This package provides a Bash grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-css
+ (package
+ (name "tree-sitter-css")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-css"=
)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-css")
+ (synopsis "Tree-sitter CSS grammar")
+ (description
+ "This package provides a CSS grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:52 2022
Received: from localhost ([127.0.0.1]:50661 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8m-0006aE-3H
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400
Received: from mout.gmx.net ([212.227.17.21]:54659)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8c-0006XO-Oq
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639917;
bh=6SFCEm0LtK0AgsP5BPXyPwkzDLNeUf+ymrXXihPZMIE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=QBhsx9jirW36u7C472o6XrAm55rWf7EyG9OiNg9ybnJXPid8uvYdrjOTNXqLIFQKm
XWl8bOoD5zj1NzLpD3JmF7VXNWqslHnGVDgixASb3nr0hSAnmUV7/JFFtZXRhnZIZa
MbHhtUU4KmYp4yKhUQhQ7D+NU7r/DmnqMmS5cvVY=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MJE27-1oAJ7v3lF5-00Kgt5; Sun, 15 May 2022 20:38:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 02/27] gnu: Add tree-sitter-cli.
Date: Sun, 15 May 2022 19:38:09 +0100
Message-Id: <20220515183834.18771-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:yGGS110TQcSrO+WTzTemSjkS3YWIontOQL9Fejmt9U5JOTUCiDq
TzcJMzcYU5Q79qje7TMtYXB1FxrpyyBc9htvl/1i+tL5+ILzICjB1FRmGIiy4O5nOIDh25G
iPbrDRVKltlpKrEl974Sq8hFCofWRjRtlM1B8bgSOqJ4nDaEfXk6KuYW3tYaqoUWhIxL/VS
POU+CLWokEM4thWHKokug==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:pjSG98y1tic=:FnoUK60Y06R4J62ABjmYAI
dAKOvLTK+z1urb2dG4T5gZ4M/4YYFsW6zfkXU61BMOXAe9J+N/PMyMJtUCFfS0drLGSn4K/qP
VtKppcuBDu1P+xw8fWBCS0QYKxhhRSPd8QeB4CkVCPoXLh2HdZXElJpewFHqjMdGsmb6KsDjX
wMDOqZpriURxDeu8pEDQG+R8LLOaxCDE2qXWntF83Gg+GWNNcnIWX/puyw+39BbXte6oibfRy
YJM9rDZR9vN38eseKomxStoKKiyujkOUX0RUapy6qBH5vrhhB1YYgK6648VgFoIs2q6HNLnLk
PqF7DDRYG3fFUZa9X6t16CiwxAG95Po6EqLTQr2bZ02PuB2K/eqB3QODM6FlugZJKdzmexlqw
AOh8M+7xxndaRaybpV/2UY5KrNpHK8iISd+NxbklTvZVBenhNliAKpj5AoPbYe5zwYIeha2yI
zznUBLR9evdKvm7VyZYk13wNy7C6bZzwBayQLSHsQBOIMMgVg8qxS/xB5gk4hC5gB8kk5MqVO
HnB2lPeibWsQdOg6UD5A0Dh4QOkpxRudmw3cRLzdRbhE08F6WPogdjNOskZk5m9E2spDGhyCM
dtCu3zHgdKXbQvlwGY5W93UWrxv+mKocNpDtq3j49mA9Rtoeb+xorb3Bo3JK0ivMA2LNP7Q1P
7S5qx3fFS2sDzoynUN3ZweSIYp6op4t+muQ/g4+wDAVZOSVLY/AYXXzxgEvPShEydMTtvKZCH
pkibE2oRwGlT/86AaYVAzhXEKhQA1iu3/Ccom4Mrn6UDT8DdPuwa4BpHewMkCXBlPqceQ43Ql
eIp8N16bL+cRmsdkktCq1Dxohnye4I/vcduejgybu6QGE9ewetz1ybyaIt3VWW8bsX93W342J
6jJz427Aasxg5ZFXFmJ8AeZwH91Vv1zn/D3n7lFeX75nnXxTLeZ0u9WbPV4uZ1fKJrHrv8He8
6Ya3lyipAJkvq2wFm9TtjBc7UfrI6qRW5Yohrffdzti9PUiOfOsuZbwaJPWl39UZKRYsr/BsF
I+3CRr7y5JUHTxb1LuOCShH29OEKPdcI7UX3ZCTtbq9xYMmpwYS+BmvBYardh0lVCYkePaSgX
O4beUxAiCb5EZU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable.
=2D--
gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 7116a10ed7..18c9fe0844 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,10 +20,13 @@
(define-module (gnu packages tree-sitter)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
(define-public tree-sitter
@@ -76,3 +79,79 @@ (define-public tree-sitter
This package includes the @code{libtree-sitter} runtime library.
")
(license license:expat)))
+
+(define-public tree-sitter-cli
+ (package (inherit tree-sitter)
+ (name "tree-sitter-cli")
+ (source (origin
+ (inherit (package-source tree-sitter))
+ (snippet
+ '(begin
+ ;; Remove the runtime library code and dynamically link=
to
+ ;; it instead.
+ (delete-file-recursively "lib/src")
+ (delete-file "lib/binding_rust/build.rs")
+ (with-output-to-file "lib/binding_rust/build.rs"
+ (lambda _
+ (format #t "fn main() {~@
+ println!(\"cargo:rustc-link-lib=3Dtree-sitt=
er\");~@
+ }~%")))
+ #t))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; We're only packaging the CLI program so we do not need to insta=
ll
+ ;; sources.
+ #:install-source? #f
+ #:cargo-inputs
+ (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-anyhow" ,rust-anyhow-1)
+ ("rust-atty" ,rust-atty-0.2)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-difference" ,rust-difference-2)
+ ("rust-html-escape" ,rust-html-escape-0.2)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-semver" ,rust-semver-1)
+ ("rust-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-tiny-http" ,rust-tiny-http-0.8)
+ ("rust-toml" ,rust-toml-0.5)
+ ("rust-walkdir" ,rust-walkdir-2)
+ ("rust-webbrowser" ,rust-webbrowser-0.5)
+ ("rust-which" ,rust-which-4))
+ #:cargo-development-inputs
+ (("rust-pretty-assertions" ,rust-pretty-assertions-0.7))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib")))
+ (mkdir-p bin)
+ (install-file "target/release/tree-sitter" bin)))))))
+ (synopsis "Incremental parsing system for programming tools")
+ (description "Tree-sitter is a parser generator tool and an increment=
al
+parsing library. It can build a concrete syntax tree for a source file a=
nd
+efficiently update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@enumerate
+@item General enough to parse any programming language.
+@item Fast enough to parse on every keystroke in a text editor.
+@item Robust enough to provide useful results even in the presence of syn=
tax
+errors.
+@item Dependency-free so that the runtime library (which is written in pu=
re C)
+can be embedded in any application.
+@end enumerate
+
+This package includes the @command{tree-sitter} command-line tool.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:52 2022
Received: from localhost ([127.0.0.1]:50659 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8l-0006aB-RS
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400
Received: from mout.gmx.net ([212.227.17.20]:45421)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8d-0006XS-U8
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639918;
bh=EvbdJw28hrsaxyFI0cUKbcahNdyOTqSqHoLNC8Uzsgc=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=L6cLxY0LehNyYdCZ42F7ycdP0qIwj7Zj6hhyh5MfjdNBmXyq/8TF+t02qsRnfJNjd
ZxDjt0aHGcC5pvgt0K4UzeWMFb2gP8PgZwRHOfL8lpJ3d38TvfR7yGNf2kJQuCJF66
btjGffolIDrq+ZyHMMNPqX3TFWIqevJ6xi3NFLNg=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MV67y-1oIKOx3At4-00S4DS; Sun, 15 May 2022 20:38:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 05/27] gnu: Add tree-sitter-cpp.
Date: Sun, 15 May 2022 19:38:12 +0100
Message-Id: <20220515183834.18771-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:SKswQVduDl4x9+i6n5RhXEecEjsSa6oW8ZrMkimxhf6LWd5HWdU
9bhXQqwjEcq7M5KSmIPuc0PUQsn7eQrvO+G1gkpo37XhvD2voQi/7MlsNbZjWJPvjaExxVJ
FCCK/6nmEj986U7aX89ILejqg7x5l3QOrSFO43ZmONdyIoC8GnJAQJO5p/2w2THOiUZw4+R
IbH93ATAsQbfMTakIfeDA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NG3gfAdwFZo=:OsUtj6vbb/KvjaXP6G0/Dd
SmP/s5TgsqJq3gYCSDTs8nQCxbEBXkANuUj6plgyB6KVKfIbKUAjgqdC6fh6jiQizMvq+xXx2
YKquh9fzWNDXbXXzEerdrnS46yeZQZn9+XWQiT8MmPUTEBpNtySX+WwSfJcTUt/8hEyWex13h
BB9+IxjhFRtOT8ePlyUKZjJUQA9lRaAu6aRt8Coc7Zbft0j2zfQVImhYEJG6sx7/pT5PUqICJ
kV0LQ9tNBIJQDl4V69r98EEegAMxKpp2LVKKO6CJgk6Gdb1eo+o9wfelkPoDcrk3HHPgMQt8C
yvvc/s++eUX8P+tSYNpsk2PO5pWJx0yeWkrCbC6TbZZj3m/CVSdbpJpu5qHOSzUNoY3abObmB
EjYt7ojgK3e3+zp9wmSOq4Ari+bxW3V2sJKOZFy9GS/Z8rFUrcKIkYvflotNZX0NekI793Lfa
TwSWYi5ZzfusYPwqIx7Uf7SsCMRmEK/yXK7gL//kCZkM0ESYDYZs6gTH5WgW9zxTVG4OG9UZN
w8O9wSUy/raUpl2o0Y078+U6U4q1CAPxZNKMQ30aSORATPGvesUpgqJOQ2vyEWi3+p8+va39m
cAq/0otYTKAQ/iK8iIhlq4HRZxEzvgbJwZcALWBcWr1BpQTADKQ8cnr6ohVsuFhIxBJfODWv8
u4lkL2APLldoGKICB5Xdp7Qi8elnbYBkBpIAgANyals/WBZdam2/O7weBcaTdQ6mZY1MJhLHl
+AenfYKbdLKLenkdOM0Q2AGgFihwPUbGRWh5EV+NzyeG4zPGvXLwCMQi9td8AQKcjPK1maQX3
jJAqTYb90Ob23jLGDo2/QlInlXTuKW0vg24DmBtEaM1lBv73jNIe3IVy5209O/9KSKTwA3pyI
MzqjDI6AfT/bUJ2GhCTCP8ZlpdbZXjue0mU8fEsPi4K0/+3ZHXBomB9b6C1AGx0fr2H1zbVer
FhvgLrLw/ZRG9Hh4cibCf1lyd1scr8+EF82hrHaeQcCpn0WvMRbb31+Sx8bpa0WoBgvm9U+OR
fbi4+rDNmhy0Tuwm9BeCyYmVvxHjUGqtLuUrhH49/JKgcoAW/g9r2ifm6/IXesCBRy1N+o/yv
MCXtRtprus1hoY=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable.
=2D--
gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3f07b2d91c..5e25d48c05 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -188,3 +188,26 @@ (define-public tree-sitter-c
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (package
+ (name "tree-sitter-cpp")
+ (version "0.20.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-cpp"=
)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (inputs (list tree-sitter-c))
+ (home-page "https://github.com/tree-sitter/tree-sitter-cpp")
+ (synopsis "Tree-sitter C++ grammar")
+ (description
+ "This package provides a C++ grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:49 2022
Received: from localhost ([127.0.0.1]:50654 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8j-0006Zc-Dv
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400
Received: from mout.gmx.net ([212.227.17.21]:38473)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8d-0006XP-AG
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639917;
bh=8WsVgaFG9psJpDlUuVTWUW56iFN1qD/HZdMdQMvL8TI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=M/VeLYPEzULLhywawVL4va5R6rtf14HQUlgIEHpT/RbBpsO09XzKiwgeycFYPDefg
z1sqRVje6tt9pLCmstzQP12Avu8WHylacu7RAf2KTWnWzssk2TJYa7UiUXy2KhGCHL
CylLdYj5CyMkvn7NyxwPetAxWc/fsZlnJR6g0r98=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M9nxt-1nvYT21zXh-005sUD; Sun, 15 May 2022 20:38:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 04/27] gnu: Add tree-sitter-c.
Date: Sun, 15 May 2022 19:38:11 +0100
Message-Id: <20220515183834.18771-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <20220515183834.18771-1-pierre.langlois@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
<20220515183834.18771-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:RmBoKgBUYC7Bt/VFmo0MvxL/0O+Qmil2fxjx9IVPfDhltmZw1Os
P5PmiduqCJZpWsyUPIZKAUsEfJVqh9qrn8Hcpz48wXRDkRYvUPRMIfjpojJDp2h2aeVQ8tO
cWAGwCa5HVC2Bmdveya2zrmM19bUcG2PER3zVS7z60Hi6Bxp8b54n0Px5dRPNgAVXR+F1zH
PbOTjWSZWJ68eOyrC76NQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:5KsNEAH5nIU=:I+3HQAL2ZFtGucWyJxJzck
Mkons3GAjTXkFIXL9MYyKp3KnRrfJNyVf+X5m8Fw+ZgD8P2SLM75dsceb5Be3SS58fFWkyvDC
ZlJqIt8EXgaXp0JRZr1tn4/H7m+hE5hIGtBvXiFTx5cb1RyfkW0FYzHbOIptpkyTBnSs1gffH
0J9lD8XBaNMgG85r1gwSzcaaqv62zcSzGDoGV9i4+Qb5N6ToUvTpw4yBMm7bKsawmKD7fKhHI
966zLhgnItZ3JxmN59nsYzT34L6ZsutIFFNGBE5MrwONAbhnvVNYS251KBTq8Jz3Q39gWXBy8
I8n9D+8ufk/S1QuDDrglJAxJA9rVNQ9KpxlyPEhQciVs/oGIlni+rUEV16kr5nVWgwi/pjNin
zHpeeTORegqc6uZku6hkp2RYljAWhcNXc65Gsn3TiHlp6CSBWOj25o60c2G7+dBIIQgrmuinB
dNiZcnN7olVwbOEDr6D3r0EKow3ZN/kBbljiyGSjv/UZj688X3BaEwRUxF7vrFG5UAC9V819i
vVJAOZThcQ0i//2AhM4AMq2k1cKbPQSNMkqRNFWnI/IeUbtgjpbRs4nqrjciQywvfe0opzkeX
4EQqPEYYewTWoOlFjPS14XQIHjZK/amu6TlVYtyvXu9N7OAV2lXHNZj4yfs4ryAXRbwGFQNvK
gsv3yc4La0RHSuIv0TjSZGEQ3otpI2Demv4Ozu0hO1Ebc+qhxHqqCbgChW+OrEBB4up9W1Vm7
9pllQER97ST8r0HpPtuoMWMSUHXHB8SaWlgZoVxC8fqc+dmpNjQ9coZZy695I09pz7rpCwKy5
Ub1GRIlqFxonSD0E2LmfNa0lgtSzFWHCvgk/cGbrCcLAugFaMa4+hSGYyn8RI+sqmbHj3OimO
w9Tv71TXYwhfQB0AnXf0Gif23BW004I/UfhJjYlwf/8VXjc4bMBOYG10Cu3T1QCWu9ECLl7UP
2oWoTxKTDXags6DbRqXM5lzJ8DuiwKhl0FYfNSFRdlC10CdxpUY4SLMK+F1iiyTbgMR0wxagE
HZDy3T3T+KasnNRqljiaeua1HU4MGIJPOxfhJMOJOACkwf3Y0eT2cy76vLiLHUI14VJD8mkJB
bJQndr31r+31tY=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c): New variable.
=2D--
gnu/packages/tree-sitter.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 18c9fe0844..3f07b2d91c 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -22,6 +22,7 @@ (define-module (gnu packages tree-sitter)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -155,3 +156,35 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+
+(define tree-sitter-delete-generated-files
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")
+ #t))
+
+(define-public tree-sitter-c
+ (package
+ (name "tree-sitter-c")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-c")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0454jziys33i4kbwnvi9xcck0fzya792ghy32ahgk1hhv96xga9w"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-c")
+ (synopsis "Tree-sitter C grammar")
+ (description
+ "This package provides a C grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:38:49 2022
Received: from localhost ([127.0.0.1]:50641 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ8f-0006YK-AN
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400
Received: from mout.gmx.net ([212.227.17.21]:54667)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqJ8c-0006XN-Oi
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 14:38:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652639916;
bh=FzqA3+dMOhc4Ql/C843wbq8n9u0a78NLSKacSKwkmDw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=idqm0ituAU5fIJjMNO0Xoqmxo+cPpR3ag6+x5cJL30ZAQ43YmAgQwtdNToEYokuhv
NGOXp30o6izb7Nmuou54Ixz5X/Hyd7YnP4ePV591WSlLTzGwxThUQcnCo2ryyLrZbM
Ilj6inIxmLU7l7vVHHbn1qJPduKWkU4ArJfFssEU=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MbzuB-1nKovz2WCt-00dakV; Sun, 15 May 2022 20:38:36 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 01/27] gnu: tree-sitter: Move to its own module.
Date: Sun, 15 May 2022 19:38:08 +0100
Message-Id: <20220515183834.18771-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.36.0
In-Reply-To: <87mtfi63ut.fsf@HIDDEN>
References: <87mtfi63ut.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:XGTi3hdyBKWFDA5EzNRIN43iZYijCej8aPmPUR5YndNj7Z9rHpT
wp0DM3vVOxQWDGbPmC006ym7fgJyTYfWiMyzQLTihE5ARNt+9FAkiApQm0wbacX+DlMM5ZA
zyJ/eM8nY8eumG4vthehhe6O3DfmK7KvBBsdlWR0EawaW3uhSU03/7d0hFkBQUwIUUK5pP1
+iE2LNSrJuPXLVBtAPRew==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:tuiHZGxcMA0=:AT5AdGClpxX5bCRkVcbEUx
8h4oj3MObfDOK0MglvDOWxj2TzgqrJ2hlGA/74dLsae/bqcpJgqqEGhfhjvhxwPUhnYrZ4FQE
riv2JwfRzcVts127VrY8RlxYlxRpWN7nBIS0sa5u/Mm1rQ3sc/kOvj54BTrBawyvOuhfz/LpT
RtDk11ngsosJ4n7dczP1dJzWSx/13CHSNVIpen10JILgXl0qnmo1nwj8hImuWZzp+7Si6Jn8L
4I90OUO9nKJTleYAXXxFEOXFUarwHBsAfNrju9CTeJpACmr9JZGE0EBYjfpNrzEboUndpHesC
qFpPtCakUvMtXYjiYuheakUUBjk2RbnnGpEx5Rz1LSz18UYCQCklOzNHpj8Yb1mumb0icLnjQ
5DDibMgLbgG515zEOuaoouoVbR3bkMOfS148+I0C47J4/q8dbmSBcoSuNj4lwRUxfyvr+E2OE
0Wdeh/P6Y1+NpRdBGrYrey8oXB5FsE8ZHUJDp5KwvWkYrVfqEDUPpPkeRLx3mfSus9SmDoCgu
rQI9yS5hdg3EwBYoU4VTVKwulgW+r4CatCesXhdRZ3B3sCmRM4QDI7S6WBWgTY2zfWlii9ns1
Svm6Va4QLLHITxFDfgx38PMws6calUrFRogSvSujN8ycX2p3rq9hvgmIMMVkK9NgGQZuNS2Qh
dK8LohtS8QL2Hvxs1gRCnjL0tIXk0Yq1nl2LI92rgkT6j5syKtQxijRXDth0/8NajJtTabCw6
YMj05vrAa1QSZj/bvmv9BBzQANHJeP7yDbOpcPfGESpP+YMQN7hF83sp9PHm8G+mUNoTAZHn0
kmJC2eClPiW4RlXCHyy4rSSMkhDTMH7T9/OhkfZR2Pqwm4CmtE/vBUPi95wJ87KESCTZKa7Wq
uNzkRGgFj/s3EoTQvXNP4wOcGujrzowrrjfPbrXHYgs5rmsx4d+pnlgcz8fs+coIiWOM+K7B4
DMtyCOxGzfJJg6aF8RM2zNBxQ9xX9TlI7ELVuizLdJOoIpPyWAPCJjmnW51oYmOJ4bIXpy4kU
vcXClhoTSfMbcJLzGiRa0P/BPEx1bVeKtgvsPfN4OokTykaB5VG3hbNqKhFJvIkyYNdZ6qryb
Mbbh2GTrU3pGQ4=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/text-editors.scm (tree-sitter): Move to ...
* gnu/packages/tree-sitter.scm: ... here, a new module.
* gnu/packages/vim.scm: Use (gnu packages tree-sitter).
* gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module.
=2D--
gnu/local.mk | 1 +
gnu/packages/text-editors.scm | 52 -----------------------
gnu/packages/tree-sitter.scm | 78 +++++++++++++++++++++++++++++++++++
gnu/packages/vim.scm | 1 +
4 files changed, 80 insertions(+), 52 deletions(-)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index cfb499915a..429a0b577b 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -589,6 +589,7 @@ GNU_SYSTEM_MODULES =3D \
%D%/packages/tmux.scm \
%D%/packages/toolkits.scm \
%D%/packages/tor.scm \
+ %D%/packages/tree-sitter.scm \
%D%/packages/tv.scm \
%D%/packages/uglifyjs.scm \
%D%/packages/uml.scm \
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 7cbad042c9..ddbfef3e77 100644
=2D-- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -63,7 +63,6 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
- #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1167,54 +1166,3 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
-
-(define-public tree-sitter
- (package
- (name "tree-sitter")
- (version "0.20.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tree-sitter/tree-sitter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Remove bundled ICU parts
- (delete-file-recursively "lib/src/unicode")
- #t))))
- (build-system gnu-build-system)
- (inputs (list icu4c))
- (arguments
- (list #:phases
- '(modify-phases %standard-phases
- (delete 'configure))
- #:tests? #f ; there are no tests for the runtime library
- #:make-flags
- #~(list (string-append "PREFIX=3D"
- #$output)
- (string-append "CC=3D"
- #$(cc-for-target)))))
- (home-page "https://tree-sitter.github.io/tree-sitter/")
- (synopsis "Incremental parsing system for programming tools")
- (description
- "Tree-sitter is a parser generator tool and an incremental parsing
-library. It can build a concrete syntax tree for a source file and effic=
iently
-update the syntax tree as the source file is edited.
-
-Tree-sitter aims to be:
-
-@itemize
-@item General enough to parse any programming language
-@item Fast enough to parse on every keystroke in a text editor
-@item Robust enough to provide useful results even in the presence of syn=
tax errors
-@item Dependency-free so that the runtime library (which is written in pu=
re C)
-can be embedded in any application
-@end itemize
-
-This package includes the @code{libtree-sitter} runtime library.
-")
- (license license:expat)))
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..7116a10ed7
=2D-- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,78 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2022 Luis Henrique Gomes Higino <luishenriquegh2701@=
gmail.com>
+;;; Copyright =C2=A9 2022 Pierre Langlois <pierre.langlois@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages tree-sitter)
+ #:use-module (guix gexp)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (gnu packages icu4c))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX=3D"
+ #$output)
+ (string-append "CC=3D"
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and effic=
iently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syn=
tax errors
+@item Dependency-free so that the runtime library (which is written in pu=
re C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index bb459933b0..c7f7697168 100644
=2D-- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages vim)
#:use-module (gnu packages tcl)
#:use-module (gnu packages text-editors)
#:use-module (gnu packages terminals)
+ #:use-module (gnu packages tree-sitter)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
=2D-
2.36.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:35:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 14:35:52 2022
Received: from localhost ([127.0.0.1]:50624 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqJ5r-0006Sy-MC
for submit <at> 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 <pierre.langlois@HIDDEN>) id 1nqJ5o-0006SY-Jb
for 49946 <at> 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@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v6 00/27] gnu: Add tree-sitter for emacs.
Date: Sun, 15 May 2022 19:28:29 +0100
In-reply-to: <20220329194318.6106-1-pierre.langlois@HIDDEN>
Message-ID: <87mtfi63ut.fsf@HIDDEN>
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-Spam-Flag: NO
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-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
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@HIDDEN
=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-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 16:05:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 12:05:59 2022
Received: from localhost ([127.0.0.1]:50494 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqGko-0002mL-VX
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 12:05:59 -0400
Received: from xavier.telenet-ops.be ([195.130.132.52]:48440)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nqGkm-0002mC-Ol
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 12:05:57 -0400
Received: from [172.20.10.9] ([213.119.218.205])
by xavier.telenet-ops.be with bizsmtp
id X45u270054SV6L50145ule; Sun, 15 May 2022 18:05:55 +0200
Message-ID: <21d31e3130c8b0b6f105c3f35f31f56ecaa57f7d.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Sun, 15 May 2022 18:05:45 +0200
In-Reply-To: <871qwu3k5x.fsf@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-28-pierre.langlois@HIDDEN>
<0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
<87bkvz54cg.fsf@HIDDEN>
<c99ef163889ca07f581961b445ce738f09db6c81.camel@HIDDEN>
<871qwu3k5x.fsf@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-LETduVJzq/yYWPPJogcv"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1652630755; bh=n4xPXLSMukWGfzL6bsIhhG1+qV3Bzv0LdfMtQIfpiVA=;
h=Subject:From:To:Cc:Date:In-Reply-To:References;
b=jiuQ5kSK7hPL2s9ZaLYCAo8hp+YphakWaR7iDoJhriIZp8Vipr7M5j2NUteKNj/nL
ovygfLHCkRbEu0SK1HDc3LKZsI0yXRBMm44oYdJQFLRRceVb4FJsOeMxXzr0wDBnwL
F07ssfORts2IEgI2Kodc234DaIJW+qaOTEmO7j+82PAWFYcApPrvYMeljy4J3qyus+
/SbOaDZH8hKYokCgVhD6K9PG2l9Dwkqv+872moqGp+/IizCe0kU33NuGQpM0dphjmO
44mZsGRMjCTZnLdtrFAYHACHu+33n5CIGbLu5YTwSuLT7IfOMQqe8uPzb0t1ygnsw4
TVenOZrIRoPNQ==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-LETduVJzq/yYWPPJogcv
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op zo 15-05-2022 om 15:55 [+0100]:
> [...]
>=20
> Ah I see, that's a good point. I /think/ today we should be able to
> catch such things thanks to the tests, if the package decides to
> download binaries during testing it'll fail. But maybe it could, for
> some reason, use Guix binaries during testing and then decide to
> download its own when running outside of the build environment.
>=20
> Now I'm conlicted :-), maybe rewriting the build.el file is the safest
> option, and maybe if we get bug reports from people who would like to
> use their own grammars we could revisit?
Seems like an option to me (I don't think we actually know yet if there
will be interest in downloading the grammars from upstream or not among
potential Guix users). Though FWIW, they can already use their own
grammars with "--with-source" transformations (to change an existing
grammar) or by packaging them (for new grammars) and the like (albeit
with Guix instead of Emacs).
Greetings,
Maxime.
--=-LETduVJzq/yYWPPJogcv
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYoEk2RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gokAP42AmdGn5rkuoD93rOr2B7H/S9+
kT9b76Bj+S6Kgl1mPQD9EDSASDY8EBVYMDvigsoCovpSn1MPbG5D8IEZp8aqtAk=
=Nl4U
-----END PGP SIGNATURE-----
--=-LETduVJzq/yYWPPJogcv--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 15:33:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 11:33:23 2022
Received: from localhost ([127.0.0.1]:50458 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqGFG-0008EY-Nj
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 11:33:23 -0400
Received: from mout.gmx.net ([212.227.17.22]:44345)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqGFD-0008EL-Vb
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 11:33:21 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652628793;
bh=mPXL+UX3fAupcpwH5V5NwNW6tUmLhysuXphWhOjoWx8=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=VooIYaBYaTK8ttlbrHfbmps3+V1kBH+U89/0+An2DVX/fYYGIyrbOFYt8FiwBl9Tp
c0HqKwRgI4kOPQq4h9715XIC1OteXPMFJrOZdGr/BhM7nyM7euCw4dxiQzi7QCV5ec
RYQlP2mNvLFWNtayinP6HbrI85l7WgKo7by4Doqw=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1MHoRK-1o57nz25oM-00Ewu3; Sun, 15
May 2022 17:33:13 +0200
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-26-pierre.langlois@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: Re: [PATCH v5 25/27] gnu: Add emacs-tree-sitter-core.
Date: Sun, 15 May 2022 16:22:31 +0100
In-reply-to: <20220329194318.6106-26-pierre.langlois@HIDDEN>
Message-ID: <87o7zy24lm.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:1pFs3lUs9EOmiESS/clSUkDLd2UmoDnWUwmHyCAJjfvTOnFOBdK
rB1mZvy3Ihu4wNQbk6cygYiOkXgXHUhAvB85KuFYILEzHLP1wsw2S9T2uoiD1FTe2udDW0j
M4JsCazOy2MqQ1q9wV1DoYkx5VSo8RxMj3WjpeiOeNVpvGdMHabpbQCqPGH2MHMdwF0hSCx
SRBybpP+1HzDMrYi1MHFw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:P1310ly+KSw=:G5vSqJw6fnyjRz2mi8002A
qVDmASTwgi4B+ukjUEGkWVPzJv/PKGgrt20Y1NOHRVvZr0y9YHPuuStG8vQmiw3GYjJwEFERk
eNiFjzCP9R5sGgkfnCqWyY7hg3qhW/YsSb0yJ7p2nDc88incIH87hl+N7KMVpV1787C7K24M+
RsntxEU9WRIi/LUTPgbdzXsuVaZgOhTtCmv21//rbYCS2k25pNirdW9tWwoha6r8wAO+f9AA1
AH02xH+P96JdJgFAGYDSjw6OCWG3me6mry68ioeQrVEwTBvba7vUDRcEMoXBwGNuEls6EhEng
CRrG8vIt9B18vJZ6kCeHbrlEHubg/W+mIv4RIzv1RSVWg0jWod0eXH+PsKhvbgsi3c+QlOgtC
gbsb8+0rwIsx/mNdpA7IP94lSGRBYdl+n/1llBjrRUyngySvc+3/MhwFyg20I5NzEMP2Aca3S
wE8Cc7k4OT0cLWpSD08otZt5bByuI2zqVtIJkEl4vJkH02KxJcm2k9WkCHsYyddEkOHuDUu2f
v379kn9pwC14aVBpdWvr0AZQaUnriuC26n99UYUiDzQARPWXgBbxJK4ZyBflwneo68R3Cxe1J
HHNsfk8HLBUaQ4K8dWVQvI5IFKDZs8JQUePIAXQTgkcSHQVYsqqC1rX1korrCk8n+ZeHUj+dN
EwXzv/6aEQsnYP/wcIfzFCFS93xIaO01pYTIoLXEZlV479ZqEwIZv2L+1NfDXFuvGRV+0+S8q
TVz66hFLIxbUDKBq9O+9R2i9FzTtb5WOk5Hl8EV5fM6SD51WtbrOPalECVgGkVeSB5mvSnjG4
A39n8JakTnTus9sII2+HS/T+2dQ6dRig6Vb2uJQxN4IApCSM9D4KSVrthtwFfs8Sl6gK5F+y7
YQ2lctBpZWLeZ5Xtaff6xGvW0hojbiiSvznLsEC62t34KHgKJNSbOVq5pCjbEn4bCeiZ1NiXw
VLol6+UNyE1cofBAY7I7YEIc+6Tt/KC2FrCAHbwr5158LieTvqUTk9jOPH5ayHAqcmIA+5wGt
NIe63cBJtgyHixnjJ1Y5lclUHUDPDjPRMIdEGPvHHp93ap2l0EdtSXJ8c9KYY2NLaOVMwtrq5
C2HYiua3wXq+eQ=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Pierre Langlois <pierre.langlois@HIDDEN> writes:
> * gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local variable.
> (emacs-tree-sitter-core): New variable.
> ---
> gnu/packages/tree-sitter.scm | 78 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 78 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 5209876431..fb3d13b3c7 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -21,6 +21,7 @@ (define-module (gnu packages tree-sitter)
> #:use-module (guix gexp)
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (guix build-system cargo)
> + #:use-module (guix build-system emacs)
> #:use-module (guix build-system gnu)
> #:use-module (guix build-system tree-sitter)
> #:use-module (guix download)
> @@ -688,3 +689,80 @@ (define-public tree-sitter-typescript
> "This package provides Typescript and TSX grammars for the Tree-sitter
> library.")
> (license license:expat))))
> +
> +;; Local package definition solely for building the native emacs module
> +;; written in Rust.
> +(define tree-sitter-emacs-module
> + (package
> + (name "tree-sitter-emacs-module")
> + (version "0.18.0")
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
> + (commit version)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif"))))
> + (build-system cargo-build-system)
> + (inputs
> + (list tree-sitter))
> + (arguments
> + `(#:cargo-inputs
> + (("rust-anyhow" ,rust-anyhow-1)
> + ("rust-emacs" ,rust-emacs-0.18)
> + ("rust-libloading" ,rust-libloading-0.7)
> + ("rust-once-cell" ,rust-once-cell-1)
> + ("rust-tree-sitter" ,rust-tree-sitter-for-emacs))
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'chdir
> + (lambda _ (chdir "core")))
> + (add-after 'chdir 'delete-cargo.lock
> + (lambda _ (delete-file "Cargo.lock")))
> + (add-after 'delete-cargo.lock 'do-not-fetch-from-github
> + (lambda _
> + (substitute* "Cargo.toml"
> + (("\\[patch.*") "")
> + (("git = .*") ""))))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
> + (install-file "target/release/libtsc_dyn.so" lib)))))))
> + (home-page #f)
> + (synopsis #f)
> + (description #f)
> + (license license:expat)))
> +
> +(define-public emacs-tree-sitter-core
> + (package
> + (name "emacs-tree-sitter-core")
> + (version (package-version tree-sitter-emacs-module))
> + (source (package-source tree-sitter-emacs-module))
> + (build-system emacs-build-system)
> + (native-inputs
> + (list tree-sitter-emacs-module))
> + (arguments
> + `(#:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'chdir
> + (lambda _ (chdir "core")))
> + (add-after 'install 'install-module
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let ((elpa (elpa-directory (assoc-ref outputs "out")))
> + (module (string-append (assoc-ref inputs "tree-sitter-emacs-module")
> + "/lib/libtsc_dyn.so")))
> + ;; Writing the version number in this file prevents the package
> + ;; from trying to download the module from the internet.
> + (call-with-output-file (string-append elpa "/DYN-VERSION")
> + (lambda (port) (display ,version port)))
> + (substitute* "tsc-dyn-get.el"
> + (("defcustom tsc-dyn-dir tsc--dir")
> + (string-append "defcustom tsc-dyn-dir \"" elpa "\"")))
note to self: We can use emacs-subsitute-variables here.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKBHTUYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UaMAH/Au2klug6iBs0luGllQavrBs
zIFwaDek1AvCzkm4RmH0TSxNf1ScrLIFuxjaaFo8BpSFbwwVScy7AZIUQC144Rc3
o0g4IaHVaiBjH6Q0gX6pBVWcNTeKkqjv5SuoFNjJnk12kePcPoslHraRXQ+I+rBL
EapYY/8jUnP+/p8qO97XOyZs33IFiH8HH6+wxY6Xll5xjfrLF6A/28x+clSGtq0Y
skMFqUmEank5128VDzzEjQFTyRIqPor5y2ICRkRhAilP9xvFn9K2e5mHiBAMNV4c
RmGuxjYudeph6V//NwGOJMh/vv9+Fcx2SMzNwetSA5b33Q6edI/K1qksfzB7jLQ=
=Nw7b
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 15:11:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 11:11:51 2022
Received: from localhost ([127.0.0.1]:50423 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqFuR-0007gQ-DH
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 11:11:51 -0400
Received: from mout.gmx.net ([212.227.17.21]:60341)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqFuO-0007gA-T2
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 11:11:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652627502;
bh=sbHavQfv7w5IJzPOm8G8w4fFNGEV9dj5ui+rkGxXSy4=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=kRoKDO+WUB2NqbydljULIOaKv+DyqFm1tT5T1t2ip7gI+1wZ5MCaNhdMcX5xYB9Sq
pb0urNB8WxfyyvLQZQYXIMRvRAUuAQqv45BTzzx5pIEBTpv1aYxqQkWgq4plAGIoPD
glfUtzxJ/gHyMFZNI0q4mdE7mO4DvoaoB1e9BeUU=
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 1MEFzx-1nzv4d0b6T-00ADu8; Sun, 15
May 2022 17:11:42 +0200
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-28-pierre.langlois@HIDDEN>
<0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
<87bkvz54cg.fsf@HIDDEN>
<c99ef163889ca07f581961b445ce738f09db6c81.camel@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
Date: Sun, 15 May 2022 15:55:22 +0100
In-reply-to: <c99ef163889ca07f581961b445ce738f09db6c81.camel@HIDDEN>
Message-ID: <871qwu3k5x.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:r5uvJMmhsvwbm+P4SsHqem/nkmZApEkXaP0ljv+FPfGHvacVN0d
6BxClheTVMTG+clo7mm2l+zFPnfvmuTVfXRY9s83gbmKEx20nu0BZDA9TBU6KpE1GKWoZIO
YvombB0hnmjUOZpTDLNXSex/AU8LvHGt6BIBaqq+/sddf9O9/WwB6H1aMgXJ/nSh+4RC6G3
leRFjdYJee8sOhQwwlAGA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:E83ZB/KZObY=:8fuBV95GhhTVIDihDoTcRR
wFJnoMUUlI1G6gspB7e607AsrQ9h4YChLGGpS1U6DeICgGfzJ5NU+hsu/u2WWPaN4Zz4w47Gj
5zGpDkMbR0xSA6CdsOkjKsSSmNwrej/MSIzwvd+Fqr7e3JrHkjLh66MTayU+LJqTzUUWsNrMl
8MQchND4wNMdqQflsqspLh9lQfJO1xVkRGvg/QEzr1ywYHXfMqoLKs/7vf5CwsSK3YaAzgU67
GGRbEW24RZW7zvjbxRihCEr1uOntSoQP910EY8byTdhTY/Y00rzcc+LWbpu/sM3YoeVLiHDju
5dDJ5v7sheYOmVx812Gc/Hc4iI7fVNCeFS0yeZaLA0VnKd8dM9AizKzkL44zSCK2Iq7izetSU
GOViURHmamfqSAYFITgIoc5BfTNhuF4QQ8I+XrKPZ2pTWy2p5O8sAU5zuZ3ySFGI1HcN+YKXK
C2JNfqgCOcQmFMGJ3+rv+Q859pD21L0KrJVpfKHGNGdizP9lqQqahIlpdWimmoJQJElvtfyG7
vjsT92subHZEbdoQzYNjOBukPUtNTzIRgLO9eoauryLUc0ikaxav95DIXCU9BVkz4PtzcDyg9
QB9Sa7RnDsTw1qkEP59algGVS5C+g7Ef9RsACo07LVE5F0K5zksmuvXaMjNvE/r83S/WoOCyS
ADuay0tN2/nhDtHpqGHEI9C2u4UHpVLf+wPuIc4xYX9AgRO4d3pf+e75f3Ukk37+nDU1tg0A8
uJRuLehXReyvjHslDHb8f/6GVUn2AetMxxlgSxXVV9l9tsECL+8mF2QzXAWHzIRIl3HOXHU8M
vhXo3k4pqz4wVrRxxawdtCuUxkNve3BHI6kzwPlINl2N+ciYFSi3ZDuOJ1FeWEpjUr3QrSqRJ
0tL2NwILmSXgahTfXDjPtzJwT1y1g3GcmY0krZTrKYUOGxZTpgL3TPuP2G1yiJzNU16geicuI
wSy8mAFIvmzU/7v4s6MsA8MiDmeHy5vNd6OKkyW6//2miA/+/stJCuaW2IQGCnHPcsquq6VCD
gOjXfBERoaBZFOLKvj7dP+OH+daRZXheQc4JCKcWaU/8BoO0d6lsa0MMKlhtQxUujHQn8TfhD
Oj+Jgy1jlhFR6FKoGYxAAqpJB6NKuvzCr4dobQJ3I4LJsoZBc0n5hoczw==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op zo 15-05-2022 om 13:20 [+0100]:
>> I 100% agree that by default we should make the package use Guix
>> libraries, this way it also /just works/.=C2=A0 However, if somebody wan=
ts
>> to
>> do things differently, I'm not sure we want to get in the way.=C2=A0 In
>> the
>> end, this isn't so different from letting people use an alternative
>> package manager if they like.=C2=A0 We'd rather people used Guix of cour=
se
>> :-).
>
> OK, my proposal to prevent any accidents (what if we misinterpreted
> BUNDLE-VERSION / the semantics change in a future version, and now
> binaries are downloaded by default), not to stop people from choosing
> to do. Seems a bit risky though (see the bit about future changes in
> semantics).
Ah I see, that's a good point. I /think/ today we should be able to
catch such things thanks to the tests, if the package decides to
download binaries during testing it'll fail. But maybe it could, for
some reason, use Guix binaries during testing and then decide to
download its own when running outside of the build environment.
Now I'm conlicted :-), maybe rewriting the build.el file is the safest
option, and maybe if we get bug reports from people who would like to
use their own grammars we could revisit?
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKBGCoYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U5mAH/AiJd6i7GkrdtZYUTYq28BR3
4AhEDc4+KkjCkXTGtxYBSf43ubF9gDFWl+QnNhbCvTS77UrGC1ya8et2oWCpv8HO
daSKKzRM20bT3A9eNAM0XuhzgKQSek/Cwbjb0k8rKg5yoJGc28ncR2EWX6xHKiRy
JtDoMjHGgIqObPoujNwZLs2f7DRPTXFkGv14JmEmImHfGLFHwVG7HVGGC9k77Rma
VbVqK1RWltrSXsv+PMJLfrSYR+G0lqIoeGkgYYsOUU3ZTkAirP3dKFRnATIN4Wce
CFk1L63jMslowHV5nAbQWSrQmtZ/YiK+VXW0mCzSkT7nDzaeRYfYh3fnriCxHmk=
=hsKp
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 14:33:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 10:33:29 2022
Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqFJJ-0006jC-6h
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 10:33:29 -0400
Received: from andre.telenet-ops.be ([195.130.132.53]:60978)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nqFJG-0006j0-O7
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 10:33:27 -0400
Received: from [172.20.10.9] ([213.119.218.205])
by andre.telenet-ops.be with bizsmtp
id X2ZK2700B4SV6L5012ZQSp; Sun, 15 May 2022 16:33:25 +0200
Message-ID: <c99ef163889ca07f581961b445ce738f09db6c81.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Sun, 15 May 2022 16:33:19 +0200
In-Reply-To: <87bkvz54cg.fsf@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-28-pierre.langlois@HIDDEN>
<0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
<87bkvz54cg.fsf@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-IUrGZXhadO6Z7J3MWV1A"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1652625205; bh=6z+QT91i0oLikOczTlhQ6UkhwxCsCcVsjk1L2z6KxfM=;
h=Subject:From:To:Cc:Date:In-Reply-To:References;
b=jeAAZdE7qo3pJf0IOMYBJi6CUzhvCpETAskNXrc6YM7Oxee1SZ74IicAQbVBBuDhJ
ZF6kTtoSBU4RX/GIX7ByGhUYbISUJNHs8uI/Zc/0peyB6OG6WPeScewxVJU6wS32/M
sxCb7aOlMZZ6o54hH2lQGXlHRSW/JXn9pAPH3mto2a66U+PWZcyfe5Qkrz6yYGpf5M
VnuQDqJ1ZLtXFTzw94N1bns+LCWcMZqJvnHpAMSVyvhBASHtQMhJ0cK6Oa2quztJvm
9rMbJMPsCIVaVejM4zSp1OLFwp2lrGq0Bp1G6DYijei9K9NAiGKoLWTuEAPpNKOVaw
5HwtxLUqIejoQ==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-IUrGZXhadO6Z7J3MWV1A
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op zo 15-05-2022 om 13:20 [+0100]:
> I 100% agree that by default we should make the package use Guix
> libraries, this way it also /just works/.=C2=A0 However, if somebody want=
s
> to
> do things differently, I'm not sure we want to get in the way.=C2=A0 In
> the
> end, this isn't so different from letting people use an alternative
> package manager if they like.=C2=A0 We'd rather people used Guix of cours=
e
> :-).
OK, my proposal to prevent any accidents (what if we misinterpreted
BUNDLE-VERSION / the semantics change in a future version, and now
binaries are downloaded by default), not to stop people from choosing
to do. Seems a bit risky though (see the bit about future changes in
semantics).
Greetings,
Maxime.
--=-IUrGZXhadO6Z7J3MWV1A
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYoEPLxccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iA1AP9B7dtADW2nf2ZKRAwVP+dfbJOX
U9zKtXhJfCX97YBOvgD/VpJvgGQvqEIB056DF2RuiZ14yTRBNMMnBcOiR0CG3AM=
=dLpL
-----END PGP SIGNATURE-----
--=-IUrGZXhadO6Z7J3MWV1A--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 13:23:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 09:23:03 2022
Received: from localhost ([127.0.0.1]:48772 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqED9-0002Ly-0C
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 09:23:03 -0400
Received: from mout.gmx.net ([212.227.17.22]:48965)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqED7-0002LI-1w
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 09:23:01 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652620974;
bh=QCnU0piBfFH2BQac7OEEQ7pzBgH4qPF3zN6kqOLDYS4=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=kyVNVhwhk1vCGZ7ohsD/ZkBoVuoRUQeG+d6aO5iPCy91jOyNv1OKM9KyGF/Y+E3oZ
iNvRJY7Ww+wPdtNR5iOJjXh7ehIVctgA6D6HwILbeC7fmPlvpLxpwbHFW9/ssesJ5K
2nNi52wlvZg/YpLfFcNj46+I2Z7Yz9cULY0sUpBk=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105
[212.227.17.174]) with ESMTPSA (Nemesis) id 1N4hvb-1nj6i11xX5-011fpZ; Sun, 15
May 2022 15:22:54 +0200
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-2-pierre.langlois@HIDDEN>
<7d5f974bd32fc3169cadf2ae0cd6194ddb9a080f.camel@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 01/27] gnu: tree-sitter: Move to its own
module.
Date: Sun, 15 May 2022 14:16:35 +0100
In-reply-to: <7d5f974bd32fc3169cadf2ae0cd6194ddb9a080f.camel@HIDDEN>
Message-ID: <87pmkf3p79.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:vKnMBjReNwmgpSaZcpgeJ8WFqwiFstV+Sw5fo0yZGO+JJTgse/z
3nQyiqwMt7vAUvNYi6W/5mDQdD008OHemcZRfGaEaNIoGfuNY9x/PpVRKPvzTfHIJtQCHYf
usa4bC+FjBEaWtnsF9AVtl0b0shxsKivgdqaXBH9qfNWJW6WRD5/C9gneadOsgQKkSGyrPJ
a/z07sZz8u7bAWWVkNh9g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:TrhNT4qgPdY=:4b2KPKvfzzPT2BThHc1GsJ
9nrtvWwnI5wq7mRq/Kkx7QpKJzQBTSdNBSI2N5rX1NvhN+3q+wOP7+7YSazwOf6x0ee0VblkM
fWC8Grmt0wIZMdB6k7wKMdAPz8BfPnJOgPxRjMNCFGpFOsyMN5WZUokG4gsnDFbhQNS0LX8ss
IlUZRRR0aTpp79U5ob09EYiDWTbhACIGsO9e2Mwt5qDj8OPPpxPrD8PaLAnJEMyePCCKv5695
nN68GhpTFyWbYV5y78OV8mnRKOcm6JJcwIVNZgT3KOX0CqFC4rqbXscqaV7J3Wy/TFxGkekfg
1UQbD+yB7w8aaFyddBZSwajHk2UoH8P7karrKO3WQSE34RpMEBzmtwJ9+xnGO8+4MXbtUVnKn
qwNuyb00ZiyLrFSCWxbYsYl9RVqPVz/00QZCGoveFexfWEhSW01yn5tYXinnmC7vpKejgdBBV
95YB68x1JwPJP/Nife2aEIzXVu0eGQ1GEO8KPJiJUGa8Ax6FWlgksqQJ9pt+PgDMsF0HBkZLl
VA+Uuzxf4n0XqgRxRXwWudHyLqxDJZHs9q0ZM7lilWnacGilvRz1yWNjb2CjyP2Z3P5jDRzIw
nJPOm/eXBrZEpuNsBfEtwkx0vZXo92KD7jVOfPUt4oIBY/JYQtfe4Ejm1eQcpqsVBQik5VVEI
Ilk7KV7rB4h7aMRdiH/fSYX436hEP9xtw9v3c6e6XfYi8chrM6rJxmvrkrnYP8b+HEsyDAr8C
oS/QzX0e3yziPNTcr3mYD/auyweHBvjAx3ghfkrgev1KZLXA64IwbTgbYxbzX1jGD8xPgBfoH
pqigdXSlnCt0cbx7a828rFX6ZgekPkaGFnd1mgYtsQB+Z1P9cE/iI7IxiaQeHis5PeXSifk//
d7WAMyPICGOdAmfTf7z61fmXJ5mBFy3WPx3oGWD0m5fZGZg8cPtDTuK1cCWURLtQfkX+eczy+
4cOeqvZQKUY0L/kLlcj+ChBUq1Pk7ArTCkeFiOTYbKDH9fUBg35CI+9WulPyPI3oqtjgttNOC
T1GBmSbVbyKnPy6pzQk745SnJXvvmZTi7dXtRPkVmNWst52FhZHeyNS11fHltd16bXNpaMtrS
nTr+I5T3yXf8f8=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op di 29-03-2022 om 20:42 [+0100]:
>> -@item Dependency-free so that the runtime library (which is written in pure C)
>
> It probably depends on glibc library, so strictly speaking this is
> probably not technically correct ... but maybe good enough?
Oh actually, looking at a generated parser.c file, that statement appears to be
true, I was also surprised. The generated C code looks like a huge
table of rules, so it's more data than code really. For example:
https://raw.githubusercontent.com/tree-sitter/tree-sitter-c/master/src/parser.c
I suppose it was easier to generate C code and compile it, rather than
define a custom binary format.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKA/qoYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UJZIH/0kHz9qxm02VJ0fldDJHp0Gp
qxtEiFP8tSYDURGTyWj0LFWw0bozSeEm1R6IFfFRMly8bwF2RF6kGNbBq/wtS7t7
solVLlQnYF0pjgxf1UwXawN0MXlFrbRUGYXFBTmzNdpvPUN9bF1CwUgAci/5C8eC
yaPtgXrT/wdz7h+MhdkrzVWLXKRlCMI/FEYVvEYE/1ApaR2+QcyUNW36ASB+uevM
but+ECGWO+QIcRh2D6JI+ehym53ScE+LABhFpSSDFZpGMAf9hMTyTaQu6jzMxsXE
x9I0VzSDBPE91xFmr7lbYHQvMQVBGLw0DXLND5ACD1FhduzV3HtJpopan7qeT1o=
=d2qD
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 13:10:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 09:10:36 2022
Received: from localhost ([127.0.0.1]:48762 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqE16-00020Q-9y
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 09:10:36 -0400
Received: from mout.gmx.net ([212.227.17.20]:58023)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqE14-00020B-5L
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 09:10:35 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652620227;
bh=B0Y4DSELNuHC5ocT64+KrCKinq/bMnNrb4ecpo1bFBo=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=ZxrQBzyJn+hYTVF8Y607ga4EEHoTxQ237x2kT6mo6a85ksGOJhUpx3qamjQE5pE4B
F2wlpiuv19FirexVe8sNu9cP/d9vFCRFFX31Ivcyx6E4JJh7vZ2HF0criTvIxi4A94
NO5I/AfrU4KCGAW9ayLEbHYxjd4l5hhm7qTIdCzY=
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 1MkHQX-1nS7Tu2IUj-00keC7; Sun, 15
May 2022 15:10:27 +0200
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-28-pierre.langlois@HIDDEN>
<0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
Date: Sun, 15 May 2022 13:20:48 +0100
In-reply-to: <0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
Message-ID: <87bkvz54cg.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:BpoOQTGXsAkVZd6dUuGnI2V6jdwAUAuIONhiRgwSsOBoXvLWge0
1zT3XzrO2SpXOTgFfPnbMBO230Rhm6OITt4KZnJ35QuSbvV4TMqRjbuigbKpsSVBFs3WjE8
CUA7Ht+XXQyuVcf313HG0tkaFQoxyK4KDkTGwVR/HeAAyMGWYx+h3L8MAUND05T3LfHKtbw
YRqP7rJSvk++xfVmCA60g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:8cssDhiFE2c=:qMlVbvj/evXtBlrf4DiFHa
KjiAzJ2KPspRvKgnWZib2CAHbxDXUJBJit39fb5ZZPCAUs4BcTHs1s6obZMX2EgYiA50tO08I
DHEG2m5AzKu2BVePAWseHvhQAUqwp5T9orSkg5pYX14KrlILcYNpd11kdro0478pppQXpimql
xTrJ1kC8JA5qrCk+DB6w9mH1GyAKoA6CD/vzNJ0VJUhKfybm8XyrZB57LpWEKYBHrXPOn2dhs
3t21oa8+LdDkWW4r4dtE0lZcMnVTeYfUeQ4kUjk2Fq93jxRihJhZiOjaUoOx7Or1xGdjvgZLf
rpXAq3kbzdkFYLrw+RV0bU82llVFyHN18hXpLck76Z0jCk8CxXb++41I+XNVkbiXshQ1DtU0l
uDw+IadkrZmLxac6W8G16+tr8veV1RTJpC1dpAOxMJQ5WY6TeGWGkSgJrFcd+Vl9aUgz2z245
k+oNPyRixsN8YaYzey8y0/xhNwXDrJFXFFVoGcj3hpvQ1VxpvxJ+WCz6yp0kpNnGsZOkMO1pM
2TQU3oSLBvHSz6V6P1ZJbQfr770YMHsVwxmfA6n151RXWINkVKYgPOzpYOrLE9f1GUsJgyhk0
EBsMBmGpweZ3O4chYh9wx6ghNAXfbR7yyCQuNj1tQ0+icab+L2ofojwrXQtqQird1+mljMG2k
NbfUN8lDwctxP4njO+GT/BR34VbRaqUXSV5GgCBUVn5qhnfmPl0PjUOI3IbpvZbgCgOmL8rGJ
t4FXNlGH5bMC1tdcz5leRL2f2eKivbPOHgy/WqwgREp0JM/N74lxB3Z/+VY/GdEOkQrSAFtO5
N0HcNfFxuB5cCvpn9FH+EaiK8SVD//+L5HXYtAE33he0lqk542yMszp6/Qy3bKTZ3LrDl8KLA
3pH2H0ukzfALKIFQ/E6wB8jJxKdJiWuE9xfbk0QtiI9VEk6LPyIBwMzUlHAgtt8eWFznnUadx
P87AHrPsnIpjVdXwmeXizWtXGgvUsxyg5h//BdfJPiOHNEMlFhfwZ6koec+mWEzWporA+EGJk
iXnCwFVtsN7SbEzqYUePWzydN+ReAQFYnPxepRtc64UkKEk+TyKkfsrym2RWLxMziZEN52I3A
2F7RPzuk8/vhmT4tdawzrMLgfXMnoL5h7rbG3wEnlXtSVB+OUkhVwQCMQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi Maxime, sorry for the late reply!
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op di 29-03-2022 om 20:43 [+0100]:
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; The BUNDLE-VERSION file prevents emacs=
-tree-sitter-langs
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; from downloading libraries at load tim=
e.
>
> WDYT of patching emacs-tree-sitter-langs to not download, such that it
> doesn't download and run non-Guix libraries behind the user's back?
The way the current patchset works, by providing a compatible bundle, we
already prevent emacs-tree-sitter-langs from downloading binaries by
default. I agree we could go further though, and entirely remove the
code that downloads binaries.
However I'm not sure about it. Essentially, there is a
tree-sitter-langs-build.el file [0] that can either download binaries or
fetch sources and compile locally. So a user could decide to opt-out of
using Guix binaries and instead use an alternative method.
I 100% agree that by default we should make the package use Guix
libraries, this way it also /just works/. However, if somebody wants to
do things differently, I'm not sure we want to get in the way. In the
end, this isn't so different from letting people use an alternative
package manager if they like. We'd rather people used Guix of course :-).
I don't have a really strong opinion about this though, so if you still
prefer to delete the downloading code, I've attached an example patch
that entirely replace it with a bare-bones implementation as an example.
Let me know what you think!
[0]: https://github.com/emacs-tree-sitter/tree-sitter-langs/blob/master/tre=
e-sitter-langs-build.el
> Also, why do we need a bundle at all, would simply installing emacs-
> tree-sitter, and, e.g., tree-sitter-java, just work?
Yeah, having a bundle is fundamentally how this package works AFAICT.
I think the main reason is that in order to do highlighting effectively
in emacs, it's not enough to install the tree-sitter runtime and a
tree-sitter-<lang> grammar. You also want to "configure" how the
highlighting is done by providing custom "queries" expressions.
And this package provides queries for every language that it supports:
https://github.com/emacs-tree-sitter/tree-sitter-langs/tree/master/queries
All that being said, I believe that long-term the idea is that upstream
language-specific packages would eventually gain support for tree-sitter
and then this bundle "glue" package will no longer be necessary.
Especially if one day emacs proper gains native support for tree-sitter
(I think I saw some discussions about that on emacs-devel last year).
But given this package is quite useful though, I'd be surprised if it
goes away soon.
Hope this makes sense!
Thanks,
Pierre
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKA+78YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UEhoH/RFOtPgATPZpLBDnq1Bh4Rft
WbZ+x+QktpWy/VZoAe5QFKIStEPQoQLQJK7NOhsHN844w/lSkVLf5DN7MSUQl6BK
6uEAKDp6gUgM8AvvMTd283ZJJwzHL1GE9y8/yX6gXuKxDHko041XhwJTT/xcDCry
X3xXTDft39FaC10KNUj+6UJRg1I+q0LF83Sk811L7IR4wVO6TeA/P5is7W51EUD+
M0T8F3VrMxgmnA4/KHBkvs4r/ZAnAPziG5mN69OsdZcWYW3+YhtAJsBaE89Mm8df
IygS4yupJsG/4PfurZhm0YXrpLi6PpURUAecmW6sr9O8c2t3mfIlAl8K+x83L9M=
=FtGC
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=0001-wip.patch
Content-Transfer-Encoding: quoted-printable
=46rom 7ad62ccef2446011dfbdfb2dbe8cc58f46fb05d8 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Sat, 2 Apr 2022 19:22:52 +0100
Subject: [PATCH] wip
=2D--
gnu/packages/tree-sitter.scm | 49 ++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 7e14ebd1e3..d6892db6e3 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -795,11 +795,11 @@ (define-public emacs-tree-sitter
@end enumerate")
(license license:expat)))
-(define (make-emacs-tree-sitter-langs-grammar-bundle version)
+(define emacs-tree-sitter-langs-grammar-bundle
(package
(name "emacs-tree-sitter-langs-grammar-bundle")
(source #f)
- (version version)
+ (version (package-version tree-sitter))
(build-system trivial-build-system)
(inputs
;; FIXME: Support for some languages is still left to package.
@@ -836,11 +836,7 @@ (define (make-emacs-tree-sitter-langs-grammar-bundle =
version)
(map (match-lambda
((name directory)
(string-append directory "/lib/tree-sit=
ter")))
- '#$(package-inputs this-package))))
- ;; The BUNDLE-VERSION file prevents emacs-tree-sitter-l=
angs
- ;; from downloading libraries at load time.
- (call-with-output-file (string-append #$output "/BUNDLE=
-VERSION")
- (lambda (port) (display #$version port)))))))
+ '#$(package-inputs this-package))))))))
(synopsis #f)
(description #f)
(home-page #f)
@@ -861,7 +857,7 @@ (define-public emacs-tree-sitter-langs
"1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp")))=
)
(build-system emacs-build-system)
(inputs
- (list (make-emacs-tree-sitter-langs-grammar-bundle version)))
+ (list emacs-tree-sitter-langs-grammar-bundle))
(propagated-inputs
(list emacs-tree-sitter))
(arguments
@@ -870,15 +866,36 @@ (define-public emacs-tree-sitter-langs
#:test-command ''("script/test")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-downloader
+ (lambda _
+ (call-with-output-file "tree-sitter-langs-build.el"
+ (lambda (port)
+ (let ((on-load-message
+ (string-append
+ "tree-sitter-langs: Grammar bundle already inst=
alled "
+ "via Guix. Installing external grammars via th=
is "
+ "function isn't supported, if a language you ne=
ed is "
+ "missing please report a bug at bug-guix@HIDDEN=
g.")))
+ (format
+ port
+ ";;;###autoload
+ (defun tree-sitter-langs-install-grammars
+ (&optional skip-if-installed version os
+ keep-bundle)
+ (interactive)
+ (message \"~a\"))
+ (defconst tree-sitter-langs--queries-dir
+ (file-name-as-directory
+ (concat (file-name-directory (locate-library \"=
tree-sitter-langs.el\"))
+ \"queries\")))
+ (defun tree-sitter-langs--bin-dir () \"~a\")
+ (provide 'tree-sitter-langs-build)"
+ on-load-message
+ #$emacs-tree-sitter-langs-grammar-bundle))))))
(add-after 'unpack 'remove-cask
(lambda _
(substitute* "script/test"
(("cask") ""))))
- (add-before 'check 'bundle-for-testing
- (lambda* (#:key inputs #:allow-other-keys)
- (delete-file-recursively "bin")
- (symlink #$(make-emacs-tree-sitter-langs-grammar-bundle ver=
sion)
- "bin")))
(add-before 'check 'patch-tree-sitter-require-test
(lambda _
(use-modules (ice-9 regex))
@@ -906,12 +923,6 @@ (define-public emacs-tree-sitter-langs
(lambda _
(delete-file-recursively "queries/hcl")
(delete-file-recursively "queries/pgn")))
- (add-before 'install 'install-bundle
- (lambda _
- (let ((elpa (elpa-directory #$output)))
- (mkdir-p elpa)
- (symlink #$(make-emacs-tree-sitter-langs-grammar-bundle v=
ersion)
- (string-append elpa "/bin")))))
(add-after 'install 'install-queries
(lambda* (#:key outputs #:allow-other-keys)
(let ((elpa (elpa-directory (assoc-ref outputs "out"))))
=2D-
2.36.0
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 15 May 2022 12:19:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 15 08:19:39 2022
Received: from localhost ([127.0.0.1]:48712 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nqDDn-0000ce-Ij
for submit <at> debbugs.gnu.org; Sun, 15 May 2022 08:19:39 -0400
Received: from mout.gmx.net ([212.227.15.15]:46339)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nqDDk-0000cP-QG
for 49946 <at> debbugs.gnu.org; Sun, 15 May 2022 08:19:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1652617170;
bh=GHKREpXmIJVLkt6yw5zo6udFblXT5HSZsviNP8d0Ta0=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=H/sgPtpjF8s9S5fsjNffxioV3Rwhw9GQWRqEL4pckKCq3UqDppend5ByxVTtzzAi0
JKj3pxHqosQCay2Bfj0CyOs5k7jj9fOXo7Gyr8eSIvZXM+notMt21kUaEgzUMMq07K
AKPtnLGqwJ7e+ByReN6HUrwUR8b2glJg3WU1wI+s=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx005
[212.227.17.184]) with ESMTPSA (Nemesis) id 1My32L-1ngvpm32C7-00zSus; Sun, 15
May 2022 14:19:29 +0200
References: <87ee0vlofx.fsf@HIDDEN>
User-agent: mu4e 1.6.10; emacs 28.1
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Mekeor Melire <mekeor@HIDDEN>
Subject: Re: State of emacs-tree-sitter
Date: Sun, 15 May 2022 13:14:02 +0100
In-reply-to: <87ee0vlofx.fsf@HIDDEN>
Message-ID: <87tu9rasz6.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:B7YB2cx2Rr3FNpvpPb8vS+gwi5WSnuzwUlpRbFrh4VWz83+AqMG
+ObPQDdZlBWCT/fgd0yBN7w8ub8n+59jDMkFRDWs2FhNxfY28uu+T/tmEpibm35BY5QxG1U
FO+y7s7bi5QC9axj+UYNTJuZNhRMlXoAk3C3xSS7zyENEohcfSulC7QhHRHh8W7dge+3z1l
a/uhlKk1NFh4jNUWihAbw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ZipXKbWRYmM=:CXNSP4be1um5DzKRjyyiTe
pNNtDLfITE4iNOOLmIYjvFu1W4VlvOw1UMdIa8uy570lZfl+HkIrAfazu68x1nFjjg1STIoVl
0IZJu7aOp9lEwMCyuyNFG3d5ZRUqrw3qlGA8fVhntdwJbEtkCIoiREgx00gNFDTdLqOqMop0Z
mA5tdzCXCq8x5GI4363yS2huFYbQBxTweaTh8wAu5ng/jTaJp3t2juAkFeclC6f99MPqTmPff
ZmbqG6YqomW1dMULnUc3ZfFMa3w/gmDYOMr3lXWpWJD+PAphjDSUgu004OUUfgTX1Zdi0CMT3
kpNkMjRnNwdqu4T8SaQrQDBOLdlpmoVAZcHeaEDulxFTQF68tHHzKUwrCbFd60itMUQ1PWC+O
ENJxYnaDai+vjHKumECwzKSu2d41jO161laekUt1HRKPEIAGQlu8jY/6H2d24mVnjC2AcCqux
PuX9foWRysLFF5gpDqzBUReYEiOC9DALWjn1GLzHJ5aF35fvLDtRgYA7kGVEvqs9dQIDLgRKf
ymINOLWhL2AiU9HDVcd78zz/1bQCTOt32r5wM+c5DH616zw1rsMYuhyCPDWlxHYcpjRrgJdkP
0KYArqWQimEL7fyMj3mLnHgWbclAIpB+NAffW9vzl70X+Q4BqhCpkslDk4fbi1ZH4sUfHKq23
Q7WVUaMPosoGUPYHbj4RLw9ZjAVkjzTiT4CCxXG40kZbt9k1tcdwsXeVD0fMq83LhQ2Mx7WBi
UYDo02E7oo87k101jdkYKvFkNRSg1DS8xowLa6f8JhB00rEhJ2nCYKeHhmbLrcxHpIP3bFtXs
kmvGqqrjDxpjFMbDau0Nbge4jvrmRc4LrnR9esIYif9VYH9sTpYJtUUsba8FZrNu29GYYc0Vh
A6VfE7o76eTJKcqc2QP88MpObWrBDI3zF73IhIzfxItHbpbcDtzU7JpOoP6aVnrb7AZNjLvAc
fO2y1kEC0h3DdjJl3gnWXjMwtUxmVQkoH7jeoyE+n02u+piQgVK67G2MzER7p9VzdZm5k9JsN
spEs3ykOdrNUq1IrXhNXRjf9m4MwfWAnTlr1V0ZAYpCapTM7FqK756xeZDAfu1lYYaNiO5WrW
4j3sQOZPU4KquA=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: pierre.langlois@HIDDEN, 49946 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hi,
Mekeor Melire <mekeor@HIDDEN> writes:
> Hello,
>
> what's the current state of this set of patches?
I'm still working on it, sorry I've not had too much time for it these
days.
>
> Pierre, do you happen to have a channel or so where I could try out the
> patch-series?
I don't have a channel, however I just pushed the series rebased on top
of master on gitlab here: https://gitlab.com/planglois/guix/-/commits/emacs=
-tree-sitter
So if you'd like to test, you could use this instead of applying
patches:
guix pull --url=3Dhttps://gitlab.com/planglois/guix --branch=3Demacs-tree=
-sitter
I suppose I could move to a channel, but that's a little bit more work,
and I'd delete it immediately after we have something upstream.=20
Let me know how testing goes!
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKA780YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UR0QH/3QLSqFH1KIz8i0XIALghG7T
jbOXjtvGgHNPaxFfddbkWmFtbQnkmiIFMD/jn3ISiG693XePXcIoGk7+EukoT4Ui
bro3gqqc9xaW9KHdVIap3sau3JP6tNm64194R4A+5J6SqIiewERxwslw5Qt4t2sd
pt065InGY4cLcoic9AxmYvYdncLTnWMkL2FGmTgRADWrcyT6vLIxIUzE+/ZuBnxa
2bAh701Kj2+VplpFN571v6pxR/2y2i2BBo+POARH2YXVukShmpO9UeR6/iHKcqhd
kQALwhCgXlScjyXOxABpnrffpGJNjSNPkkp0gGJ640YD7rsusRedBIiaJFOTpHQ=
=pDAj
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 14 May 2022 22:51:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 14 18:51:07 2022
Received: from localhost ([127.0.0.1]:47696 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nq0bL-0002Kr-3i
for submit <at> debbugs.gnu.org; Sat, 14 May 2022 18:51:07 -0400
Received: from mout01.posteo.de ([185.67.36.65]:53671)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mekeor@HIDDEN>) id 1nq0bJ-0002KH-DH
for 49946 <at> debbugs.gnu.org; Sat, 14 May 2022 18:51:06 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 35431240027
for <49946 <at> debbugs.gnu.org>; Sun, 15 May 2022 00:50:58 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017;
t=1652568659; bh=KsPnMcffsaPFmCMpbvUyqpoJHPjwsw/BvmlRUhCCP0g=;
h=From:To:Cc:Subject:Date:From;
b=VRgVYGnxKP1RAPBPZJDUoI15GwrYQMnjhKQaFQpVtzKHEcYs7Icn4tUXRUqsoXnb7
XhhClq158HtRGOGGbs4COgElH4g9127kwQuPnnoThvSXJ3CXRXLuTbxXpco47On2f1
sOXicJICCRVdGa6c+1O4FqnN+8mMXSZr3r2+9mnfAWt6rP2bi7LNnnoo0ZWSFNPDB4
u/wAb+FtQhph3Z/taed9QxWs2ec80vMe7mT9jQpTSNpu6EYdcWWhBwc7tkwkv+C4SJ
7hE4r42xTQQ6GbFfBR7ypdyTPUva9/8b73z4E9MTa2q5U1R570/0YUVfkpZy58VgtH
AZHd6xU3286eQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4L112T5h1Tz9rxB;
Sun, 15 May 2022 00:50:57 +0200 (CEST)
From: Mekeor Melire <mekeor@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: State of emacs-tree-sitter
Date: Sat, 14 May 2022 22:36:54 +0000
Message-ID: <87ee0vlofx.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 49946
Cc: pierre.langlois@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hello,
what's the current state of this set of patches?
Pierre, do you happen to have a channel or so where I could try out the
patch-series?
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 20:23:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 16:23:59 2022
Received: from localhost ([127.0.0.1]:33728 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZINj-00062K-B5
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 16:23:59 -0400
Received: from xavier.telenet-ops.be ([195.130.132.52]:38068)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nZINg-000629-H1
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 16:23:58 -0400
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by xavier.telenet-ops.be with bizsmtp
id CLPu2701z4UW6Th01LPumf; Tue, 29 Mar 2022 22:23:55 +0200
Message-ID: <19886a6f03b8e8f16064c795a3c111abc7a4e5f6.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 01/27] gnu: tree-sitter: Move to its own
module.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Tue, 29 Mar 2022 22:23:49 +0200
In-Reply-To: <2c435f65e2b30348442ef5ebc043d8bcf4146ff2.camel@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-2-pierre.langlois@HIDDEN>
<2c435f65e2b30348442ef5ebc043d8bcf4146ff2.camel@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-PQVI54QrWxWRUItiNus1"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1648585435; bh=9ObZqGOglj6NQhfUMwHErcDNfIyq0tdO/Nfssx394RQ=;
h=Subject:From:To:Date:In-Reply-To:References;
b=hQYX90jtwFs0hPUHDUrUTNmAaLQS8xNP5LRsmwl5LDkNdVI5eXOZE54760Pby0OWu
xgkvMnzM9+W3VROamtp2FYkaCbLvCUNJOYPv/+8EVaXAtuxeoaa9D1dKHdpU0W6eeB
xzYm7TqoPC5TxbiTn0RlUpqO/Jc2hPljPGyMxhfWlhMr3TMAXjXsnFk+w19NOpDCPc
ZrCGmN6mm2CA+ICNCXgRexSPwzKNo5dIw632l/OULt+eCUEpBhGEBkPcmP2p/T6Wg/
DSi8+l7Llq+ILOy73IdEP1tfJGr4tjdjdAtYsPwsPRjBkKxGwXYQBNEWOoPGgAg4uV
BSHhYMJWV80rQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-PQVI54QrWxWRUItiNus1
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Maxime Devos schreef op di 29-03-2022 om 21:57 [+0200]:
> Pierre Langlois schreef op di 29-03-2022 om 20:42 [+0100]:
> > -(define-public tree-sitter
> > -=C2=A0 (package
>=20
> Is my local guix too old, or is this package not yet in guix?
Nevermind, looks like my Guix was too old.
--=-PQVI54QrWxWRUItiNus1
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkNq1RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vC4AP9dDcQZz7L2Tli/U75kSDdH6SNL
6epfBwwt1ypjUOj7ogEAvkf4jvnw6SVDbolaihkfDcEMrS5CiR0MKpB901Z+xws=
=F0JP
-----END PGP SIGNATURE-----
--=-PQVI54QrWxWRUItiNus1--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:58:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:58:57 2022
Received: from localhost ([127.0.0.1]:33708 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHzU-0005QY-QZ
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:58:56 -0400
Received: from andre.telenet-ops.be ([195.130.132.53]:47678)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nZHzT-0005QR-6C
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:58:55 -0400
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by andre.telenet-ops.be with bizsmtp
id CKyu270054UW6Th01KyuzP; Tue, 29 Mar 2022 21:58:54 +0200
Message-ID: <7d5f974bd32fc3169cadf2ae0cd6194ddb9a080f.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 01/27] gnu: tree-sitter: Move to its own
module.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Tue, 29 Mar 2022 21:58:53 +0200
In-Reply-To: <20220329194318.6106-2-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-2-pierre.langlois@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-ApPD3lJ3vfAAdslqAdRQ"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1648583934; bh=wQTvpsLZV67c6IbW+rxDyV5XEoEYhpbbfyKFfghLy1c=;
h=Subject:From:To:Date:In-Reply-To:References;
b=AI6IWBM+mXwA4YXXiJQcpl2XgQuGGaIYGeSKpLKAg3bYCp8tskv/hZc0jwHZFh/7a
Rvqhp6TicH+j/AOoEqB6dN8nltQYFTesXVdHoBbrljnOAM+r5mKt/kn+gzVAuzJ69r
OuxacdKmoVDhPU30k+Cgh1XLZcixAeHfZBCO8WusRluU+M33pmxx7lJ1fd7qjMrvK7
foo2NBJZbRwi8pClvblps/TYq77iwKT/bC5SMbMPNVFyyjs3Yrl+K4imwWr9Qvq8hw
tE7jbtsKsCXQ5vyOAKc7svg9PQsXshgnG8Dfupo+4IUi3orout22s6zIKBIOmr3oMj
Mkz57fj6p8rMw==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-ApPD3lJ3vfAAdslqAdRQ
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op di 29-03-2022 om 20:42 [+0100]:
> -@item Dependency-free so that the runtime library (which is written in p=
ure C)
It probably depends on glibc library, so strictly speaking this is
probably not technically correct ... but maybe good enough?
Greetings,
Maxime.
--=-ApPD3lJ3vfAAdslqAdRQ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkNk/RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lUTAQC6YU0eu0XBrYIH8elFv9cRUcFm
0A5dwyDbRp3wtcvRJwEA+wYzvqDZrmxreLxFjoGM0gkpxRWVcGHDSMx8NCeb6Qk=
=8t9g
-----END PGP SIGNATURE-----
--=-ApPD3lJ3vfAAdslqAdRQ--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:57:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:57:49 2022
Received: from localhost ([127.0.0.1]:33694 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHyP-0005OL-PT
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:57:49 -0400
Received: from xavier.telenet-ops.be ([195.130.132.52]:34170)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nZHyO-0005OC-5l
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:57:48 -0400
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by xavier.telenet-ops.be with bizsmtp
id CKxm2700S4UW6Th01Kxm1X; Tue, 29 Mar 2022 21:57:46 +0200
Message-ID: <2c435f65e2b30348442ef5ebc043d8bcf4146ff2.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 01/27] gnu: tree-sitter: Move to its own
module.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Tue, 29 Mar 2022 21:57:46 +0200
In-Reply-To: <20220329194318.6106-2-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-2-pierre.langlois@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-rTaplM6xwL21j5Q9WF1E"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1648583866; bh=VLBm0jykHYom/X+4dONeGyTxDtuuq93tdcXVerpElQ4=;
h=Subject:From:To:Date:In-Reply-To:References;
b=OVdvJnpLie1Q+QVhH+3QIq1jbhnPLW9VO9Cbgua48gvDijLVAvmUmgZsgWmJqe96Z
2ICFYPQC97EG4r3A7DHiA7yZ/vrRR402Ft8nj7znipyvODkH37KtYmVDC+CGMduppY
NBUjFKdHLuqhs9+yHXsNJQHiyODbaj2Rj0Ck1e8dfumOATpA6H0s4CM42N18XDSPlw
wB4OY5iz1CgTFQ0ZYWiF3tdfAgRwuf0a2XPUnLQfRlohn7Sa5PEOMKn+U2yN/E4v1Z
Eus1u8F/vSKFoCtptQ9R1Z7lJJZ97gfQAu56o/4srUf3YbPPytQRBXFR0Jf0Crkhuy
6GLp8Pu1pvQ3Q==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-rTaplM6xwL21j5Q9WF1E
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op di 29-03-2022 om 20:42 [+0100]:
> -(define-public tree-sitter
> -=C2=A0 (package
Is my local guix too old, or is this package not yet in guix?
Greetings,
Maxime.
--=-rTaplM6xwL21j5Q9WF1E
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkNkuhccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7sGQAQCh04rh5ofRLSyiwBgbHXqyewab
KAtLDBqeT2YIykouAwEA09oeRT25sXP6GfB4dLTMQhIOnsC5J7CJISsivQNszws=
=2fNG
-----END PGP SIGNATURE-----
--=-rTaplM6xwL21j5Q9WF1E--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:55:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:55:34 2022
Received: from localhost ([127.0.0.1]:33684 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHwE-0005KR-4Z
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:55:34 -0400
Received: from andre.telenet-ops.be ([195.130.132.53]:43320)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nZHwC-0005KG-Br
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:55:33 -0400
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by andre.telenet-ops.be with bizsmtp
id CKvW270094UW6Th01KvWau; Tue, 29 Mar 2022 21:55:30 +0200
Message-ID: <0fa9d98cb9038a24e8596858a8d37d63071937a2.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Tue, 29 Mar 2022 21:55:25 +0200
In-Reply-To: <20220329194318.6106-28-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
<20220329194318.6106-28-pierre.langlois@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-NRURWCA+stvPzo9+H1su"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1648583730; bh=4OTO/15CRipwQecT3OrscI5gbqyJNBzTz+VAKASFUd0=;
h=Subject:From:To:Date:In-Reply-To:References;
b=Ke9MQJAdx56LFq+aPluETBEjl5dzqci7hckmVtf8MUutiImgMkZq0Ul4CtQmAhPJh
7y68GybcyMw1RqOhIhSvlZzVTs7goVEjy8H0xucztNvelirT9/OSyv7UlmC/AXugke
kRBU1D3vZ1o2QPz9E2G9ejvLXIZ2qllusmBa3a6OlryqUHT+cd1NWkJJXNZZ0agiEk
M9YeVwd489BlPpQekwyeEKITGp3/bNH3XvBXqfdfEjkiz9ZFnQuGoRh0MXksBLHr/J
2RZE5DYmYzcC1eOSoqBvdbuqS+16xj0NtiHAl63eD1ApjPiUlvYdIu5zrJ0T4GL5wA
tVQ3xd3T7SV/g==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-NRURWCA+stvPzo9+H1su
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op di 29-03-2022 om 20:43 [+0100]:
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; The BUNDLE-VERSION file prevents emacs-tr=
ee-sitter-langs
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; from downloading libraries at load time.
WDYT of patching emacs-tree-sitter-langs to not download, such that it
doesn't download and run non-Guix libraries behind the user's back?
Also, why do we need a bundle at all, would simply installing emacs-
tree-sitter, and, e.g., tree-sitter-java, just work?
Greetings,
Maxime.
--=-NRURWCA+stvPzo9+H1su
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkNkLRccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nVRAPwIdaQsOpgFBOK/ehutvI/QXruC
Hi1W1NqSM9IooZ3ofwEA4ZTo00vgUmC/5OF3ayew4/qEsg0xZ7mGzXItctyiXgE=
=3CK2
-----END PGP SIGNATURE-----
--=-NRURWCA+stvPzo9+H1su--
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:48:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:48:57 2022
Received: from localhost ([127.0.0.1]:33665 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHpp-0005AA-7d
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:57 -0400
Received: from mout.gmx.net ([212.227.17.21]:43783)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHpl-00059c-4q
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:53 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583327;
bh=RUQptR1PMxktgV8LmeLsFRD+Yyr1rDH8v0IhlqzHmsw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=F+a8nqzX6KB3nS5rfeOBtaeaSj9Z8uU5cXacfGsPUp4ULGGVfTF8h+0xicvEQV45z
HyDz6QS094TIvObuaWawsOvbbuGSvE0+dY8ZBfeKM8r5808hUxJkz5ovFTuMhE/fne
UNf9K0nYtW4/pRtsKbuEB9PjI8+UnHzB0BT9Tesc=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MsYux-1nsL0b38iR-00u4jT; Tue, 29 Mar 2022 21:43:46 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 27/27] gnu: Add emacs-tree-sitter-langs.
Date: Tue, 29 Mar 2022 20:43:18 +0100
Message-Id: <20220329194318.6106-28-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:TKOWDBj4sZ8WPGww2uvraQmodtxgS3Lkzt4At/97WoMlF8nk6rH
2WB6oVAlApXZTELfx2ED6w13QvUBypnknL/jRoEREGB0K2UAtJLmE3NpZPtzHiOhZnNfgoX
jj4rHePcXnSSgvfQ8dyxV39zU07NMPRvCv98XbmyWqPOMbugmcTLDCCYgqb9wYRAUQ2jFtM
LL0hBV/qwzk9B0P98plpA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:gNqn6A98Xhs=:aztWNbT1DdxXCYQyiyCwWR
YJxY3o2g5hanDKZb6MH6YkYGQeXSgHpgrLl6zgzFG6beW1wmOpgAaVV7izrL9dhK7AsL9XxTg
vUesbDk/842VmTwkKMPdyfA6kwMFbNBCAbL9ii9z6sSr6VYyCaX0Sokd4qo/Ns65iehPtdLnF
8DWBeU8jE6+UUZ2wB3KsUEHUo1RjMiM0n49qwc8tRg9RVmmiTdj4R0pLKGuPI5pb5FVUSbrGU
7BfL3NF1siyPCkCISciZvfe7Lc1Ivqah7Tmzz12kybXcQ4TM3vC2kF9JMCSm1hVOp6C/kFmWO
EjwTWq/wuYxLqEFgwF7Xa75XiS4yCLiVRIeHUbf3B6xE9jnAURhyNGOhhOtjer6c2etWC4DLf
Nn7n6tjdUU1t8nmWbDfg0ISIBWZ8M3gk+0ZVlRbTtb3J2O1OtKznnKcTNjcpGai+Nn90ba6DI
2Ff19mQgCv02qO6U1QD5kCR2NzNcvYCjdvGeF8rN+PU/6lRREKYkJB6wjwRnMfIyqX/hiLyH6
c6AvRSc72Nm5VmdffSLDp0K3uXQEQhkcDhleWuVihm28lhw3JCKzoW/TvomKdssnrOAA2yYli
/GZxEGfGwNnbniF87+Fq3Fwh3o03GhiHX75syHAzzpNb5AOmPTa23UVdCfaNBoYxixs6JfpzH
HxvhBDs4HQ6A1TyF6xsPmPMtXW76vzLZrWZrI8jqQ6aLR2Nttv6ot1Z8xjGADpgbejkGTYIuE
rfz5cPCGg/BkGbw0nEGbFeCoEaS6j9c/L29RT0q2sHqBUK9xIW5+4Gb+cbR23P2kpgnMWJD/E
apY3a8z1hKh4HaFmyrGo7Op885Gv/kacHl+haHn1ODnj5JiEaj9V5UuZ0G4626xU89kJV8zhb
FTOMyH5gk4lwuqnpEOnprlVTzHgpOS3nPXp5f4XojTOlvPSb9UZhMnl+qr+5bOzc49rcGAD7r
qk/NJa4xmztbhxaSNyxgyeJEX9g4AjVVwHXajWUUqHmkFB8K67s7hpcokU/e5K53Lyde/88B8
hRcvgtOzJ4LTpFUxpQiJXUtKMxm9ijfzRsFlPbLYLpkPcqr5HnN703bp2JaMyvwa2uVeTt8h4
wEyDj4ILrWKvoU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bundl=
e):
New procedure.
(emacs-tree-sitter-langs): New variable.
=2D--
gnu/packages/tree-sitter.scm | 137 +++++++++++++++++++++++++++++++++++
1 file changed, 137 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 97a20494ec..ae0478c3e4 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
@@ -793,3 +794,139 @@ (define-public emacs-tree-sitter
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define (make-emacs-tree-sitter-langs-grammar-bundle version)
+ (package
+ (name "emacs-tree-sitter-langs-grammar-bundle")
+ (source #f)
+ (version version)
+ (build-system trivial-build-system)
+ (inputs
+ ;; FIXME: Support for some languages is still left to package.
+ (list tree-sitter-bash
+ tree-sitter-c
+ tree-sitter-c-sharp
+ tree-sitter-cpp
+ tree-sitter-css
+ tree-sitter-elixir
+ tree-sitter-elm
+ tree-sitter-go
+ tree-sitter-html
+ tree-sitter-java
+ tree-sitter-javascript
+ tree-sitter-json
+ tree-sitter-julia
+ tree-sitter-ocaml
+ tree-sitter-php
+ tree-sitter-python
+ tree-sitter-rust
+ tree-sitter-ruby
+ tree-sitter-typescript))
+ (arguments
+ (list #:builder
+ (with-imported-modules '((guix build union)
+ (guix build utils))
+ #~(begin
+ (use-modules (ice-9 match)
+ (guix build union)
+ (guix build utils))
+ (union-build
+ #$output
+ (filter directory-exists?
+ (map (match-lambda
+ ((name directory)
+ (string-append directory "/lib/tree-sit=
ter")))
+ '#$(package-inputs this-package))))
+ ;; The BUNDLE-VERSION file prevents emacs-tree-sitter-l=
angs
+ ;; from downloading libraries at load time.
+ (call-with-output-file (string-append #$output "/BUNDLE=
-VERSION")
+ (lambda (port) (display #$version port)))))))
+ (synopsis #f)
+ (description #f)
+ (home-page #f)
+ (license #f)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.11.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/tree-sitte=
r-langs")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jyzpiyl3b88vwfzkda7ak77kl0b2nybvsz0j9cndl3pf95d62g0")))=
)
+ (build-system emacs-build-system)
+ (inputs
+ (list (make-emacs-tree-sitter-langs-grammar-bundle version)))
+ (propagated-inputs
+ (list emacs-tree-sitter))
+ (arguments
+ (list
+ #:tests? #t
+ #:test-command ''("script/test")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-cask
+ (lambda _
+ (substitute* "script/test"
+ (("cask") ""))))
+ (add-before 'check 'bundle-for-testing
+ (lambda* (#:key inputs #:allow-other-keys)
+ (delete-file-recursively "bin")
+ (symlink #$(make-emacs-tree-sitter-langs-grammar-bundle ver=
sion)
+ "bin")))
+ (add-before 'check 'patch-tree-sitter-require-test
+ (lambda _
+ (use-modules (ice-9 regex))
+ ;; This test needs a git repositories with submodules for
+ ;; each languages in order to map all repositories. We pat=
ch
+ ;; the mapping function with one that invokes the tests for=
each
+ ;; packaged language.
+ (let ((supported-languages
+ (map (lambda (lib)
+ (match:substring
+ (string-match "(.*)\\.so$" (basename lib))
+ 1))
+ (find-files "bin" "\\.so$"))))
+ (substitute* "tree-sitter-langs-tests.el"
+ (("tree-sitter-langs--map-repos")
+ (call-with-output-string
+ (lambda (port)
+ (write `(lambda (fn)
+ (dolist (lang ',supported-languages)
+ (funcall fn lang)))
+ port))))))))
+ ;; Tests for queries will fail given those languages are not
+ ;; packages yet.
+ (add-before 'check 'remove-unused-highlight-queries
+ (lambda _
+ (delete-file-recursively "queries/hcl")
+ (delete-file-recursively "queries/pgn")))
+ (add-before 'install 'install-bundle
+ (lambda _
+ (let ((elpa (elpa-directory #$output)))
+ (mkdir-p elpa)
+ (symlink #$(make-emacs-tree-sitter-langs-grammar-bundle v=
ersion)
+ (string-append elpa "/bin")))))
+ (add-after 'install 'install-queries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (copy-recursively "queries" (string-append elpa "/queries=
"))))))))
+ (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/"=
)
+ (synopsis "Language support bundle for Tree-sitter")
+ (description "This package is a convenient language bundle for
+Tree-sitter. For each supported language, this package provides:
+
+@enumerate
+@item Pre-compiled grammar binaries.
+@item An optional highlights.scm file that provides highlighting patterns=
.
+This is mainly intended for major modes that are not aware of tree-sitter=
.
+@item Optional query patterns for other minor modes that provide high-lev=
el
+functionalities on top of tree-sitter, such as code folding, evil text
+objects, ...etc.
+@end enumerate")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:48:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:48:57 2022
Received: from localhost ([127.0.0.1]:33663 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHpo-0005A8-SL
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:57 -0400
Received: from mout.gmx.net ([212.227.17.20]:39889)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHpk-00059a-At
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583326;
bh=lnLefxr28oNN5KkWKmP+eUv66ANT0Mn/Q8jQDHSnL7g=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Mt9l/Myo/fPFInoeG5OcFw+YvafWaxEY5Pa7+tDSu77fett9uT3SdtQNvGrXSZaNc
6nEAjZOgyCspyfR9Hd/nS4aT1VCimvw9YXYkoR+vvtnXPggXVpNas3pRAt+h577olf
+mDPkMQL3QS4CNRR+fV7VU4yNA2W335ivulc1e/s=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mplbx-1oOq7D0eXV-00q8Zh; Tue, 29 Mar 2022 21:43:46 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 25/27] gnu: Add emacs-tree-sitter-core.
Date: Tue, 29 Mar 2022 20:43:16 +0100
Message-Id: <20220329194318.6106-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:jN/TM8HsYLxGnXzaxcleU1IQTTDhIYS+psEqT1tMWM+su6f72z0
N/ULHSSjlsxerQV7oFK4tVkXvsHNaPCQdagtDTI29V0tgnN0oxjyaygPwqRL+6iWehKj54S
5a17vtGfa5IRP/Rm4I6qdTKlJWFkIH6pMsh2HC2+iJWGtQRYo5BwTc3K9eGPAqMjhYHRgvj
qCPnifRQoDeni3hN/7CTA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:JgJz8NEqWYk=:HZ/cmy2gqhJNkjI0l+p8KV
OwtWkaFNQsPOgmHC7rS6r8kopVI+LdQlxZw1z6ViEITiMTfBlHurmuvWHIfm5424A3fV9fUpN
3GjonI5mky8NSSHZsZXa3wocmgx6iVf4xRpTD5lAsaC+JyrZpCgvLvGO/5kyi40BhMGFp2o4F
Cb3mIe3JkkZUYQpYKGs/CvITd7Uu9m5o/tlgHlPxh4/ONn5xRpPVCJd5ojDnBKATnRby/dh3d
Th0ps+xm4bBUjLUYR9yBIBNJeecTE7+WYGmgZouoUqaFSXUfYuyUfXIu+hAMc7Y+fhXmfVdQ5
101LiFjhkrnZWgQPQ7LRoBnO94b1CabDies7o2Pak/aGhbXPVwZ/qL8gwAKh0OuU0ycnShGoM
Yi6TyiWnABFJBeKGk/DU6oILUGjNGK/miL7xSehZ4EGZ8RkQKY58nyECyztc96NBz7uk/gAYY
QFIss58R1EYdkcMt/hwx7eEOqTaBBVOXmoTjhSILUGs4s2Bbxd9QRZsR9jOWfgTiRRo3MqRGP
FTKSo3L5FfQ8eMdGQEZR5468HCNvxDr3DPw675mGtMD7wvUT3lTLFNSSBO2EtrATpTbAFcXH2
hMMs5g/waa1P/krA4U1Bbmm4JZuaILy5JnYrcJOjlRFdW2o0Kid6mzbTV8Iv12WNE4M7vH+rw
P96wVw2j/JEfVQK4+5k94umcmyGLdssC0O9q64CbVbY290HU8WFVM1HqpsT3cr+XCS1AHnplJ
0MUAwPE4hTbyg8yprHjMJmr+Brb7yBpaAoEjrh7NDq3vmNCONvBfHZdpIwgGHKXymqK3aa48B
mOhmH5mOr/3FWcbhf48IFa3YkaZQfMlWf63TYd4GOtGIg7OtZePgI0UmEp06+OHYddoe7cleA
WUGdGYb4IgbFvJCGzC1VBUr7XrymC2y0c35pEHoPXWMDUv85CpGBkW9ExMJj4iLHA6PNxYXY2
ECURaRN7rL1PTpukpjLh4T5eagVHIlAeAFJM0n3R5cMU/Nk2dgGAd9UngS2Z3MoyelhsPPWPK
PS2YeXP9+HjqXbts1k29m6ArKF89DKlIoyLPQaaaFbmHqfSQT+BL4najJ+4ouQyPDefJQ6zvM
1+rBTnVKQ+ACaU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local varia=
ble.
(emacs-tree-sitter-core): New variable.
=2D--
gnu/packages/tree-sitter.scm | 78 ++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 5209876431..fb3d13b3c7 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
#:use-module (guix download)
@@ -688,3 +689,80 @@ (define-public tree-sitter-typescript
"This package provides Typescript and TSX grammars for the Tree-si=
tter
library.")
(license license:expat))))
+
+;; Local package definition solely for building the native emacs module
+;; written in Rust.
+(define tree-sitter-emacs-module
+ (package
+ (name "tree-sitter-emacs-module")
+ (version "0.18.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-tree-sitter/elisp-tree=
-sitter")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif")))=
)
+ (build-system cargo-build-system)
+ (inputs
+ (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-emacs" ,rust-emacs-0.18)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tree-sitter" ,rust-tree-sitter-for-emacs))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-after 'chdir 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (add-after 'delete-cargo.lock 'do-not-fetch-from-github
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("\\[patch.*") "")
+ (("git =3D .*") ""))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out") "/lib"))=
)
+ (install-file "target/release/libtsc_dyn.so" lib)))))))
+ (home-page #f)
+ (synopsis #f)
+ (description #f)
+ (license license:expat)))
+
+(define-public emacs-tree-sitter-core
+ (package
+ (name "emacs-tree-sitter-core")
+ (version (package-version tree-sitter-emacs-module))
+ (source (package-source tree-sitter-emacs-module))
+ (build-system emacs-build-system)
+ (native-inputs
+ (list tree-sitter-emacs-module))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "core")))
+ (add-after 'install 'install-module
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out")))
+ (module (string-append (assoc-ref inputs "tree-sitter-=
emacs-module")
+ "/lib/libtsc_dyn.so")))
+ ;; Writing the version number in this file prevents the pa=
ckage
+ ;; from trying to download the module from the internet.
+ (call-with-output-file (string-append elpa "/DYN-VERSION")
+ (lambda (port) (display ,version port)))
+ (substitute* "tsc-dyn-get.el"
+ (("defcustom tsc-dyn-dir tsc--dir")
+ (string-append "defcustom tsc-dyn-dir \"" elpa "\"")))
+ (copy-file module (string-append elpa "/tsc-dyn.so")))))))=
)
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp, core library")
+ (description "This package provides core APIs of the Emacs binding fo=
r
+Tree-sitter, an incremental parsing system.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:48:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:48:53 2022
Received: from localhost ([127.0.0.1]:33661 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHpl-00059s-FZ
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:53 -0400
Received: from mout.gmx.net ([212.227.17.21]:55609)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHpk-00059Z-2Z
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:48:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583326;
bh=/Cp6p3G8V+ww1Q55xWjsey9p22oU1xaAyBZbcNXGQhM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=aDUzK4+Z0xTheSAhPXNctqNDP4aeMcULI+v9hstKGF9BlqBXDsCUpqeE0DRFkWcI3
/w+1zmWoNGQbvbQ90AXkSP7vgoHDEcBGEmFGyHvZo5nhyt1LQWfCMYmU+s8oj11rwP
QA97V/Tm8RtJdvn0EzbzHTm+EQehjqmC3Ybikjtg=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MEm6F-1nnqry18wN-00GFrH; Tue, 29 Mar 2022 21:43:45 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 22/27] gnu: Add tree-sitter-typescript.
Date: Tue, 29 Mar 2022 20:43:13 +0100
Message-Id: <20220329194318.6106-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:XjUQ9ZOCV1GrMpaYqma+JQACJnRWKmGITiVQRz+GjQtkSi4KjKG
vD6yBkm8JmcNWvbSHRx+4rCm5gUjZshfw4P3DLNmqHycbcHaPpjXRTRmkfPKMOE8P9+/2Ut
q4Aa4ngrW6zqYYN6k3zo4wBwBSD1R3F4ThLa7MC0dvBjh0hDD2CRqDzLawZbL843rvnmGo3
MGaHnr/dgrbcYvdKCXS4w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:6NnhinqrqLg=:mKqGYOc+pWj4+HEThkktR5
4FlQeU3iiYBdKLxEmSirPMNrT/Jmr1li0zdo8WORC2MY6xB/lWWFlH9l7vI5fi9THv6bLkrUj
KtID8pgECqBPHRIPoRlisrusNJqDLjhQNTKJ1J0j7rKiUNP1o3QfxKblvWmvOujm3D9omrDnI
2Mali5xgxNIApMOJ0jVMBko1kr0QpnPPyM+lbfsOJTtN0Qk9AsPMT2x1Tx/dcGukHE2dhkm9f
dlwLrUf5YmKz8TB4tOR/aqluDMwwj18F4DkymOH+3po48D4hxfMTqZy6iyOhWgUfz2pIVqMXO
M1YUVkUk2xrc1tfb3LD5BUvxUeEgztJCPeWh0aR5Mu7Zrh3QwuNAXnNWET6fViBTEcJzgd5b/
/bkAAwXLnh/XtQp8Uh8jnaPkUPO9tejNHmrR+NdaOlF8k0Ngp2/P1hPlL7agVLPQDvVciDUfw
CFOGUwVtOCXl5tkdwAudpUG88x1GxMWU3io7etzLCsj3iSoAj0948/yuouYePhvwXuyp4aECc
mfrGJ8kPgdu9N/YCNfb3lJtL0+Nquv1Xh954PrDcCkUYxgigpEXxBjBTm9voGBRShggpos9hQ
/qHkgJNOvqwBTzhP0xbVqruaY8TOqjy4f+Cn4dixqqn3Wynw1YI4cX4Fog5uk/sBZznDUcSUp
28DRmJwus8U2Q4T44mO/jut0p76p/CDdRNU7VOuYvYsxWmbT0AGncPqqvdhXkeaBJFmjDBHYA
YV2TnYpQhze/2sYaPPWGQvga0xLh8VnBgnpV6jNnH8sYa/83LXlp97DvKp3iEY2Ugxi4tucTl
gqZ8CxM6dYTDvpPF58W9HdwC4LSnJ3rBMUiIQVnj05eOyiN76WvgaVBm3eV4T3HmS3hBgvTp8
Ek0Jx+9SzlwMwAZOjeno10uqQ94brSJ76njGs0AGWzwakgDjb1wJf73Py6Wpx3WXyWB2eVpw/
+OWzr/Q6h3zUae5B6vwct1gx1askAxEPNoGVh9UERPjMJ6VGQlhyU5TB0dowBDZN8UCAeTrm+
FN1NfCU4YtaU62hP36SmX5yf+FBtZYegC0kGwvaInu3PU3jo+7FVi8S9CB9whnw0mf+Y3/+/n
7eunzzTmHqf2tU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 40 ++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c37183e131..756dc0d540 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -595,3 +595,43 @@ (define-public tree-sitter-rust
(description
"This package provides a Rust grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-typescript
+ (let ((commit "111b07762e86efab9a918b7c721f720c37e76b0a")
+ (revision "1"))
+ (package
+ (name "tree-sitter-typescript")
+ (version (git-version "0.20.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ty=
pescript")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1364bm3wbqqzvp03cvpx1w89bbqynb1v62i46gy7f6rhib9=
bf63a"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("typescript" "tsx"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (inputs (list tree-sitter-javascript))
+ (arguments
+ (list
+ #:grammar-directories '("typescript" "tsx")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-typescript")
+ (synopsis "Tree-sitter Typescript grammar")
+ (description
+ "This package provides Typescript and TSX grammars for the Tree-si=
tter
+library.")
+ (license license:expat))))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:59 2022
Received: from localhost ([127.0.0.1]:33628 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHl1-0004x4-44
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:59 -0400
Received: from mout.gmx.net ([212.227.17.21]:42083)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHku-0004t1-BW
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583026;
bh=525mH+dn0RXlrGG5VID0A1lLoSuzIJ3VLKccSsabruQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=NReFZxTTepinqB9eppydHKvKmiIdLgeBGIPk4VH3gQJSriKbQ+xjPIa095ZBwZEAp
otTttxN4Txn7iSVKaeJi8YGHSyiTYpgtvF9WxNQEgOfCJRBVSfWTV/J0Mr158D4o4C
kJl0RARrB6Cn0K1TbJIfkLQHP7qgxhVheIgbNj9M=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N95iR-1o4Pob1qD9-01691j; Tue, 29 Mar 2022 21:43:46 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 26/27] gnu: Add emacs-tree-sitter.
Date: Tue, 29 Mar 2022 20:43:17 +0100
Message-Id: <20220329194318.6106-27-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:7gA4uA3zbXy8osHFCchhPdfVYKvq3gmPKbbSHnHLVgVsByDT345
TMPAJ8aaB56liXU2Zy/keoSs3bXLevlCAmqIW9n7nhADrDyYDTg+7VcUktl+NHgE1TohkSY
yt8vZN3y+HQX2ge/BvKXkE8u4edj1N0CxjBY/susqPyXkIjNm2RfXnTsh5hzVV+/pSkvGoC
y2uYfaUpAdiSn8Rz/BX+A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:5KRsHXisPpg=:hjzH2Ah7oXn8Gz1U0kWusN
YZgKRkqkpu2FuVunCK0f9VMmSj5okJpElLcqNP3nSOPfEVJWaORHAgyaxKJISU6Ycwud3WBwO
W1FeGBz9GhYGDU3Xgoo71HryT9j6Uf5GI+Rnu/cbR4zCE8Mr7DNdYlR/wDMwg3CB6GwI8fin/
mBeQqNuZGF6dJst9etO+3mnIorIVQOimgDdEi6VZP9k41ai7g7VI6oiTULTcg6lUTN0CRCIJo
bV1Gskh40dtethr583LsIUbMKW4OKTIKrdCwZPcc3GAgZx9OYsbyBb3FO7ymGAVy0MPFcFkad
2hH3m4RVLpo2barSSDHJKpwI9KA/oEt4DfEwMo0X9epxs3oViQ3SuvhhSUu8ngGcTWluJ7A5W
wW95tKr8xtrIbj7qgF6FN1EcLj1kiYSCA0IIp0Sdy1yFEJ4t9V9svkseAADG9iXXoHWMg8rqB
F8cfOtSsmeX8WCmGV+GfYf1OzHqA56ImaUibHgi8kdrAwCaWeZ1IZoyh+oUsCEfA17bholC8g
Aov8G1elX2ApeBTSSah/OMMED/Un9mbQoYmtZQv5sQfHmpAqNrIwIUtosU43glRrch6d0QT9J
ny1rDPUXY7l+cSjyl9+6PkH9mcLZY3oxpJl/clvSfyaqt9xKJOtsS7ND5Lc/2XCK630sCLLW3
hNK/7Rrdnh5b8bL21/rWcS9uLotnwybwUsIQBq1tnPUFgYJsIHzGnx3pC5Rd/Za/4E2fsduv7
qqvt9MVtDscNkLVDTUe9wKeIo/oI7Dc9ZN5odDHiTdZUGv/KHLRLhqDNgNx/JXVi/CUkQ7HLg
yERi0rNbC2KYr0c8B3kDf2VKBk9cXw+nsvsxppi8zLrW9aUUnEPy4hC0lMKa01xTXybN+nBLE
1qE4e0cXon+UfePphA34hI0kNzb+DR1ZM8bO4OQEoDSzxVp7OQ6JHLtmL2IAUpsRIGpgajv2Z
8PxkJOceZiyNeNu+8Mw92iD00Ph8Eieh9N8zOeap+xd/9lVaP7GHiYDgfDqbtM5pjE3YZTTb4
aK7UDpSrfw4Bw3e+DdE7YsWwN83zWO3WBgyE+oJ08WOTzQ7ENQTj6QwEI9zzwTzjaggd+mAPW
YvWEnNRXVuoQfU=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable.
=2D--
gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index fb3d13b3c7..97a20494ec 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -766,3 +766,30 @@ (module (string-append (assoc-ref inputs "tree-sitter=
-emacs-module")
(description "This package provides core APIs of the Emacs binding fo=
r
Tree-sitter, an incremental parsing system.")
(license license:expat)))
+
+(define-public emacs-tree-sitter
+ (package
+ (name "emacs-tree-sitter")
+ (version (package-version emacs-tree-sitter-core))
+ (source (package-source emacs-tree-sitter-core))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ (list emacs-tree-sitter-core))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "lisp"))))))
+ (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter")
+ (synopsis "Tree-sitter bindings for Emacs Lisp")
+ (description "This package provides Emacs bindings for Tree-sitter, a=
n
+incremental parsing library. It aims to be the foundation for a new bree=
d of
+Emacs packages that understand code structurally. For example:
+
+@enumerate
+@item Faster, fine-grained code highlighting.
+@item More flexible code folding.
+@item Structural editing (like Paredit, or even better) for non-Lisp code=
.
+@item More informative indexing for imenu.
+@end enumerate")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:59 2022
Received: from localhost ([127.0.0.1]:33626 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHl0-0004wx-If
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:59 -0400
Received: from mout.gmx.net ([212.227.17.22]:55593)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkt-0004sl-MI
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583026;
bh=JbfFiMfn1+z/Ao22UQKuQ4cRrkud/HlSvV5ByczTX08=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=A/AZHxkG9VBPGv8W4hfmjeoEX37AU648OJxZIT8ANbMUg7iA5xv77/32HeTVlRhmu
1PqvWNUurMRYpTfvyAso0Ga8WbGK30oDLA/gDfKo/xMwHLVNP7RsyFbRs5xguqWqDi
L5vCFm+RpsOAFVNLH0GOEgitO1tO5taOY+m3auO8=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Ma20q-1nVu4r3cay-00VzC8; Tue, 29 Mar 2022 21:43:46 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 24/27] gnu: Add rust-tree-sitter-for-emacs.
Date: Tue, 29 Mar 2022 20:43:15 +0100
Message-Id: <20220329194318.6106-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:+n+nmHd1AdPjvR5kL/XL2pjPVxz+enURn03IcGKW6O4Tx35qkOu
XU5g8vdTVKUsTN3qffu+/5P4FkNOUJNd/2YdToHnAF6uSws5bcyabE7tg17oJv0OSbHQCx/
H+rpMKwCXXPJ3RTRwC52DQYEOISnUv6Bkn1Ypss6bGhaeU7+AprhmnZOG2gqPjEE5ycb/8a
9jTIaITo6U+MPdG0q2Pzw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:rGLOKB1Zjhs=:bbWDmmEE7t5XVi6AygrIsm
08LkpmVGfIUv3CaBS6tRb7TYFftLPriucvgq2yd+pMT48OK0OBeHbMOr766Gh9SwNvV/dkYxn
iGmIo1CNZOnt1hpGYVE7bnf4eC2P79xiEKuSQJQwhSqrjW400aSAdEj9Yfz4oeQ0hqwr8aL24
VHAzojCjqFaUzK1YRc3tnCc7nFLAb47dgQRfUPj/4P7ncog0FdfFEjttxJ1TQMjewBddT7v5G
AFg5qDeDI7vZQlmRPMJBnymr8gE2eM43lj3CYOdn/f8klk3CZQmZWMJOWFc1b3+rfYzVg+nHF
vBce1YZPXV38fMcj5bucKumhjWvSLjm96gNdMIBM8HJmFaV7bfHSaWgs0117kQYCd2izYt6Ew
ERlop8a4HfZXSYXSWl1ut2ipiMIyLteDYGvqKh0VelBR3rUG63rnv//F2u2j/zXxVOYmru03s
75/ir9XwJQHzcs86f7UrdkViBK8VTDeonceF0EY6eLpgQaqITsvDLMgsGS26KLK7kKs9wJsBQ
kGYBs6HIKDgDnxwUnS7UfnuolDYufCnM1//tIhVkGp1N50c9qxopbDTtm47FqiODZi+jILVTf
3aM58L1iTFJwMPPVYfmaP63+R2pEvuBgsZwpu/7p9e85ugVeTwr1PbywbgZyfKgieofrBFMkh
e/3txf56JxrA83oRWOSu0dZkcMAVY9v1rdnyeBg96Ld4SdAnC8zWGrprrPdJNOK8+tSZAY7Vd
k0dEKaiQDqKDUycCTfX1SzDXaTr2XF2MbOh+XgL6cAX5+5EgNmw4fWBMFOUWnKQT321foNfwG
6tK3iEU0ukDC82AIgj8iglUlr1TYCxP27nMtQtO3+UreB3No4+FWDYnBBiKJXH4EVbdCQ44+G
OhC2KdInwtZxhZwe52o4+XSvSPe5GpTsZ80VLsjUTpWJiJOSoh7+1VvbzMGpfkk9Tlli1EsVp
pA3UOeRftyh8o/FXB59eIOOmqTMCSmfreaGMFDtZBES1uoq5DvuFSMc2qqhv6kW52HaymUucQ
ESjoyIg/djfxXjLLn4hOonVuNZFSCi6StL9cFYnYOmLgZmUI0FUprgziMUIxmIQ4qhLKnx3ND
17RtopmBZpH7Is=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter-for-emacs): New variable.
* gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
=2D--
gnu/local.mk | 1 +
.../rust-tree-sitter-text-provider-fix.patch | 98 +++++++++++++++++++
gnu/packages/tree-sitter.scm | 14 +++
3 files changed, 113 insertions(+)
create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fi=
x.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 03972441e6..aa353a6f68 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1780,6 +1780,7 @@ dist_patch_DATA =3D \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rust-shell2batch-lint-fix.patch \
+ %D%/packages/patches/rust-tree-sitter-text-provider-fix.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \
%D%/packages/patches/sbc-fix-build-non-x86.patch \
%D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \
diff --git a/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch=
b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
new file mode 100644
index 0000000000..215e7fc18b
=2D-- /dev/null
+++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
@@ -0,0 +1,98 @@
+From e3576b180488b8231e1fc0ca130748577579d129 Mon Sep 17 00:00:00 2001
+From: =3D?UTF-8?q?Tu=3DE1=3DBA=3DA5n-Anh=3D20Nguy=3DE1=3DBB=3D85n?=3D <ub=
olonton@HIDDEN>
+Date: Sun, 25 Jul 2021 13:11:52 +0700
+Subject: [PATCH] Allow TextProvider's iterators to generate owned text
+
+---
+ binding_rust/lib.rs | 33 ++++++++++++++++++---------------
+ 1 file changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs
+index e88a411c..cf214d92 100644
+--- a/binding_rust/lib.rs
++++ b/binding_rust/lib.rs
+@@ -5,6 +5,7 @@ mod util;
+ use std::os::unix::io::AsRawFd;
+
+ use std::{
++ borrow::Cow,
+ char, error,
+ ffi::CStr,
+ fmt, hash, iter,
+@@ -183,7 +184,8 @@ pub struct QueryCaptures<'a, 'tree: 'a, T: TextProvid=
er<'a>> {
+ }
+
+ pub trait TextProvider<'a> {
+- type I: Iterator<Item =3D &'a [u8]> + 'a;
++ type I: Iterator<Item =3D Cow<'a, [u8]>>;
++
+ fn text(&mut self, node: Node) -> Self::I;
+ }
+
+@@ -1840,19 +1842,19 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ buffer2: &mut Vec<u8>,
+ text_provider: &mut impl TextProvider<'a>,
+ ) -> bool {
+- fn get_text<'a, 'b: 'a, I: Iterator<Item =3D &'b [u8]>>(
++ fn get_text<'a, 'b: 'a, I: Iterator<Item =3D Cow<'b, [u8]>>>(
+ buffer: &'a mut Vec<u8>,
+ mut chunks: I,
+- ) -> &'a [u8] {
+- let first_chunk =3D chunks.next().unwrap_or(&[]);
++ ) -> Cow<'a, [u8]> {
++ let first_chunk =3D chunks.next().unwrap_or(Cow::Owned(vec![=
0u8; 0]));
+ if let Some(next_chunk) =3D chunks.next() {
+ buffer.clear();
+- buffer.extend_from_slice(first_chunk);
+- buffer.extend_from_slice(next_chunk);
++ buffer.extend_from_slice(&first_chunk);
++ buffer.extend_from_slice(&next_chunk);
+ for chunk in chunks {
+- buffer.extend_from_slice(chunk);
++ buffer.extend_from_slice(&chunk);
+ }
+- buffer.as_slice()
++ Cow::Borrowed(buffer.as_slice())
+ } else {
+ first_chunk
+ }
+@@ -1888,7 +1890,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ match node {
+ Some(node) =3D> {
+ let text =3D get_text(buffer1, text_provider=
.text(node));
+- r.is_match(text) =3D=3D *is_positive
++ r.is_match(&text) =3D=3D *is_positive
+ }
+ None =3D> true,
+ }
+@@ -2002,23 +2004,24 @@ impl<'cursor, 'tree> fmt::Debug for QueryMatch<'c=
ursor, 'tree> {
+ }
+ }
+
+-impl<'a, F, I> TextProvider<'a> for F
++impl<'a, F, I, T> TextProvider<'a> for F
+ where
+ F: FnMut(Node) -> I,
+- I: Iterator<Item =3D &'a [u8]> + 'a,
++ T: Into<Cow<'a, [u8]>>,
++ I: Iterator<Item =3D T>,
+ {
+- type I =3D I;
++ type I =3D iter::Map<I, fn(T) -> Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- (self)(node)
++ (self)(node).map(T::into)
+ }
+ }
+
+ impl<'a> TextProvider<'a> for &'a [u8] {
+- type I =3D iter::Once<&'a [u8]>;
++ type I =3D iter::Once<Cow<'a, [u8]>>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+- iter::once(&self[node.byte_range()])
++ iter::once(Cow::Borrowed(&self[node.byte_range()]))
+ }
+ }
+
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 389cb944b9..5209876431 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
@@ -196,6 +197,19 @@ (define-public rust-tree-sitter
parsing library.")
(license license:expat)))
+;; We need to apply a patch in order to compile the rust bindings against=
the
+;; emacs tree-sitter module.
+;; See https://github.com/tree-sitter/tree-sitter/pull/1294
+(define-public rust-tree-sitter-for-emacs
+ (package (inherit rust-tree-sitter)
+ (source (origin
+ (inherit (package-source rust-tree-sitter))
+ (patches (search-patches
+ "rust-tree-sitter-text-provider-fix.patch"))))
+ ;; Do not show this package in the UI as it's only meant to be used f=
or
+ ;; emacs's tree-sitter module.
+ (properties '((hidden? . #t)))))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:58 2022
Received: from localhost ([127.0.0.1]:33624 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHl0-0004wp-4S
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:58 -0400
Received: from mout.gmx.net ([212.227.17.21]:55615)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkt-0004si-H3
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583025;
bh=RGC+79eN828/yRX8AtkNrEjyCZ96SBdYQtwgDCY5M8I=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=CO26HTMwxRD1QeDXrby0TOpWPPaCrpccPWIN0wwEvlsEP0b0Lpl3x7hanBj8xhJ3H
HjSEimlIloCYlX4ugDusyxsxYUFE51F854xLfvMP0t+HEX8x7X9Swo4YVQcAG4J5HQ
lCcd2ZAgH3WX5G5dneGYMzSHjWovU4VrvWRPUfNg=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mnpnm-1oNSnr2Pco-00pJUg; Tue, 29 Mar 2022 21:43:45 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 23/27] gnu: Add rust-tree-sitter.
Date: Tue, 29 Mar 2022 20:43:14 +0100
Message-Id: <20220329194318.6106-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:WI9kTdHiKS+zOjd5wtbE2ZLQTenV17Mv/M53F0Qk83uV63WHky5
C1YdfjrJoi4vTisK0fRj2EjkbDQ+/TARyKkcTpjJeq7DMVS3Yxo9NWaHFuRTaCgx3fyuyyT
fH9Y4s8nRgf8K5JmgEOM/c+X0IxcpdBv1gCOAP9Tn7oc4R6WHKIinqPIWH1gUeZoAuSFJkH
wocmhSA77brPKh67DnALw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ri7HTXmC/vE=:PkgoxUgEaHjsPNtEw2qWle
DU6UUimhbH6iKsRhSLuSz94UdB9zhCMm5DCaK9OmHGkV16uzPnpCWxkFy/BY3qo13moSirnEB
QPcyrU0fqvFLgdxaDnIcLmD4iasWTrI49OAbkYUdchALD5Zll/WUstooJpYNDpjKqVC3wnLCI
4szAO8PPUTaLlGpBp2GmZ0hwbPqZX80Lh9GWWXZCTCM5/H2nNeO9Z94x+Qz1OLcvMfDOnBWK9
aoFCriX7W4Vlrt+KczyXl9jc/LrV/wGoubZzP+1TX4H5bFV47LsuDe+HL7R6wZo0xwtK1xOiB
kaG2q2JrFmLvELCNtZm+xoEHunsWY2YSFxp3xfWFVjtFOi4N8x8iSoY3fbDMlD1m50XXe1iEJ
dNxWzjYisWiqRb/8mLDZX1he1y6dRBe3AVDxSzpRXQ6bt8BJIi5cA/xAClLSVen0bEXwaWzNr
qaP+e4EYTjzp6MvwH6S5d58kKnJxu82I6josUkf60yu0oUPbnwgESH0/KrBFeURS8bYdybMTN
Pj1dLHBcs5cviqWRG7vzwVPqmGnT0pCtGus9wda3hKIRlx4gHZ7ZaWRZQhwYdRe9z/ypkHLzI
vNzduJnm/mvkDiqKXAq+N3c30ZaN0bLdgj6G3LKkVvl0vH6DgUrk2bUO8gx86zzRncOeLbilQ
Zxh39ccuGdpZYOVC9J3w5fl2xzbRozIZu28Zg51JVv4Ui5abBRr7BUs0oRdV/mCJ0Q9gzJXvk
K9cM65ntrfbHfyJtQr5q5/ihsuOALWk3XxxfWoJv73LxDLWUIROaMNuWa6S7ZeQdOOd533Yde
Uxtb+9RwjhdB3bhABzPA0DL4SPOkLhWaQ/pu8heyNf2yOH2R6jbKASEo8/WRWrbJf5q7y0LWj
Bp+ZoK5qOqQxyL4r1DIwrhEfcKbDgCdkfUDIVSZf5LQ3mv5KGlJlFKpNGFHqVT6QO5Wi0racW
0aCkupum1vRdC0OUGeTFqX7LcymCOAer10MGvL3XYOCijQc+iZZOVFmRtLh4SG7wBWHVMsdo2
/tUmq/abZAVV5IhxVFJunu1bVqtUPnICgdn/4Bl3rluzF2gbe8bbCmZQMKlBLPUqicc9yz17x
PV6jJGoVBL15Cc=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable.
=2D--
gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 756dc0d540..389cb944b9 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system tree-sitter)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -157,6 +158,44 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+(define-public rust-tree-sitter
+ (package
+ (name "rust-tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0wcvxgnvj7ga1y7xa7wm0pmabkfj8936ifg8jacd4201cj0vgcq9"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove the runtime library code and dynamically link=
to
+ ;; it instead.
+ (delete-file-recursively "src")
+ (delete-file "binding_rust/build.rs")
+ (with-output-to-file "binding_rust/build.rs"
+ (lambda _
+ (format #t "fn main() {~@
+ println!(\"cargo:rustc-link-lib=3Dtree-sitt=
er\");~@
+ }~%")))
+ #t))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-spin" ,rust-spin-0.7))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Rust bindings to the Tree-sitter parsing library")
+ (description "This package provides Rust bindings to the Tree-sitter
+parsing library.")
+ (license license:expat)))
+
(define tree-sitter-delete-generated-files
'(begin
(delete-file "binding.gyp")
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:58 2022
Received: from localhost ([127.0.0.1]:33622 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkz-0004wi-RX
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:58 -0400
Received: from mout.gmx.net ([212.227.17.20]:51565)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkt-0004sV-2E
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:51 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583025;
bh=oGU5GhNmmjVHWoWxSbBzS001lyNgSI3Rpa00IqykMjc=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=QmtWp/rFuyb4u/aFQcd22jf04DNSNhQdGLkEx9Bwx/LqFel42GsmcDZS2ea/O2aQG
5PoRnHC4eQVuq+qrNvzk2L4BJHq1zboNW0LwV2ouS7sBIKu145YM+0e02JoJCb+M2i
Lr71mqOvQWXA+IHR9ULhU4g3IFA/mIfEbqvXFz08=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MQvD5-1nMJZX44l5-00O2pj; Tue, 29 Mar 2022 21:43:45 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 21/27] gnu: Add tree-sitter-rust.
Date: Tue, 29 Mar 2022 20:43:12 +0100
Message-Id: <20220329194318.6106-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:A93EC8zEsyfLXrRRT3/zxrkOGXz2t5IvgmcwmLNvDjge/O098QD
E7wBmJ3xt3R+FEhJSwEtVtAnkwrRe0AlPOnew9J3r381dauNSewpATLP9oCejQt7HYBuhCa
LNNrFnUBZ8rQtbaywd4MfxVbbEMgBOK+lPJhQs1wF3rt+b0iRnhrc5X0k9HAg6CEIfLca67
HOIeC+ytZN6mR6SV12dRA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:uW6HwssOuQs=:c4C3DIQH179bRuN9+6hRDy
3iendnKRKplBgoIAXfLNpZka0/ndC9m43tmiQ+vR/KCYgarn7pArlNCHoZq3QwlNRQ9t2yp6J
ALkKRd6Asn8AoODNnwvao3kev8lSwt8bHTNQxBoZMP7/SKrZ2JHJUWvkUpeOwSL3shNp+3x/l
oU+7Rob3iLYvU1vikSHxWAkhFCSf3yhIU47spYbxIVoTGqULzmJ+DCqzzFWgo31W2XMjwxW5I
CFY1VKecYaaskzGDzqVYEaJhZuUPGEx0e+VbXyfsbj7EWzL9/53a2hUgZ2xKmC/kipZ0/LT4+
YKeqwy8BDo7crr894hXes29Mfe4UU1Y67gRjEpT6tDf1TXZgBy9XyuobTYCNbPmrtcVhGQb3H
eo4q9BTY3IdnBtwr9IYYGxCROKGSBDJ8eBW/UrcXSuugBsZZVp+R2fxlBm5Yx9rPV4g2qf3rI
tdPe9N/6wzSPxZDJy4Cbx0q4fZmRJk1W3GekJc+JfacpAzldq8N/73QJIgkjWRBxz5krvDjxd
mbQcTIjK557tOFAO9rO4urXp4Sz7icIsEjJfNTIT7/n3C+xvDspJDYxhKwVqZ4W4AGU4ZLYVO
os9p6eUHcp+de1G4dp7skFzz0DaDDENlkm3/EGwHKHyu6sVDT0ZnZyVh0x5YYSD3IBp+Uv2uJ
UvwBdslCL3lyiviRknps6wJsGyTKDqfBg4NLw3s6B2+AlbKu4WaBtsB+Nf1wnOYNJQh+UWgwx
NzPqCElvK9Uwe+a9O1ZXh7lyrZJc7HVqp6MC4nXxtplvyIgF8l51+crO6adh8qlJmCqJj5z5e
phPbtNsSYQpPXLg5fPk29fPBN34kmdosevZ9jTVkKg8PrtNvcSCB2JYFlySRskbv5cXrgjCi4
U4tjCd+jmbqGwiYMzLf1AAXYRqNVbwAHqdxsx1Q8LNhgxbk0wLDBExv4toSgiLkERqRT/Jjy3
Py4beHkVFTyK5TFV42GrJeOOv1wdfYc2FxRUJNqo8MwvYCLoNepo7MEOSsOMoJZf6N3pIvXjz
hD9psBBDDxMGC2TgNSOCCVEyj6kG8NxMwELZerinFZGOGlH7a4NxVYYLV4cRV5ekbuCX/OZUm
bRmjNYzZqrUPOk=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c7b1998253..c37183e131 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -573,3 +573,25 @@ (define-public tree-sitter-ruby
(description
"This package provides a Ruby grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package
+ (name "tree-sitter-rust")
+ (version "0.20.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-rust=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-rust")
+ (synopsis "Tree-sitter Rust grammar")
+ (description
+ "This package provides a Rust grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:57 2022
Received: from localhost ([127.0.0.1]:33620 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkz-0004wb-I1
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:57 -0400
Received: from mout.gmx.net ([212.227.17.22]:47239)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHks-0004sO-G8
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583024;
bh=SvTFx9cFTQi11XqrcgugPy8Y422D6x6ptT/7UTrPtro=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=RjTdwN3Z8nytxfmv8L65EHklxIBhxBnpAkSNhssl37uDGKOr914no96hTBTKikxKS
9SuuSf8MRG0ci7Ie+Ou5w+/RfN0YPRVExA2SFgZfW8oSZ8PHAQ6edbF2+QMtq3Cruk
L0X0fJOmwnzkRE62EPbppc2eezTPN3HLWO7NjA5c=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N17UQ-1o1NYA2pg2-012Z3i; Tue, 29 Mar 2022 21:43:44 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 20/27] gnu: Add tree-sitter-ruby.
Date: Tue, 29 Mar 2022 20:43:11 +0100
Message-Id: <20220329194318.6106-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:U0RXjWos2Qn244/yYqXD0aSTQc/vUE7pc5h45wybjC01RTaY/2F
55418fuS+RtQcndCUMfXm+BxbAt7nN4B2ia1KOI+gT+o4J6+iSP/4giBCX0bWCQmES4sbkc
XIHY4mxQByiDCEtmshLBNPXYYuY17FxxoNGD85uxURv152fNtQLqPKw9mrpTSYzlu28mQlj
BEh6OLF7ytN6/8sS2dxFQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:0tfu25yj/tY=:MpKT96iByDd2aGG+BuJt2v
VyGaIXE5pphoIX26MvwyP1FNCmwuztqVJpHgWV6izbNiOPYWCTEXO8DxeyLB49S3mHj/dYU0j
aepz/PIz2M3Nto3Jal/f0S2rwzSG7Wse0G7OCdlHt6KHI4w3IhfsAQZZj1eek9+UeGAjc1uU6
soud34ngRKR+uF6ryWb9kMvUK9Rs8CzeeQHiPbG3sEsVS6e9I32OPD/1VJSGptd57e+RRdo1h
UQAep5SqrVpR8dd4f6WbceSmvHJ7y8QkWNW1MDHp1MwA8U1+YrkkvZflBEjERGwsoL2m2zFgG
J1/JBByyIK/MxaDWUkaFwpa5TdVDZlL00jic65Q867qls5Z1xjFTLgrH3cM/mrIyGXdM+qbwQ
QNU+xX8qW8mIoOP5aBvL+jvPhGo5gYTIwLS5lugA1ceNoHvzubC5RwEDIy9nyx/zTk4nxsATS
+SSmZAFFTB2DvBQIZfa9Shvh+29PB9kmlUbEaP+CHcpCLnci1xUSjgtb4qVLmpjZLeL6nuz1i
iOx1SxIzJHL0eWgRPlCiJZPtlHfltPglWIrx9JO2NJLnpkP0zbGTCFxyp3NMOX+TvJj8F+2Ab
gTGw2M6EOSTjOwTIUAqUtyVo3y5/hNranJNATW3I6Ae7RARSMthojUL0YJU2gHZyfUoQ+Htf7
1e4hhSlt9AFWny6L+8DqhNI0ptmtmSb1DupTnXTqpSjDovLJ9tV4ZpyxyqTIzLO62n8nFIZAR
v9kC/1Hlt2X5rrUUqHBRI1cTmdnvQY53DhohKlBE24v89QvAosIRvdfGerz6AuPyv4QfhBlkP
eV5jHs7msC0f/SW34bpJlWcBHCI6sxXoeblblsE6utNSx2eWeA3ZR6o7QhqeCivyAsc7MHZGt
VD+4oBu2ZU08q51eqDs693GAuiBsHRXJ7XnmrrqUByLcshUg6oJU4+dK8F6/dCm2OBJD6ZuoQ
/lUVhWMC8YDnUVhE5K0bet+KsvkfEy8fNqNEb3X6sb79H9Juwgpue7Fs1iAy5rSdMMktr5wni
jLYRS7hJIhIqGH7tlTKyksujc9sNB7tDRMbc1Bt4AQq1sL3dr07Dw58dsqhU6I3UNYTgXyWbS
ci+N7S+SUPrupg=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c43cafea2d..c7b1998253 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -551,3 +551,25 @@ (define-public tree-sitter-python
(description
"This package provides a Python grammar for the Tree-sitter library.=
")
(license license:expat))))
+
+(define-public tree-sitter-ruby
+ (package
+ (name "tree-sitter-ruby")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ruby=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-ruby")
+ (synopsis "Tree-sitter Ruby grammar")
+ (description
+ "This package provides a Ruby grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:57 2022
Received: from localhost ([127.0.0.1]:33618 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkz-0004wU-8a
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:57 -0400
Received: from mout.gmx.net ([212.227.17.21]:60969)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkr-0004sM-Is
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583024;
bh=OFGywP7cLPC0Esb6QTQLlq4LVstfvoLbJ5oibFCiMZE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=OXm0syVZzlOi9JY6H28gaSmpFLltVyc4EioyH3Qekx0lL9T1/fhJozFE/P15gxqZp
tt0YfucofDwqKq78YNSaVr8QacYFqxESqWt30DwvCVRS2V8+gmKYvjy8rFtwJjbigO
3fsjBDQ+kVPTMWiMzUcOBTwIg1bK91hTEIp0tVf0=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N1OXT-1o16Qe3W27-012n6N; Tue, 29 Mar 2022 21:43:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 19/27] gnu: Add tree-sitter-python.
Date: Tue, 29 Mar 2022 20:43:10 +0100
Message-Id: <20220329194318.6106-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:LHW70lCdNyAtg52K8hkoIQhLuogyH/ckcyRMRU3ggCQRzH4vMWO
8qWtJBrtLQIe+7PX3XUbkRF5WvwaxPpxE3vn8beMh0F/OZvQj5gX4IaHjsHydQTAY7EFKGf
jznfpBtvSLBmZN4HqJMFAiu/C0N7AMbucThmac0M4sc9xdtKzUpn2RlGfn/dzrsQBZdd/gi
hgNKQcbEVjJwtYOHaylMg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:XBqDtA38mqU=:0brjDyyx9pA4DmR94cKt4f
36yU+V8Q9ZeigRjK//kq6rPuzV9nGe6kGfibU8dNnSKgoXB4xZupRHX5SjXdayH07JM4TmTId
I46QSwVatsXd+5cZfDnmmEIsSUJP/n/52td9FuD9hRMhAxUOSoD7JX2riZawnBm+G1v1Eqwdc
9twOFYrPo9aDvnKx8f23fOE+q+svl46fIfX+99nJGYTlJWp6JbkdW0A4yEcEe9ZA2Txp+DBYW
sfGWVM5MDbHQvb90Lvcc28w5h826M4hkC/hJJa71wHKF+TRDMDdK3xFAzBrcv14MZpEmBkv+0
M2/NTubdbXWNfUakp4UDHC4soBdVinkOBP7609OKUesCFp3NlZERxXy5SrNkUWpn3Ufh5eVOd
DD+VzUAg0qAIvFdtK/v9MC9/XTnvLKD2gr7N4sWbu/xl335zCfmW85MTFmyX04Wy1yD5mpI5A
b4hiCaMbJb7T79GCOYsxKpEsOIoUSSqCcIz/MhnRwqHB/uIaSH1whsdNQbp/Y3ObabNuLb7h8
9TRlNA+5KxvDdHKrgD4WtIvq/b1YTV/+rMqMRqeEYrAEfY92zxH08sCVbQdMY8j1iVwC3eDqn
TcplBZhidV3wECYKE8M4tk/mX2lYyfkayQ0FiR10XMsYNobSIx2Nq6B8qR/tTkjim+3YXcjrd
90iA3Yv4yZefAYvUii+5RRoQ5nJ87Lax1U/b0n5H8JWphu+oiAyqhFzDl3csMWGfokYxmzk9R
tkDLsGmZoQu1LLhv42VI6Yks+ORbHDpCuo/g4C9M7+az6Gum5AWqWe13Yn14eD+mwcA9peDCB
hgtpVK1J8PM8W/pMlVYXG9C3IJgnvQdg2Wmg8FQ/gySp4SChTjtn2T3qnylQHOSau03HDyx5y
RXYxyJVF61sSWJD/WeWW2uWXqHG+mh+MF2uHTz3pACv4v0ayFipBqyQgN9QMDiQTTedjIj/dW
0OzkAJaNJICuLQKshu6WSi8H6WauJdiJKMDapxNK02WdZ2BHf0Pl+l0z0+rbkzb5TwjnwC0Kj
aWSsSuWck0okMc4rRKrSmk9KeRry7MWOvPOUMgIKXmzwx8rhI1GN5CYDxKyMjuQyoWZg3Ms2b
lXZ9sv7OIKEyB4=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
=2D--
gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 654445f71d..c43cafea2d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -527,3 +527,27 @@ (define-public tree-sitter-php
(description
"This package provides a PHP grammar for the Tree-sitter library.")
(license license:expat))))
+
+(define-public tree-sitter-python
+ (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42")
+ (revision "1"))
+ (package
+ (name "tree-sitter-python")
+ (version (git-version "0.19.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-py=
thon")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wrfpg84mc3pzcrdi6n5fqwijkqr1nj5sqfnayb502krvqpjilal")=
)
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-python")
+ (synopsis "Tree-sitter Python grammar")
+ (description
+ "This package provides a Python grammar for the Tree-sitter library.=
")
+ (license license:expat))))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:57 2022
Received: from localhost ([127.0.0.1]:33616 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHky-0004wM-Vx
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:57 -0400
Received: from mout.gmx.net ([212.227.17.21]:42673)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkr-0004sL-C2
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583023;
bh=Q2QbvAIsJT3dGPkjrmYJeT0DPYl3vzMMpS4QdQmaEZ0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=KPvoauYazOAcswkNzZD6AqHW+PrKCeARCMNwl6/4+uebaFBtq60mYG8oPbyNNb2Oy
5VWL7/tQvrrw3i1RcgjFSjyEMUBF2A6KHBUMh6RdwNSYAODoMIx+eZQAiZ4WZLqQrB
oWpAFgbH+vN3nZ9wiK6qdQOSeNnIPViQZIpFjjmI=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1Mkpap-1oJsIa2Htf-00mM95; Tue, 29 Mar 2022 21:43:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 18/27] gnu: Add tree-sitter-php.
Date: Tue, 29 Mar 2022 20:43:09 +0100
Message-Id: <20220329194318.6106-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Vm5S+H7Gg1naM/E1GTxK86v64P7FwUH817NDVwbYEIPdB12wOWS
72+4lowbTsXp58UkK/Fa5en8hqO5aYYo5Smye4veIY6O8uGZ8412EPRpoHfiw0JPnHJePRm
SPyxJCtHa6RaUhYdRdhhDPjZO56jxABR8poSqXHm0fCo6Qv7y0DXvsKQSIhDS5wARcLAaFZ
GY+MEdfSeBkzm6sZ+jRhA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:VPRiXS3j39o=:NPcJa3oeR54p4SSZLbQX3x
ArVRx4YN750Q0YesaltEMn8ihXI2isZK2/NDHRLxMPi7kynsQSL1/sP38vTJSAi1GR9U5FJ78
aRWRuYCr3LKUAfMcq0uMU6xrmC+pw7PYcGTrNI7ybZON8/X2oJYg0kVe5PM0sPeujibtrxgdO
sOt98xAkJn7vxV2U/1bQK0AY1DvU5LRQaN33S5uIS+WKmFdwkxwekUMB8ZqIslTdmQ1K7KPCR
tjB/KrEE+cryrhB6cqeTUYasDKKJu59CQMNgzRD9l7x0weVVpoyrTgHxvOrOhoEIl8dKz4ioV
Blx8xIdh+i7RnFw2hWzcqSkwwYx06adipC3ATpMf5x2zvUuEXa0JE+xJhv7vmXdAMb+WQ3pnX
3TKyNt/QSRxVUBGq+Kia+mQz7FAz5xpneVrRyJshZubZ3nYtYbD6sMaLRSPCyub01knjuBqqM
niIEM3DIkQYLcPgKvG649PHn6+XFMoTUcKTy8H1lVObQL9m/x3xGzNJgXkqSHNQizjNFPybdc
atDkI5rSIHtPkUjtpbnoZYCpXKz+Ycw2921EHzzx3QNBuOuTOQlpHe8RazYO/Gx2DkE0Y9XaM
IjeLhyBJhi9y8gkaPumEKmMnmj3kTagG0u7lfZp75XzOtQCAjs4B99w0FOu2C3GvczUHFIARe
GayZ1fDyoT2sojmz47wP69fGtIGIDq9/OktkH1tn4ASxLrXr0iERTLTi1rVBl/SssRnhIVWo5
zKPQhqfZLpkn6bg/PyjM6YSij6KXXAfP+oNGfHOINU3yWZM524LmqP6rqowgA+AFt6rucjCy0
7347/0qFPNGWv/uDF3I4BwwuK/9F/cRQA2BB4X5H1dxjVKwR3LcajlzoW3RVAByEISc1uUQEo
imoO5KrgQYdiSL9uo/nDBTqWd/ZgF1PPeZ5i/bczjRMGTwy+wrQKlB3dPpPiboh93EmcPGk++
kx/RfCuMfo+2aKX2wgmZEAdRV04axYb2gObtOeojn93F/DCR5wAlwMlkTY7R6DXLhjT7/qNOP
15UV7tbk0lDP3ZqQCT4EogawrN7NcLsA3rpc3jsQLY9dSRV2pHUUl1vq9bqXoOSnltaeZyj3m
RZ9on7cCSct4W0=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
=2D--
gnu/packages/tree-sitter.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ff98044cc1..654445f71d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -497,3 +497,33 @@ (define-public tree-sitter-ocaml
(description
"This package provides a OCaml grammar for the Tree-sitter library=
.")
(license license:expat))))
+
+(define-public tree-sitter-php
+ (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
+ (revision "1"))
+ (package
+ (name "tree-sitter-php")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-ph=
p")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad")=
)
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")
+ #t))))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-php")
+ (synopsis "Tree-sitter PHP grammar")
+ (description
+ "This package provides a PHP grammar for the Tree-sitter library.")
+ (license license:expat))))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:57 2022
Received: from localhost ([127.0.0.1]:33614 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHky-0004wF-MW
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:56 -0400
Received: from mout.gmx.net ([212.227.17.22]:35829)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkr-0004sK-2T
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583023;
bh=yONk7EbSdFMcXlip+laMh75Ui33QmpBCs+/0eBbJrtY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=WwnWnyY14O49lDh/xlekF1Sm6m7OIgaftTOVWJbSTMUcqpUwIV6D72+73xXWm0wkA
paEWDegOGpcGXwCj9MC7sq1FaAg3ybYnWaR+3hDo2J3VVWP7VDHo2YCgUDMguCzwxz
iKS+IMAt08dUikJ9B6qq6jf2KGLh40obrOss+Qno=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MwwZX-1nwkr60xKN-00yPOh; Tue, 29 Mar 2022 21:43:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 17/27] gnu: Add tree-sitter-ocaml.
Date: Tue, 29 Mar 2022 20:43:08 +0100
Message-Id: <20220329194318.6106-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:94qsy1JAv64Jk27mkEX9ABPLu5mEJYffVWZxyImR+ANgVLTKY/r
e1MHFmgcr5gGaV4Frj+m1jvG4hdqQ2sLq4U7LSHW2bdA5/1gsTqX6VQ6mlw/FbgUBkqzeOi
3Nlm/RKA2GFUKEhaAtuiEEQR+3MIHx5A6qUBYzLcFlnCo3hWtqc2kmaCIZJkLkmnrsyVC5f
Fors+FSWWCSCbARXiQYKQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ciowzI65Yiw=:I0P6wBEt3M2h/cSWy3jP7B
HBMZcxHHjjodUPnhzLPDuzBa3kePKwqE2Hekk+2bnf46Tw5YU07nsOfpQbqMyM7j0UTltEjJD
dkCRlltwBmmxVdBoSY7n7cFPK5uKxXjypAxUkakn8sT8Bj95nyP97lor2DCPn0oz8J90k7RtZ
Lay+sNQe7Ec0H5OfUT7Il2qRTbBWwSNxBLgf9AO3DFEg6VbKdg3Tsm/ZyyTlil9mRocmYDQmt
njYgnMfNp5ahL+b90Ife0qtFw3rrUKm7BPjpnVPIyZdNcb3rzK+5XXQGFl9odsIoJq2I4Zgah
pO0hqYR6N06McSKXhKthMoG5hu7ukhmQyqYx6XHFuHvWS9f5sk9hx2FNwLL3l6/f65vyGgCkL
aMMby0KFvzAN4NX94Ayx45odA5jy5kfQW1mtGfKvn4Eu24sovhcZfw4vU1QF8QvUSUQnBFfMx
lhJJxW8Gh0feqLqgA22tK0ePt94A2uao2GQeJuH9xEqgxEohMAzOgLvtZGqh9bHwgjTkR9NyL
bTtzZrLxwERqzSI0KiJnQGN2ZXjT38KQWgIvTu7tPBvD+pemvqVd0ySOZWN9Xjb7CN6fRNIb5
g0PmBw2Gcc9TU1beQddJR0u90dpzv+va6aQGs0lZ0r4nkUJHfvMkM245ERfjTLWVuZJQWEd+Z
nQ0QEVBuLY3Y92VUDdX9huKYmIsVC7jfgGm8NeDLDY/SUL3t6EZIC1Y5WWZgm7jsT1KWtgxex
yfhmvZ2qA9XJhD2tQ8/EvtFk6R2xVpCV45LHy6uuxGapUWQ84IUwDjvYHktqqYsO6+ORKrdOJ
0dMYOKARagVR3nL7kd4JrRHHeHnzS5QvjRl0SEvvirxIenmvuRNKTzJoDwPYbzxLe5568zGH5
laHYNlSK2aIS1529XbNtpVJH7AVH+i46pDeVyaQzcrD7timjr2a4V8xSamjaXL6MoMDnnF5V/
6nN5QUc+v3w0IpANbuHaDREK0GB4/FqnFm1fpNUNRuABv984bnwrQNDjKHCiETlQWjv/t2skQ
jCYDu9rp19PlOLUt6WAkKVYaxrsM/arURPg2E63EC9l7zkJHOUEK68t44ugQwdvdLDO9sUs4Y
yIXzN2cLgw9j6o=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable.
=2D--
gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a535d8bc4a..ff98044cc1 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -458,3 +458,42 @@ (define-public tree-sitter-julia
(description
"This package provides a Julia grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-ocaml
+ (let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192")
+ (revision "1"))
+ (package
+ (name "tree-sitter-ocaml")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-oc=
aml")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df")=
)
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "binding.gyp")
+ (delete-file-recursively "bindings")
+ (for-each
+ (lambda (lang)
+ (with-directory-excursion lang
+ (delete-file "src/grammar.json")
+ (delete-file "src/node-types.json")
+ (delete-file "src/parser.c")
+ (delete-file-recursively "src/tree_sitter")))
+ '("ocaml" "interface"))
+ #t))))
+ (build-system tree-sitter-build-system)
+ (arguments
+ (list
+ #:grammar-directories '("ocaml" "interface")))
+ (home-page "https://github.com/tree-sitter/tree-sitter-ocaml")
+ (synopsis "Tree-sitter OCaml grammar")
+ (description
+ "This package provides a OCaml grammar for the Tree-sitter library=
.")
+ (license license:expat))))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:56 2022
Received: from localhost ([127.0.0.1]:33612 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHky-0004w8-Dm
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:56 -0400
Received: from mout.gmx.net ([212.227.17.21]:60725)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkq-0004sI-Ow
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583023;
bh=zHVAHVFS6CoP7gGHV3v4O5+Cl7S6R58iRKPjP/aes9g=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=l3+tDvmozJJ+EsSKLVoOMElwxMmT5g0BBWkEEfhUlBKLPK3innPvNIrWQNmVdqpGU
QXdUh+nfsnyQqQuAm2AZTJxRb59Vxm36PdNRbmfkcYz3xipgfJrkh99PsXadAvEX7a
m5KdDNqXygvUyNk8Fl4Boau63yUcBGsWZoA20QHM=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1M6Daq-1nfuWk3yTw-006iPk; Tue, 29 Mar 2022 21:43:43 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 16/27] gnu: Add tree-sitter-julia.
Date: Tue, 29 Mar 2022 20:43:07 +0100
Message-Id: <20220329194318.6106-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:oyTGfiE4BcQnDRHLMI/X+P+J9koMezjVj5Wlp52RcjwAQqSJEuL
r+Q3a/rHe+J2OLKTEhPaY0rFWNQ61vDZqcHDKs6zrZ9zt3ZMOY+8PWS7m4aJaixaJP7rl/p
wFKt9PqxvqFbCOExI+ZUSK4Ohz0fxv0jPJNoGdTgLyndjXdzJddKZh0K4/ZdVBoDr6EefDc
npMEktNtdbkUOj0ExmVIg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:t7QA4xBU+SM=:48JnBi4OZ7B8kP40F1IMbp
JF1xNnjmZBfPhcXwPHOdLHBYJiBCI/ej8adMcdbdn/nzQBNhRPtjFVRSFs9I2nf8ypWpcQjLI
nqj1sphH863Do1fUQL8GJ1qTUK58aPIoDg/knEEUtO5rRulHJk6SzhOYzMt8RL8Plg65XUXAx
mccCAukg7pMYkoagNbtrn1tdjNIbT8ZwHM6kyQY0r32LqefGyMzkcvHNVgX5FuKhjxXQif0sj
ayI0Id4DoRFp/rBcn/bnehPtZs0YiB3FbdMjkt54csm7lOX3UiGVRSG8pmC8gj1+m35jnTh9+
OydSzZFfm67Uo2qONzCbN694NMAtl4wV5cinV4BPfu2alXf5IwOBo2vSrvsFSKTG+o/kGau6I
sM2P9/ATgFdGhtnfln3Q8Vs2FO7tNpwGWHcKxEbjhk8+BhLicNVPNy4e/IpGI5232CyEYMwnb
euNi2L2AYTed9DzpBUAsKXFUQVHCR6WZZns3LuuQEnB1lJDECMKgJBcOyLhuRM5S5CcXLfCos
+z9wPNCsqtqd0NtK4sY4SQ2JnP6xAg1+5c5L1sbD8NnuKS4b7VsumemsJBhPATtLzI4RO4bh1
wBe83kko+aKYepNgtlZhL4HVc5hYwsrpgbVTSQmuaKM37dqgKCV/XPYc3cbUwC7cyYnxA2jBh
bu24pCP0A9OoYmF38BrBAQOUTyWskdzTKp5a8wmuDq+FafCCv1rIfwwNHi7WJ/MReGEmOJ59V
k2GS5jDINKGNHHAjUmll0n0Z0twAwWXFxrj09OzGDyJYVHM2xeLxHKzVODMNRjWRGTOo/1UdK
iC+hRVnRUjjZFPieWE6YAU6vc7cvvLb+Qm0BzHZbduN2prSmPNPTg9rFL1BWCG0Za525g6PDa
r/xeTy2RGK3GniTynTqV+j/qpNKTDql2iFsQ7UzAH+WCtMk7/qs9fdgS7P8Pz3e6mQaUH4S88
0h/9HmdbybDEBXQvI1V+AY/f5qDFif8BvV4FKLNc/tXu57c5fr7lOqVotK3EFgLJs87uTwmT6
JuQ2O8JbYBmdHxrQrZICwGHIUwIs8NQLQyjgAMMpSJLWHKQtjHawot37z59w2X1DoLdVZcKkx
k85xiY4uDcsLf0=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d43e16af09..a535d8bc4a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -436,3 +436,25 @@ (define-public tree-sitter-json
(description
"This package provides a JSON grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-julia
+ (package
+ (name "tree-sitter-julia")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-juli=
a")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-julia")
+ (synopsis "Tree-sitter Julia grammar")
+ (description
+ "This package provides a Julia grammar for the Tree-sitter library."=
)
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:56 2022
Received: from localhost ([127.0.0.1]:33610 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHky-0004w1-5N
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:56 -0400
Received: from mout.gmx.net ([212.227.17.21]:49643)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkq-0004sH-EW
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583022;
bh=0hfUUmHT1FVTy8+2IXO9xELD8p34yHF3+XomnWW0PQI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Dr8d7eRGR5GbSEdBbnsqueuQI0lu8OoEntfUj4bvOs0HzivYic8i/baxni/lFsVhs
6rrnJvvgZogtauzhbwa7Faw22u89/8/4DrX0bUfDDzRjFLhw/B3fJ2Q3kICbm8xsSJ
1zkyKWNorCq64Jgdj3SzOODQOruUB7Xz85riJAU0=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MbzuB-1oB6sD2jj5-00daih; Tue, 29 Mar 2022 21:43:42 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 15/27] gnu: Add tree-sitter-json.
Date: Tue, 29 Mar 2022 20:43:06 +0100
Message-Id: <20220329194318.6106-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:rPlrhLf7/FMQ+ZXMttdZV81fiNdSWaDyxzC2I/yVhouctwEXDZ2
wn2s+9xpIbdtIU8siHROf0p53O/SC2LE/Qf0rGjUGQ9gLjWsDvJKHif8q9mxRjlOeARdtrN
g6jWEIuDtelkMpRmJyHJgTi23XdGDPtxxAlCksqILJB7sZLDi3SjtiWrbuTwPYAzdif3oNg
pwmTV7cuC+yIX9BjlUmwg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:4WvW8mexGy0=:1nvjOYq5HYenzygBTS3CqH
QfW16Tj4wUlWMxBDG5hDgwExH9ZJrW147d4meP8TxFO3ize95aEHaebgYPuLesiTDtCdPugBb
zE0Kmh61AO5MH7lHLLV0FHuQbMPEQYkRBk+IXH7NZOfesp7rAYVEkA4mJ2vKrDbb9A5mOVLXx
H9OHNyS4toEZBXLG1xNgdlW1CLjheOLRrDan/pDYa1CzTRbTiwBogr3K9UIHZcB1CZBPsr5QO
SALO5bz2cbuyPDNx7Y3Sdrj9LXbVplc411buVZROfRYkU++8ipSTq29j3qijfsCdVVw5opOCW
qc2GH9REi8nknYwJmau2SqWDMjfnA8ft4tB95zv67Fyera5dk/fD0oCqKY4wO9qKcZI/uVH+O
oZsXcV4kJHSefcqbDvXf3Ez3fe9nAzheJsTR3Vnv19QXsuUmVJotfi9PddlH+UNWRr9yqFgIW
nOGnROEr7yzEqpftRngOIbHW893g2Z6K8cOjHpuDsUX1eh4zb1ntg88ZduRGO94ax6ow305Q7
nFU6Zl5dvu2nXULyj3w6uOxhKpTtu3q/amDZO5fjAnJk76V5WlduHxq1PWFd0Fl27l1IqSdRt
uKyNcl/Bkb1jzcRowrJnkgNkEO5wekUhhaYavynXfAnaxQZC4c6kCAuEGi6llSzj0Y9RLTve9
2+iedZjVSxYwMzgA8lRSJp8nPOEwjIpy61tPEk+X12RJV7yUWfJf1TzBV8TUH7tgtIPeNV6lc
nWV05pLHoqTEtDHNtjxCYmTPeBs2Dg63gcP4U/puoUfmcGdDSdC49U93Tw/3IMgtmMnxIErHS
PnccSAZOH95igl6TbfmbHaZwdQ2RKZTGJuKKN7HCXg6FmBAIGT3ygUWnXHKfUZ9XYOmfCiNZO
sncAnzvw2pNE0r/ELT9/Yo1BjngkwIsKkye0LNiqX86YAirqX1zU0jQqOgbALpumagbb348wE
1+opa4DS//g3CuUYvYQxysJ3Me74UGwU7u5tyI2HAtiWOeJZrc5Fc8PH17oSpXYbSgTEcF/tk
i/LpyT7kbQBJCXiD53CESTIhW94TJDlWucR88oVDnhk7ZppQe+lpUiseXRaXY64rGKskYT/jS
9el7euzMJo4r0g=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 30220a5a8c..d43e16af09 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -414,3 +414,25 @@ (define-public tree-sitter-javascript
"This package provides Javascript and JSX grammars for the Tree-sitt=
er
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package
+ (name "tree-sitter-json")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-json=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-json")
+ (synopsis "Tree-sitter JSON grammar")
+ (description
+ "This package provides a JSON grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:56 2022
Received: from localhost ([127.0.0.1]:33608 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkx-0004vt-S5
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:56 -0400
Received: from mout.gmx.net ([212.227.17.22]:33307)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkq-0004sG-7l
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583022;
bh=Dp5KTP05LgwMCzpZF09097B1PKfCHMmRwlmOk4KGQEI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eSghvhtptBLS804qff8c+ep7AkXCPqK83zdlWdadPL5H4jlt+Pt57Dx8sQXO/rReP
UhyQy+D6nNUcDeNYcJWSjieEkcFB4zURhCP62IwkcE2fDEbwUorFrXlOUrWXPq1Mwu
lvOK2isCBwxKk3W08mQTNqAZL/z9yMrbVXehxJIo=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MIMfc-1nnZUY1Va8-00EMqG; Tue, 29 Mar 2022 21:43:42 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 14/27] gnu: Add tree-sitter-javascript.
Date: Tue, 29 Mar 2022 20:43:05 +0100
Message-Id: <20220329194318.6106-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:W1yEj0G1ZNnrPJ2LF0fCnsjdYtzDCSB4ov/7tyIpCiOZXglJBIJ
K18R3pNBPHIeG0ifcryDUGbPCiYJEOUg85ezsMDv+fCL8d0aiwLUjCnl/ZVHuVUwqSaQ/9P
iqS0QiA9LlMRK8EXazl8p0KkC6n1JpOTDc0EqDpgAb6w3FVh7RwuJqzPD/XWn1SjGXUdA99
dm4uCzaYGFAlzuROiYLmA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:GmI+q0Ic9K4=:Hf17C0miwRlMtrXizOmNnX
5gis4bk1tEeVNNkDRixwU3mU3gyqTrEteZrUj/O5igrbPiAi9KqQjjUwug+JVho0Tv/5+wjDz
tL8cMN3col3y7LUjfmpZZTmo/0QBIS+v1HEwWnpmx8Inc6Avtn2NemMm+mSnoAhKoJgfXajca
aDxozAuymWvu/i+h/8ELXoKYJbQ6Ko6E8i8i62bZnMgqIU35hHjXhOFLeWDF+HftF7rQMlIDS
qodZyGCD5EMIK6kaLqOBgE9q7WE+rqfAX3q4IUeYXj9beEGcVgvv1a16K4E3tWq8N/dUbJglJ
xvUNL/HF2BoRsRYCafHNxgL8AcDOSq4mZ6qfIZiaE6hEqibR9BGPA4JK2DwNY+mVdHMeHv1ET
IScVmi335MzmZOoV27ign5l6Tj+9xq/YmPCumckFQb1FoAihIN3ZT+Suvb3aUU3em9IAGW7yG
BAz0IYl+R9wxKsnrBErUiqNkxDZfh0ioaN/WnyDgbNAweSGtlxcmZwIS18B6ozq/Bti1dzNam
JUdgOjDWX1qfBSWsH/4QjqQG+UyYDDtZQ6oeJ7mkB12mjX+w53FWjX4WrchaYxgCkv20rUyXU
rLGX6yvI9HURZuE1bppTZLnkEP1AP4FNRjSOD1VMJ2uiMgsbrykV0gvibTYVG1ylMwkLcRhlc
/kuzqJOYYVNJGuc7gosK0vW5U/z1hkLcrXNuKJKVhIdjU7T9bp3wJp9MzQSIBrmN5rFyOJTFb
HIv0nslWMCh+ANEWI9xZrn76bn1/BJqW67SxSQeHtQa5LXvhX1F2/doEqjPKc9+m5/rRpC0BP
B5dJB/FFd5MflLGQW6cKmrpZkv4aHC0gReViSkPjSB3zZ0dVRGXrecPIEpz9iot5PuUMZabeM
hJ/tGd0D82Z2RQOwF5uagU0KRFcQLcGdkpzi86DFXomEFkHVGvhsF/pyuWTlX1mzKMohIZY4e
omn5xEvOhUeyXfnpUUK4fyfQzH/NdgY2Prucx57evVe4wfSFeQEH9M3b/e0LfVTBrxLCff6Es
0eficUTmqnx4k6ut5Ta4z9fnnjZsNo0lzYd/8ynZMFPkG7t2jGfNeQg1YdPHRUikofYstm6Dn
KNSibcU8RHvgto=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 010a7c3751..30220a5a8c 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,3 +391,26 @@ (define-public tree-sitter-java
(description
"This package provides a Java grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-javascript
+ (package
+ (name "tree-sitter-javascript")
+ (version "0.20.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-java=
script")
+ (commit (string-append "rust-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides Javascript and JSX grammars for the Tree-sitt=
er
+library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:55 2022
Received: from localhost ([127.0.0.1]:33606 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkx-0004vm-Jo
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:55 -0400
Received: from mout.gmx.net ([212.227.17.21]:38463)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkp-0004sE-T5
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583022;
bh=KT+rCoY+S2Vk8SBZkZpfoqC30rahd4Q8WNYh1fPNFjs=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=XxdrAdzNQwOOtMDOiRRsW2IbjBD74FDlwwkjOrkPAjsyiSA2t0tNxlVvEAn2H1peu
Ylyu+33XTKAQ8i4+kk8949OsPdsE6MaVoHWbwbVV0NJcni67kWBcYp+18V2mJMRvO9
E6Yqonk8ZqWVAepPsNRQtqN7crUi31E2t+XfH2kM=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N3KTy-1nzAce0Ide-010J3m; Tue, 29 Mar 2022 21:43:42 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 13/27] gnu: Add tree-sitter-java.
Date: Tue, 29 Mar 2022 20:43:04 +0100
Message-Id: <20220329194318.6106-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:DgDWm9DAdxAyhvBIctfftJTvUb8SkUenHgn55/1LrkK92poBQpe
hqZuRAh7Kk0bsFOIPtn9sFubi8N8VAriIjxf22ogrrPl8jNZ/TxeBhAHX5wR3Cflm7y/exZ
g/cgJz3nXqchFmQ+bSBaDnyaA0xBtYwUYzEbKo5mKv1HpP3s8VAWScVRe61h2x2Nm5y2w56
qahhOqDIgiUnrxqaxYZnw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:PIIlqFS/Gg0=:4gwWZ662sKlfjos+SsAvkm
wE0VceTUX/NtPmHl60oFQwH2aUyVZLFlGy7OOLn5XSWvFKkgnCzZhRcTOoTFLhFcvzOMRlmYa
dOaPqS6BLVq5C76pVd48FnLT9wpNMX25cMZtVUXFddmw/NXGBHIQEQrVmDgSLToSDmrO//Mli
CGdmlB8izJIMnko2ZvB1ap2fy1Bc4jBHl4TM/VDpI2gNtaSG8IpwfZnF4aOMFr4izyIOENYGg
KyLRZu2h8Zq5jjn8xPifyf68mi/leXawmdviaezK+RxIlkm7Z2ufTFK2CuB0te9gGFlEwXMTv
DdC95C0clqB2ZLqcATvxIxs2gqdljlvpnOLth487GKxs9zp3Q5Ap5ZiLWFIrh6pxlPo4M0Oga
ER49XOywGUz5tB8wEu0TZawN7CXhXdbg/xSUEY2AnbF31Uh0YX7es/RkLfwCDjAGLuhWRfzj1
q2wT8ntM/He5USOxdAoYh5T0ly3d9kX0fsDANLkPczuCKddQasncu3y5EiBZaS3H0FkegZGEB
vD0eU0Tp5kYeJS5bkSLSEKwZALKe59qxCzOYY+9RxFGGeZUjGz41Ji86M+0vBlXoE4O3G76pT
s1SOU7hjUqyDprfiX985wpdP/E4BNxTZKfwPZZx0OCTUW9d09QvBJwTVFnHAJ1H6hxoW7QBtU
l5J/Q9yBeAAyemHoNsaUGhlLbL6N1cIzHT5GtTMWx1rQxkgUY2ztoVXucxqqlcKyu6BkVPgc8
V8KLedK62UOL6hbl1ZHgB/SJV42pxpkp5Rq9hBrV8yoQ16elbPSl1AvBnCCqifkiX7VhHwkwC
HoLJpcXDATCPigEKoUcypNxZnjI9MFxFLuw9azg0tfO3wWcEWDFiIdU2xxNDmlpPxVpgpCZce
1t1uhjfIDFXx/3ip8eeCEAq4EAr2z857svjdYWQl9BR7hzgrJKijQ255v4wxF8UKAOcEtcCnz
2QC0A+70hG9kaDYMeMsMFwIm5KtwaRdjBZ6qELGjbwSovWxs3BOUKflpovJs8+i0ZyzlcM1gA
YnZre1F0eJ9ktP0quUIm5qqUKuvAw3/WyfaZeXtRB7Ab29L5fpjz56v3zx48DbmLHvkvAbdoM
6eTv1yXMOoYH2I=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 15f832f8ca..010a7c3751 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -369,3 +369,25 @@ (define-public tree-sitter-html
(description
"This package provides a HTML grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-java
+ (package
+ (name "tree-sitter-java")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-java=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-java")
+ (synopsis "Tree-sitter Java grammar")
+ (description
+ "This package provides a Java grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:55 2022
Received: from localhost ([127.0.0.1]:33604 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkx-0004vf-BJ
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:55 -0400
Received: from mout.gmx.net ([212.227.17.21]:43787)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkp-0004sD-Kh
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583022;
bh=GlpxqFb3WelIW5gDv26NLTHTOgnNxtiKCsTk/aPoJCg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=icjkQF4T19uJOTgiPn5b2eXqrV9Gouas4H1AqT7BfxskHnC5GlhbpkhzrvQ5AYvtr
PjEO5v+2XHrRXk7WSfAu9eYlqWDJI8+cu0mYCimf2xqi+683wP6vf+MseAiWwPkvlb
o5ErJ1HS+b2/bEK11Fz8wDgisCleUFVw0YdimZ1g=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1N4Qwg-1o0H5H3H78-011OzK; Tue, 29 Mar 2022 21:43:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 12/27] gnu: Add tree-sitter-html.
Date: Tue, 29 Mar 2022 20:43:03 +0100
Message-Id: <20220329194318.6106-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:fjXS6Ouxewrz7c6Z60D6EoGDykwQ/3nbpVDOnvFwkB9sOx7kewR
pFl0ok1A9/0KwHJN6xXFJN7Xy+eS7SMffUjDFA4KBcy54UOKCwahgYREiJj2UM+KSa4ceXY
h1AsnfrGTSHXuG61WHW8dxffXmWcpqQkl/ZGmIpJGHeN9wbg3tjbzfnPQUHiXjoRCC0LsL2
1UEXRpZ2rTuTkIAFhY7Iw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:2yVEBtV7iKU=:uoOthGtFEzRhWACYj63Zne
H/oIa6PjqqxEHYcjORUifvD4DGj1ENSqjzMQAbYJV4o18XO4Eor701CRPNDSjCTq/qFqNsVBX
Mpmf8T4xma7lPzTs1ZzL77+eQENaoWm8VHipTKUXgoIO7EJFcDDS3Hr2wZTkJNWtY6mugu6Dz
ScfOADYvo07lmenzJHVcEZTNPUA5e2pSBvM+dyQIKfpweWWiv4mnnzIMNsLD9RLfafSWAV0oD
sBAcYwT5D6S4oa+A2Z29QYavoZU9/d+A0bxrvNF6SUaW8uLd6+VvNgb9EwWcy0h4JzUyctp82
qUGDrPtDj3wbeq8VPXP0khwiRU+c+ikNwzN/9lso2/e0U3On0Ww6JMcLz0Kyk+A4ecmRYOR5c
HRG4r6sB77345irBlu+EV3kY/R7YvimO3PGz3R2lqRKNLOHCrsnLpLMut8QylB4FjWz6ZtQBf
+aUyKapUm/7KWKx45yqrZZIzMvg1L/Eia4fCxiiAjMov7svAdOwJ4KWI308lWE0VrcATJt5Gd
o8pVDxlTpAqK75Y0umYDkth/MkBGx9C1gOWIyaXppXLtaAHEjwS5Ts0UfLrydQyv+cTENF70v
Fw87jz/TLMy3Tz+2X34Ld2Vzl5DSMrn9AMIo9yFORnzrWcM1Xh9VCKD+AD+szRym4EhZVpUd/
9ar3PFCupuHeIfuQqNbaSB1H82wvJSaAc3ao3qlVH/NZ4nZrVG2ke2qg76hrsu3g8MzZEZfgB
TnLIdcGbMLt8MypSPRulr4/qsbh6WD1mp2WqfaHGkXFxsUYJB71whFlbTetLdJxs/E21l4x5J
cI9+eDSww4VWTP23OiPwDskC4L/n2A59g9WL21RQm8U/tmW1ysuM1Nqg+Tr4bNjRsGXRs9O+5
hR2kbwgQUxhpSTS8pKK1cW3O4rRuARi9zDmtQQqv49IUFdQ8nJ45ERUCTm4sXQF4Q/f67ntbO
SB9NN6EMsMLb9Sy6bocQvz/Ro32K9I2OgvzFwrn78A+kGTYUwmEEd0WxoiwHYR+aZgSJ2UiI7
+JrJdHWo2qHRXDxG4zKi+INHlvC8ekLZyorwqkc0OKP3xO+A6smil/Hnt+1DzpbrbXHsLtviv
b5acwABXmM3hxg=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 585b44b9f9..15f832f8ca 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -347,3 +347,25 @@ (define-public tree-sitter-go
(description
"This package provides a Golang grammar for the Tree-sitter library.=
")
(license license:expat)))
+
+(define-public tree-sitter-html
+ (package
+ (name "tree-sitter-html")
+ (version "0.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-html=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://github.com/tree-sitter/tree-sitter-html")
+ (synopsis "Tree-sitter HTML grammar")
+ (description
+ "This package provides a HTML grammar for the Tree-sitter library.")
+ (license license:expat)))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:55 2022
Received: from localhost ([127.0.0.1]:33602 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkw-0004vX-Us
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:55 -0400
Received: from mout.gmx.net ([212.227.17.22]:47739)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHko-0004s3-NK
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583021;
bh=hnOe2YT5+Rsb+T30PCUPUZMFq3l34FK+oSSKlH1gWuU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=L80MW2UOTnaK4fzoatRbqM/ytnqV/z5ZlTn9GKqcxOvz/VPqDDXexaYxWCewnZEta
e6AoVdgXvGcgsPYRaInriq31ag3b/9y1bgg0aynzhJgg9KNjQ6WXUWNMQ4aHItacnX
7AFLfaQM2Xkk3kYoir9cokFSoQfdQoNBAoPX7wKw=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MulmF-1nq8593qvz-00rokZ; Tue, 29 Mar 2022 21:43:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 09/27] gnu: Add tree-sitter-elixir.
Date: Tue, 29 Mar 2022 20:43:00 +0100
Message-Id: <20220329194318.6106-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:hKgO1TsVP2B4YHOW+oAQK/R6GUwuYlgVmuO5y0wkUCzuwwFPv7P
jnuAn2WHcWYWkiX5YtJHQheDE86HdscWe9r129rxSkRoGtg2seQ3fa/pN9vJ48RebyyTdiD
y6gU+jtWIYqVJsz847gj8Vkrl1vLh4dQmy6OmFLX0OnptaZ8Rkszh0Ga4Z15wd+136wXtj/
sqED8oXLeR5kK9XB/JASQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:wEVFsX+sWRE=:kNa+emzqXPGIWLNcitRnFn
uhVdgL8DV+L8MIE6JqDBvXk1i+8VCFvdmhzyEbfpIcickeUZCjFc3sGYv2easIGgumvh+9zw/
SZwkpUgP0B9UDcMt/+CwBtNisAMFPPKbmryz6w/PGX7RqxO+kEozJVtl1k8zcLbuubMFPa/5N
MVgdmQkhnx5adjfv5PA8Y8d4Gx626TDFqGGazmQgQ/jTtkGgTSlsnTgZ41RW8VYfJXzBtEGWx
lqvaGt0Jt1nx96O3IpdyFicwaEHi9KlDDsoukoLrdktyJs33xQa8bnxxd3KQ2d4LAsQ4NJF/j
02rb7toxA7uD1Hc493vLAoOdou8uzkOBoXS9zfKXW5m7JdLDMfcPLHlo46E1RucJnW1QhLK8x
vptmIld0LkSDdaE/RDCQ1epL7ycslSV4tR5mcwZAV3Gq0DDgNKa7lxMCNskNiXT5T7aUWw6Su
JmqbyRCUt66duitFkeLEd9M5Vxlcnn0+n0bn+GP99AR0IFN3k7BH8P+Cvw1J1YQ3zofMA/eI7
CQztaquln/dgyo16K4srLOfYkqZh6cTcTQjVdhDAhP5KYdi3yvsogsaAzPfiAG5RxXqG8AzUR
jTfO23C2UoWQ0eQD9JHU8DHT3mtIXSIeGcTMdQLEtVTxUtTfTWonrHAL4ax6yJip5/z8au5d0
vJ439XloTVuiRVCTncXuprF1GfDTJN0OkSb3/jR+xfe8J/91LCtH/6Z7F2iR1HYcxrn9yJvwO
ggX/mK7dAUv+0PoMd+z+UXJ6BlUnwGeOenwG0uZOoX6APLK3LRPwQsFUshRAvPa9EFOo8+uq/
PxifKy+f45F+FGBqMid1GCFF9ubyGKb0dkyd1FjkDSLf3FhYfZnwN/RT9iBUVauVadObr3SKP
VhcAisMq9o8BrTBlhjOrcD9uXm2tH2Tzd0pU//qdTajxp5lQkJgFvNJEq+4PCjdBKc00cfPRd
3obPLe+/K7JbE3i5cF909+E+uPI/MOKEANjsjBAa/olcC09lVLmfWQhJfXCBR07F/B/Wadq6p
yUlfM0KmLMiDuDf46EsCPN7t7pmBAKsqkxWDj7bqW8JFnZgsbVSbmwlk64DBdqnSG704nDWIF
gFyxvfCoqIIPKM=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable.
=2D--
gnu/packages/tree-sitter.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index de90ac2093..18ea00f7cf 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -277,3 +277,29 @@ (define-public tree-sitter-css
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-elixir
+ (let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869")
+ (revision "1"))
+ (package
+ (name "tree-sitter-elixir")
+ (version (git-version "0.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elixir-lang/tree-sitter-el=
ixir")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h")=
)
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://elixir-lang.org/tree-sitter-elixir/")
+ (synopsis "Tree-sitter Elixir grammar")
+ (description
+ "This package provides a Elixir grammar for the Tree-sitter librar=
y.")
+ (license (list license:asl2.0
+ ;; Files in tests/corpus are under MIT license.
+ license:expat)))))
=2D-
2.34.0
Information forwarded
to guix-patches@HIDDEN:
bug#49946; Package guix-patches.
Full text available.
Message received at 49946 <at> debbugs.gnu.org:
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:55 2022
Received: from localhost ([127.0.0.1]:33600 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkw-0004vQ-LZ
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:54 -0400
Received: from mout.gmx.net ([212.227.17.22]:55911)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkp-0004sC-B5
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583021;
bh=UOBzjfssf9dg3Zml+pCSbxViW2e6VVAbYuME+P43Qm0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eZbJhsWgu+vXZJOBLEMP7aqFmOejqCNOuqbQYTE6S10fLUj4d/Ka5ilHPZGW4kn5R
bnuXpxUfYhkAjcdQR6UmbPSwW2nDFJ/k6FYvRs0aJZgJA9DXi1lH0xgCghw8OtMB55
vVKq2TfHaih14j/qMdmi1KbJbHDZvNoTF5ujACL4=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net
(mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id
1MXp9Y-1nY70L25Uq-00Y6eW; Tue, 29 Mar 2022 21:43:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 11/27] gnu: Add tree-sitter-go.
Date: Tue, 29 Mar 2022 20:43:02 +0100
Message-Id: <20220329194318.6106-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220329194318.6106-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220329194318.6106-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:f59NKQjiaCcX0mVv+2XDkvUhdvXu0rR4ByLdJmOI3/jdyBXATPi
mNKWmXmVDV/OceLnaGz+K8FWAFCCh3Hku3CCK0kdS7oiTHNNrql+j47P0D/OnaJJUYmiOFj
lsC9cLyNzrjnsUZbcX3/DZuVAYx1pi6C/kBklQXusUzcwvx+6QDHUYfgPFGwUdpa2HsQmVG
a4wuXELkWHA1aQPLEJZeA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ISFJFNnH1Ds=:ghqlHT0Oc8CnmmttVDS90Q
BxV/76tB31+le6ILQ/LyQMcmVs8ZanmuWZ4hWIOoSz9zhVfZjGVpSIvQ+KqNSbZ0ajTEj820W
Ia6FnTxVOcGlPSq/wxs3yiu2r9uH05jBwfR8kMjoajQAqzCO/EVtbFrR7+2NfuA0kbHfICgtm
Vy2zo++u8N+I0EeMjRuWZb/D08J4+6i/ZQ/Xlj7hY4RvzRt+7W58t4ljBa2bc9lxqHccQKqLb
KRqhQKABhowPJDAaXMZw6Sy02qyZgeUs2l7dSxiaGc9/OzyjzMBjwb7jClklN3rXH2oae3Dgk
xcVG0ytSLsdwZd+HRbIAz2Hg/PVGw69BbtaQTUVLbgvAzd4m7HnbEZHl4U1j6QqFKV3N9Pnw4
wUz1Rct+SaKpV0IuUFsbv3gbrD+aEwi5WZ6v/tNdOrQWlEr/WUDe1E5JlvogJSwhRn4EhzVEW
e9XWlVBzU1G19HcRuXf3nDw+CZV1t7F1DnwThppe7fofpuilCA3jq4DKV9yhswBQOTF+JlNNJ
umMBMtKPzdzdectRQweuun4mzl1Nr34zXw2RjIrKvAv8oVNoTMsMMak1LLsRpSk6X6Pln1NGh
5NzTt+kyVepu5S8uJ5mS1re/s+7tj+tQBNqBQfNFcArwGZlkrblfgvg4XX9By/xxi91fIOzVF
c1i11W+w1XJDqGeilcZG+GZ2iJjKVxIgYDKMWf/AWHCxC4u04nhRU5teFKwdqClrWrEmwPizI
Im+2l1/NkHRijLBtmN/cssOSuED2VS2NIcaWpjqVRGb0UD3YXkr35B+mvAknpZh09N1FeHcRw
YS2qL+KeGuv5M+NMg70xRONcDiWggT3wiFPJ+Ao6j84lGNC2Wks2G2nyaEV+tZSfH5hHn1qAi
vacPOP7mChz03h4qqqkMAewPRiX7oll+y5+9/6QgKzWSHavDQqVqyaK9uxxZgBNP276sVPQbm
AF+nQWoHjyjCcOAlUYMrjTeSVNjegwzJWF4NouYKNcCVVL8NHlL1MGuKkuVFsJBHZn7BCYXNo
2c6quosFtiFqEt03ZKJU+FZ9aiA0aIn0C/KoXggsLZGxC9GRt7Pj+LSY4aVHVHkJHE3SUktV+
8E0U6D2I5FyNOs=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-go): New variable.
=2D--
gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0aafaf7c1b..585b44b9f9 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -325,3 +325,25 @@ (define-public tree-sitter-elm
(description
"This package provides an Elm grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (package
+ (name "tree-sitter-go")
+ (version "0.19.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x"))
+ (modules '((guix build utils)))
+ (snippet tree-sitter-delete-generated-files)))
+ (build-system tree-sitter-build-system)
+ (home-page "https://githu