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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--==-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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 :)
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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")
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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)
...))
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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"))
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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".
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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 :))
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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") :)
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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?
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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)))))
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.")
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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.
-- (
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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?
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.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--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
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://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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:54 2022
Received: from localhost ([127.0.0.1]:33598 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-0004vJ-9C
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:54 -0400
Received: from mout.gmx.net ([212.227.17.21]:34235)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkp-0004sB-2L
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583021;
bh=tVR2z/QTIPrmIakx0SE+xlaeVtpwbPIdgYOUcjYutB8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=GTalBKXbbe8WdhShjhYX0QlN+2xTgOJir5QeY0MS4jeOvJuDAl8HvfADqgtnw544x
dg/bqFA/lXmLsOd7SoyWxOTl/NV53kZCIT3ockEmUhQwcqqXBWi0r8dYJtOcOfJITX
BYTOjTTcbAmeeifvC4rrocabxTAyNzYvbMT3xvDU=
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
1MnakX-1oIDLE0qWL-00jazJ; Tue, 29 Mar 2022 21:43:41 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 10/27] gnu: Add tree-sitter-elm.
Date: Tue, 29 Mar 2022 20:43:01 +0100
Message-Id: <20220329194318.6106-11-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:oF+cxGroArEGsIbhCnLE+M1gyXKM5QfUWwpnkonc7wQL14aeuYK
nkwTsAfbAl/KO1rfDrRyY/hlvykPcQpKKtqsXcDi+PmW98q/7kG1LjQ8NSw5JiHvVnTmniS
DNrhQc2tRZTu4zpjH4ijMW6acoD81y0Wt5QDD9WITpL6TLzMn1Bb4iogJFCqzElovqSjNLn
TX2AGdwqzjFkG9BXb4uSA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NOLvAq5/lF4=:8F1CBoW6vKZn1iTpsBNtdo
Edlb3o4e9qdcJd2ITXJWdH4Rwvh/8ZigaM2Gevmp3/3yfO+nCOGMahvaIQaWcqsaFluPISqKl
xfMBmQBFrAGQa7f7F/NwbR4A+MKZFF44x8HtEU5UUCre+Q7wID4sSoFWltuyxbnuNqhl5S+/n
S8CcdDmBKh4mCloUJwMPFGV/wngSf3jQ8cbuPHoCT0DW5ss96FNOFmqnhd5KVH4dLbcZBF2eb
shrJG5+NZM1o2WNv8hs2HrvARTZ11HXL8fEnXLNP0C3OGLIl1mtd0cRRTowzNzrlHGp6Co3F4
FTthY31nab4HNj0A4XBaq91ALMH4Fv8JG5agpG9nzwioXaAlidLNbmpjdtMMvTZvvSDnoufg6
J5lWUqCJUU8oUsxD/duN3NxLn4n1F1wIgcB/2UYZ+IkY7xKzvyve1k0Gz0lduNNv8yucW2Fgt
wtcwm+/KRlfO9K3pKvxic5DTFEWVEa+a945ff+hjmfusyrISytzwvkV/DcOR1rpnNckQGB9rQ
zI/3P1fhpWYPyJ9PQcYLbB67oRCLf4Y3Z3IqsiBVzh3YwHRWMWyXu4W+F/2k65OPDEDPr3Mgw
hABjJekpK+TXUFU9mAfVmjUFua0299PZqEEnV9qzn2o6LyHG/ryWAV0zuGbuLSxz0ZwVfKAOx
opCZt0gnhUfJYLVb5BfHFUZMsbS7A5DkXrSGee2G8nWkE9SK2G/vgrXe+Zhisrvf2SWCSQQMF
28/mWEE0NfiQWToqrq9snCMLb/WiPNtkjrU8j5YKSTbx9HhsMAFdjiVS5poITpzbioLgbxFdc
pluwAMRsyvw6lPWQtYXZI/6Dx7RJ+x041SK/Fc5JeKQVKIkGedDjoa0gry3b2D3eup7L2eylY
Xb1tKc10umOodaPgQUmcmHTmP+lv2umCqakAso+b/SIHjcGPrhZlOyqf0Nq/i3ShKiUAfj2Xd
SPXNuiELN4nbR6xxRN7VbbMcHsBr84HYk0OwAEkeAqauJRvSE5GnqhKOuDHkBNQT5YrFQxwd5
v3bc1fJrWiKDjh9UI5mPELg5HnC4LC7edfMRt/y4IpkmM0rGkyv0sTRDzv+HquajEsIApNIxu
lZiBXCH0iX0wUA=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:54 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 1nZHkw-0004vC-24
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:54 -0400
Received: from mout.gmx.net ([212.227.17.21]:48045)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHko-0004s1-Ev
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583020;
bh=7SFyiGZ6yxuOmJWeD1l7y/pNGBcN536Q/xVf+sIdmTc=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Mgj1LqSBpInJnDfqIVDBkgHxn2vgwhvZXBuneVlfbt6TBb7NpzTWvTya6Sez+IoUH
QrnaSCsgsor0yslVVrjd4xzpT+ODffj4XCEZuIV0AbUKpy52AGYQADwljdRHZZDCZM
Db0I7k9+5V8k1zwHq3HhfRqMnJ2ZINcNBP1gGXyM=
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
1MRmjq-1nS2j82cn4-00TBEc; Tue, 29 Mar 2022 21:43:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 08/27] gnu: Add tree-sitter-c-sharp.
Date: Tue, 29 Mar 2022 20:42:59 +0100
Message-Id: <20220329194318.6106-9-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:zvCCNddL8txMQQGiJJueHUPwo5n4YWIbv5vcjgAdFodrifUbqAC
Xb0Iqwj7O+Q4ALy/GeOzZ6jf/6aaTeYGADz+73DKjfCRBe0mmiAk8rVjPkR/izfBIDhQD0S
35P1YpAq2tKgZ+e9+Z917xyoQtXsWhD3K+CRBQBhlx1RnRiitXZTPolQBLFuv7kY4A5Xq/i
sVsDckc8+W+XKOgJyxZXg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:O1pHjWu/5yQ=:g4Alko2pTiPzCWd6h5IgLk
d2QJxR2SOIPv95WJwy61VfQRiNWojsfbdJLJh3x4GKlcbt8pDPrn036HJmYS4LUQVbFP/otDg
fHylMGfpxjv/ByHr27uugZrnyLuRczufqsVMAjuNKsSXO1SnxKT+zi5WBzK0/FVUEdaRyRjr4
BribwO+QcteESTuvC8n/fYsFR69miXSUxz6H5JFZ8bb2jb0CZFPYyjQ4QltHm/lCddVS8XOAS
xwWmLmdA8o0LWKgIAOFWse6n/upQT3adIchSg7ik8TnF//AOsOq3MBT6tS7XoP5Y2MNbwZFsr
kNFM5PDyvipGdnXqt+rtf/KXHxQYO5myfTGe25YHkHGXt6n3olfixGzVP7ph232Qrd7l41gBm
4JBnDfIU5Xh9FTmWUFmw2Zyhn5XFuFxokmXpxWdb2+h8IBpzZ9hIk2dD4IglGa/2dxcfCCd3g
AuYUBqleK40WEDcgWdJN70ZkRG9B+y/o0fFLn8Vr8O5p5ftV8047BVWiOb0M8bCp9UqBgCnOx
V6xqewzr34o5w0mqgvzdheqSA5TgJCtr60XYRSe3ja1OyNfHtpk53hZiF2bMBw5rwzx4J/gM2
7g9gxf3yMIbwtOxqC9+vJM31N+9BDCui8D3U2zX8WZ2VrJuMw9InSEEw4YLahqriScwXRD8me
ehtZTH4SwLxIZsqw8KXvsMG6bjwAKE0vNaVB0Ac8U04ELJmTqqyGyWkPmZP84AQjN9u4TszLZ
ptAHfAAJLP/nSthOGbOUjLj8NoV1AQpS0qPdacE7p1I0Gg6tVrXIL8Hans48T3dYlRCslGNqf
51wWxN/pGoNr28t5q3rMDCwXj4Drj2sdTQQRDiXnqvEXvTau78+cAqtJUdYrQlUoXBjn6DAAT
C39SiQE760xZfK7NOUXRmQTgBwmqEugFdK8yWAM7hbAncuOs6JySqZB/EBgF/A0p6KLt1rafB
OnzIDD8K/ZGUJRJEjYM4iCFxosePWV1LpK9P/XFeTVH3Z8gP7OVHDokk+KgocYnxoKatAZNtM
Z4l5LE8tcAshC7kVaoO+ZjEPaEY9RSF90xY24anAvHGfdzvm4lYQZkGUPe3jQ/CIlpF/wEM5M
44m4U74WjQ1nlg=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:54 2022
Received: from localhost ([127.0.0.1]:33594 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkv-0004v4-RM
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:54 -0400
Received: from mout.gmx.net ([212.227.17.20]:50493)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHko-0004s0-6Q
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583020;
bh=HWXIPj56V+7il1EBAe9oJ5XFm0/LzzLgV300VPNRKz8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZQ/dt9ethWrklsRy/ts9rDXAzUXstW1kjONjdk0pG2/K5P8RYuBlXl1Jo9f5nwNBo
VdVL4o+mAQesgx4WQbs5+sSLeO6v3xWjVm+7Y8ry8qLiTQuKvIwUxhRh8MeWPO9TPp
rNfrnEWIF0ihj2a/aRN/pGYzeedB1kIZiROt1X0o=
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
1N8GQy-1o48RI1NNA-0148Y8; Tue, 29 Mar 2022 21:43:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 07/27] gnu: Add tree-sitter-css.
Date: Tue, 29 Mar 2022 20:42:58 +0100
Message-Id: <20220329194318.6106-8-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:Q/4Fu+04nmbRJnDOFVbsoFoTRrE69hasQ3V8rQrzjfhH/u2FHME
7erP8EWMQ+lz5EMGYPgKPZ++NlDsoowCTSljhmO6aO4o8qvI/Yv/E1OHqzpJAFXgnXmvuew
arsbX2FSPRuQq76s7cTbywV12YoeDnPuEbESwcBaPpxComaMsckWK9ziX/HXxc7omBwEb+0
l2uMcGVYbhSruPF6Bpq7w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:EjGgdU0S3nw=:WCFxB93le7IWOHmFd+SCua
5hphOt3iI6qOOglkh45I991NygI+FN1wmwSZWEC+iBptCr0nikI+x4A+V9cPbU2qtBEMvW4D2
9TcZUijqAsRGbJIvjeoBOyPb8uBJhV25ZDD8I2dS4C21wJyP8FXqlKRg+IHEYzi8tpqndYx4d
nIZ9QJQt6k2wKUw0EpIzLRZTwd77O4fJJptA6bNuC6uG0WjY3+g2n20I4KAuxQdXqur7/8Cq3
VWkPO9hDqPFjZL/Gu+eTIJOPkOhQUR5C+RmMF2YbT57IiWG7kXFdSu78xe+cHO5GJRHteTpmZ
OZ31Zo8vsqxfmMNxMzNwMkCHrzGKHGFyeOhIYArvpHEr7wdPuRT+uVPbehajDJINZ3RivyGC/
yTWvYpTucFGu/r592AyqqPJL4W6pA4u6MRkr6FL4VVJGSnakfEMGNFd2LHdfsb46BtPY/aXgv
xgvYbuU9s7UG/AI3/aDkYhZR1mhg6ARpLE+BABM8nFprJQpIUAEdCEkR+xgP+phvo3vrEUnwI
EUdglGC2DtBL2vatU35hZlb18GXjx+JuuLuiDwJ8N9FR1dgt3/pF9XZDdFe1y6Tk/hxGoIAgb
epvqeTHuONNy8oWCyNGvtC2UkDBDtdwPjU7vV3IsQxtKM5FEMYqf6wtsqp6dSVCEaW9kCiUN1
KOsZ9FsarNQ+jCfxZGpYj6Y+4I0C2F9AwTctxMI/i0vWzrWFqCqNSW/Xp26NyBttomGDfJ6KK
DziKt6T7sIEaYgwvNx8GGh4oTJW0VZ+O7233ZO37MBxA5apOjRdSoL/vV/5CRsldJvmc16WCt
dba4raib/mnrGZU/TNKMwJCT2uDAScV83IMQ+nki21UuJe9vBzdxKyXZMMwXwg4BAwTDFWrMr
1PwxDauJV9ko/LoAvf2Dg9VKPR1SurXEfZkpClGbWxeR/nv8nIMW7C2/NvmflwqyiyoRhCzcI
iXBZeY86EaPXErpjelfFbgGFlsl3hHKIgksUdG0NQ9xst545zSebJUbi9XO2X5C5EUh8RyNhH
oaSgxEXlNTmpVjGuK2sCQdkXQZ4uZqOOoq21WF/HJjwftYM8cxKmjuh63I1OAwHP5sV4XRlGb
bRVDylNg0YZsYU=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:53 2022
Received: from localhost ([127.0.0.1]:33592 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkv-0004ux-KH
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:53 -0400
Received: from mout.gmx.net ([212.227.17.21]:55267)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkn-0004rz-RC
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583020;
bh=0Crv8dR+v/FvAqFqoIl13i3HVjen5zejCWd9AdUQeeY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=hZLOYXCv6HDK45JCOFvWbCyx2mUG6kL/Pn74pPVUJ5qDDKSfFA4HDmzE2WEx/jPna
udMB2znimJKMBkxkJQ3pBfIc/IdICCWbd7AMB5qOuemcTTafbteiO7l9EAD6zMvxec
+UTCXjDwwy6o5RtZt/FAdHgH6cg5dEfcdYkZzKn0=
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-1oNSo20A2M-00pMp4; Tue, 29 Mar 2022 21:43:40 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 06/27] gnu: Add tree-sitter-bash.
Date: Tue, 29 Mar 2022 20:42:57 +0100
Message-Id: <20220329194318.6106-7-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:lT+cK7CZ/uX+8F0DqWZA66vm5gPKtaswOxjIaMAqFQhR9gJjbS8
chntgU3u3VO+hNO/mx3za4Y9iRFhCe2SI4RFPExgGPYaLOueVPIictXTzuOlBalefAFqvDl
/xK+LOBWNpB836XGN+Ele6+BM0tHgMoZXvA/cBg94fhg2PPUsDb/IPx/6s6QwW8BN86GghN
Fk0Phd1tUOLMO19PE7mdg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:eynGUOkTDoE=:kmGahQs8eTZAQI2Q/qhkZq
kR/qsKKhvEqRUICpEdLF447LRvJ4R0Xb2SGIl0K19Ih2IwJ0f2E+y+WTAH4F0YHo6cLdnTNqp
KTlroUzAFzB30pYnErSCeJ2/V4kf4fNJX8/NGMomFcgNvGhjGXfvNU5Zx9tk1A5KNGwZDC5GQ
NKz/S5EpGDpJQhJZA7aA//qkfGwCKszwhpiQeLeQ3UHnQNrxjpp9u1VRwVyxuAARa3mdUv6/i
xa3AFF2r0EZqOHbMHvQtNSmMnXYYfV6AFLLSkcEZP7rDpmWcd8ZMV9sc4dUWugCBcpZXSY9WF
Eyl9MYOIM/5JNFN/aGkQTtFA0YOyroJQRJVLGlkMvlCD7sm3G7gZp3mnTLifn/qpztRLI/Quk
CFwNL2KNmMhiDv/WGY0iYMwUPOAaMDV0W0agDv3mAz9OPqZycB6YpmELfaCSwdjvonf+Y5hXB
mv1bapOkEgeFCPmXK+YR20NKOcHo3EMAQ7BoomQdf/vBrjMdjoV4VbOJFXNXKl4ROdSgifA0B
fNiUDxzw82BCcCMPElm8bd5vPrcEv5JXmu3srEKvzC8tu0M8vvIITgGsksGddjPgvda55NIQ3
V9Yowi/vhDzYoBx7bYSlZ5+ZUG0QqCfyahl5sF+P/Q1CJ66JfegM7TNLTIQOruuMiH2JcJiwJ
Xe3Nl4COhwAMid2alaLSJhR9//F1LvOGvnhnqhr3j9mjMP1rvzj7rDVsKOKZyFsEPqwn+RuwN
WlGbN+Gmryrt0T4HcdjTqa5iBiqd4kFy6tuMJdUtFOVl+pwL5Oxkz93iEuW/ehcyU4xO96bto
ketqt5Db1lGyEIISnuTqCrf+/Y4CWribZHYb5LAdKnG/lCzRKmKcC3+t35ulZ3B6raSL/SKiZ
9TjYA4okCsPWsJAd9tAt4apKeGh3Y8xtBg5JMWYkndaeY1UVpA0Z+JvUeyFZaPK5uUkD3nrZw
PdYxMsuEatMA8yhoAikn6BcD5RWxP5XCJO/VFcGtSpVNZB1st30QZpI0rbzcaFTQj09KYoAFN
E74OVz5A5sqrpRwVQJQ3cgK17J1ps7q83314uxPquGa941MglPh5fbPZ7ti950085GfCsaEmt
KYHJz8F6zlY/yU=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:53 2022
Received: from localhost ([127.0.0.1]:33590 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkv-0004uq-CB
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:53 -0400
Received: from mout.gmx.net ([212.227.17.22]:56403)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkn-0004rs-HI
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583020;
bh=cIWJuFOCK/GIqDLMllRO5GniIQL036lTDonpde6X+5A=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=G7sXL7Aab/iCghRev4FMv3J7tkTazWtdMHOr88UlRSiT1IuKT5VSPC033Svkl4Ac3
T06+vI78uUCPQmmjZenpSHzea8k+FaRk3KLxv0wRcPVRn2Er7yfw/XiiB38qXoR43R
xrNcbVkskc/tN5GOohvOCl5TCrg6tchi1ItbFTkw=
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
1MfYPY-1oFFLP3AEa-00g3AK; Tue, 29 Mar 2022 21:43:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 05/27] gnu: Add tree-sitter-cpp.
Date: Tue, 29 Mar 2022 20:42:56 +0100
Message-Id: <20220329194318.6106-6-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:qN9GpsaLrT+mNB9wpeefSvD1RE89FnklQWch0iPRY4l3rTO2LB8
ygoME0DJY1PP2aLGqnByLiVCkMaSqnu0CTR6QGwltJGa6Vyv1tPo0o2j9JGUThlI2qxUBZt
J+i5nOj80E9sXhd892ltIg7eJ4ztldbGAdQEsXDhM0mjaW9W/VGwgV+ayD3UG3Trvbgoex0
Il7aMNRd3EhR8pLetfqCQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:oq4btZTxKm4=:Lv8VPguu2t27iKJSAjjC+N
A/fJntDI3LmlRD2aFXs02AkQE8oCpqcDOQ1jDP8pseS59MKxWANMBKp6LaMT74mGW52ErSidl
kUjS/UBEJP7jWTb81xsG/PiWbFSHtgtTdhniMrjN4hXdaKfi3ubNrHDOioTOvU7ffdYH0l2PI
KXKKCqnaoz9rL7Jh5iWYtwflLw1uEcSq+J/z+tRsJQj4aNSmGfjGlqB51dRBznH38OjZP0bK3
63NXcCxtDIEzKJHcVU+P1bIH6htMFZ6xmnovL4uzAKT+ZVnBDVZMY+ai9xqSdbcoelOA6Smos
5I35me9D5Rs38A5NCUiLDY5E2V59cyvQbsHemnswnNxy+bJuzPOBU8Pr2vn+M6IRmCqcJkNDS
NnA5bJPMs00VXk9Z+Q0rklvYNQydYj0JFpkg/MM5hU9n8E4SOH2M1V/0t6F+gW434Jkft3coQ
8n5JQuUngGPbYI7t+aIg9UD0fsTDsNOrEmlkBuAYzCjq7vFgwGkMMI646xSklAnX8ESUuueaH
pRkHWNiMlj1sfQz6112PE3mZku6KCeBl8BnRExTYiYk2Bijq/XLmWulS9r6S6lKFhxIxW9rXC
nfTrMhDpkE1PwmSpxx3+P/DjgiC3lX0St1/DyENXE49Fl5e3iv/D2i+uU29Gta/Cee/5RXPLY
z67h9plK/YmaCUeURkvKdFoMUKbpl7jXVt+kIbbqBj5nNRbsQ0PKTyVLfwgDAR7nzjkY84zmb
/rRWr5hYZOgZoelVk17pJWmYS3RZCE0leS+d2iXOWT6kqmGJ7/jpF4pIDFzDEFSPpOIKCYyI6
pAfwNpZlV8iluTydcl0/KiCs24+t3tncFDpOwlL5C/Wyb729u5rjJmoKRLTVq4CwZKy7YK6LQ
LB8dfKvfd/f3MkTBeAuoYflpkV9HtgUrp+ZhOCgpGyxEa0ngWNe81J/G+7L1oID12djBfY+h6
p2K7LswI/Eev+VT58j+DFeT3kM3OQ2OPIz03Ro/bLUeG0qengDEx1C04NEAr282SKrin099/E
e30bxbIT+eEI9uhaZsdH4GH/Xifru7eumQrdKLoMVKxVviLF02RiOmHHwNTr2MLfVJCPJMOh8
7ZKZapTxzKwGJg=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:53 2022
Received: from localhost ([127.0.0.1]:33588 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkv-0004uj-2j
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:53 -0400
Received: from mout.gmx.net ([212.227.17.22]:60505)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkn-0004rq-9T
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583019;
bh=T9/TXF6570OCr1ac9Xaul28LZqHM00cwCwib3UGk0xs=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=WCwXXJkMxN1xkxTXWg0DrMOD+tWimvkboS5ygk2+4tUxFxVzm4gpw4I3QS2ddQNib
hWVoI96DYk8Rp9sDYykil/70O4ptOU0cAQX+kAQr/q91FD6gka5TD1jqxiw6W5T4iq
/r0VMMp13EJnOjsxKePsLrHqGzyja0HE9e5v9vW0=
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
1MYeMt-1nTyXY1z6J-00Vd95; Tue, 29 Mar 2022 21:43:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 04/27] gnu: Add tree-sitter-c.
Date: Tue, 29 Mar 2022 20:42:55 +0100
Message-Id: <20220329194318.6106-5-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:Cf/OqxZEM+YL77JaiXVv5VERHfc6eIbZMiTLFIuS0s+yjY9Rc1B
/SAW541Yp2UQC5yKK6MKplhPNMzeFXFeRvZu6+PkO8Iauy3kRqN6HLaMUEcako9DX0ly/b6
ei0GFtAMJig2uXULuVsaGN+tLxXSn0ls0VRZuB3LN36aHzDT/VJk0ce8/6KFScxszVM8z5y
j2Y4W6UYuNE4FNuK9KbwQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:I/YrQjXrSu0=:g89blG1YBPgqduikIrSuRb
A6yishshTYfZrxjTuIIsLeWNqqQ9P66JffwO9pmhEq2LINu0BinvbHZN/ens5Ltdb37at9ZMP
21LNg+Qbc/w0fh0mCn3AWB7V8TDPpbQlhjNRJq/zABDcd0j2i8pm08AGwBUEqarj5v2DTWSMK
whWghbOJEYvJjp+RMqAzvdcbEqAQYG5TbhupT4lPHYL+GmQ0v0nbBllhUeVKF9o00XRdYviAY
tVIhEYRWbpAzvLz5uAcvZYaDoRa5GSiGRQagfpE9IoQr4/xsdEe4SEH68ZarlsisZYP2Epq5q
acBe17ZMd+TcdLr9SMJO0V2UjNC/KEFwrwO8ZulTTdJc6KtJwytXftiEy8jJf3mUkcSrP7Dno
GCJ5vrmUzzBCpBKrVVENHXw6CACGObIpGTn6OgTfBYKgKMLF9ucOAvZfWNVHrd+bXHrHGCLOs
7cY4WvhNsKgD62brgiAdsaaZRpmmKdXdEWG4cyQp4MOdUla02CiEBrF5C1ZFWVVDbcANXOTYj
O2dLi320jgTth1SzaBzzMAXjkVnBJBOjUPQw5/cW1yJqzSaX7+peutRNHK+ulAK81TkLcxhI4
/43ajr543jCM6B++OOBn3nb1+0cSiV3Zu46l2HpyF95OcRAhWtCzzRSjUgkiyaZqub2lI5/MP
SRRKbpgnPHlLf+upq9JTZPSWnNX08obTpPwP0mvAfae5WWEdVjSWM+jBVUc81Z78a5riGKX/A
Htkq8hBq2H0tzVMGREpST1USi3yC4TlfzMEb0GdIxf25PY7EzePNDN6rvyS8Dk/QBglxVcHg0
gKE+NIZJ2iCL6jZ3Mw3ezvY8t/khzA29K2sE5+ZL4uwiUAsxFrPc69TJbXv0p5Vz5Af9wjbd3
zJcgg1szNehZeZjhphc17z5TIjfK62pE/fwlg+Falu95C9llh7Bb8EFs2YlkUL6Tcd0fxJLnY
ce5W2I7VPTl/QOmjlwSRQa95xBRvSl2JA597OfztGgYGZ/9QNnLB5lwpawzTCMeBwJhefF82K
9Zhx3gnxhtzghLZ/ClhHPG64WCO+6i4WsrbQTw9JHdFsDpqqUn2RzheOuKZYHXBEouv3IMMim
Zj5CbmPnLxJ58U=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:53 2022
Received: from localhost ([127.0.0.1]:33586 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHku-0004ub-KJ
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:53 -0400
Received: from mout.gmx.net ([212.227.17.21]:43943)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkn-0004rp-4T
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583019;
bh=g6PGgOo/lsbJbHtqrKzLDpI0sQTjUr+6f5XVeUe6Ung=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=PsBi3gO4TZFSZrZVY0d/27ciHhO3jpn9RlxRDmTtnFbv3/fBw2lt/e6l2wns729Lt
9j69LvQVzvYm3GiwM5ztJbSyV0kZ0mGDDvKDljInS1zUQv/ec6WgHGLJc9m1jtEFKj
W5+DSypstGUuQMwY4KgopsXGuKEHCJv7OylO7DXU=
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
1MgNct-1oFWj73h4J-00hyRP; Tue, 29 Mar 2022 21:43:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 02/27] gnu: Add tree-sitter-cli.
Date: Tue, 29 Mar 2022 20:42:53 +0100
Message-Id: <20220329194318.6106-3-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:tJIWGRytHi6Abduv2CjOTeHxIzpMcmnSTevyQVQq+llHfelOzJU
GzmG3CFdlxydW6p7gmwCG7sd2SIBYaIEjLzzXrRmzVu2to+/NuExUl8H/6EQ+5gLz9cC/KK
uANPASQnaQFUJIS4Y64oTgGqTAbIIILKu/hGJlf6XkyHuCr4NtNGJEGooUDf1uJIMTepRuZ
cqY9ou439QCpCuoaiLHTA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:gpqjNvk3NgM=:EqtB4akX/qPPxdz0Zha2gT
quPLcK7XcSv3aMP89abmiOdXkj3AkjppR0IoyiDRftEeQ5Smc9YojgPSWtEW4QjCHEsKLgIEB
YhEX7S1meylVqXwi+UUfQFfLf8+Kzjc0luXkytT+5bPvpgrHXsK2l54vNuyEkzs+OxBMJle+z
i1k2WTomStvs2g8MRNCDabVr4kWakAyfAreNnacbtELq6fhKWn/b7K863gzSIE9Zk6Z0VqvBq
rUj4ebBwCoAgjAufumvxluPBK/clwMbSHCFSf+6I75N3N4dxCI8Z8RWopBk3sOs8y4VRmtSCS
tB6H2diyNkeXThg6lv+vXSBrRfzK375mrwr1uQtCh8hhgeIK1+SLXMmn8SlojG3cJHOnK/PvE
NQDjPA7YoKQxY6G+R6gfFFLMywlh5RXekV6LkUtaB/FBsn43nayjYYRD+0V7WW501qYHBT97D
al+XioUiW4yOyjFJiuPZzX44KwQE97WOdcf+wjaFLzcaJvZgLBZF6Q2WjBFyaeCVIriz3X15U
RkzePW+HkAn/8spsDiQ1lk4evrlxBJ8amriN4AIXDxTxeAA4u9Sa/IHJu1s4ZtcllFpuo1SWk
lbNs5vYXRBAF+UWQMBD9PqhX9yJ+xJAX2mr/4yWuLy0F2PTggrLOWLXqMOZokyI7Zj6MfgEm5
ifPOeOdR2NedczQTab4RXyeIkFP1KNSlEjIALspwcg2hG2vEa0a6M5XhY8rQzmp+Htpsw5hUV
24vDeelHVfSM8MpTDIFMXAnHqepAM/6fdJkr1k+gtQ77xqPrj/25POrRkzdhdqSEeqDMVXNPf
2e7ijKrLwrBAbyOrTjVXCrrvgCgQzcIWaVKt5QhBmkIYzCdQy++8GcouAzE5GSiGLlH9gjqMR
zw73LWASW3C4AnIeXLm08ao3cQz5oEijp71WIH7YMYXFClvuNa9PaMwuAzsiONip9aDQRakTQ
Vg2+N1S0y+efnEkjCiHbmjJJUzTbPC8EaWxs+KF4/ovXYejunja7wQlBjjItn78GtiD7UWV6d
3phUZ/pWjRnxZ+9rxyYHca6klTfAv7LXza9riK1LXrbldcDHO3M2DiDF9BJa1I2NzRarLS3qA
3pfcCSlLq/T10o=
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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:50 2022
Received: from localhost ([127.0.0.1]:33567 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHko-0004sp-Kq
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:50 -0400
Received: from mout.gmx.net ([212.227.17.20]:60219)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkm-0004ro-Pr
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583018;
bh=1uN7yqkLMJFSJMce8g4LmU+W/9vHzsYy5Cqr3mTmdoo=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=e0pRO3BGM/it6WjEtOVHsgUIma1GT0QanKdomkrDy9ZVmJI7KpcVtCfypMO92ed1e
tL64Rt36p98VhGoB6akKk7dQfT7+n2WLNyrZebqqXrKUAZ89+ZHf4buSiPFYdBEAeZ
DW3Bz1XtnrSpAt9v/O0On05edVV5s2AYv9t1UZXU=
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-1nJ0BV2Tet-00KgvP; Tue, 29 Mar 2022 21:43:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 01/27] gnu: tree-sitter: Move to its own module.
Date: Tue, 29 Mar 2022 20:42:52 +0100
Message-Id: <20220329194318.6106-2-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-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Wq7OxtBNypThL7aFJcyBghZvD/JOv3lNqu3KNdUc8YFZ1sSpdfs
olDezGEsenX+AyEGYNtsSQNb1eCp+WMhsX9QhQAbCocao0Bj0wKD42OmhW/yLH3otMhVmH2
Ik0M56rg6TVsbdUCKeVcJ1Lm2L1LTVGHzRPkUKCnds9RfbN01koX+oXC8MScK7pqrFnOajt
QFLFw4UnPuB5Ca8hmMB/w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:C28bLHJpfYY=:uvB+wsf6OMHOCxfwIttSQl
U0qfL8P8SH5oLBSFriev3m2ANRG7580X0U8iWJ9KRACPazpzRUqZad3e7V0Wl/M05HYJhArZ5
kvh72UYvpT3wdGORzdFc7tTQt9oYiB/01lpi6zTja9QcYPsn7VEzDlAFNyU857xqOpNceNTaB
P4HJyi6hnO1g3RzRRPK+YmrFBXE2VX6ULcJKhO+lUYsxkCzxWk+Wr3MJk2MYH5V1HJEHB5dh1
v3gNyqIa/iAb8bARmlUFhhM2SZnVfdE+JFFC6fOmlHvzhDwmXXgBZz1dgVFQyMQ5/zydfQ5/k
yH9zN3nOwxwSyyTSiEJ+PkYT0dT3qb04/hD08q+hKCH/Dlq/tkNyf4MkpLGDK5BINBJAkrWsJ
9uWuXDarCDyZJanroBBa3TAEiIbA6jfSHdOyaVu1acmKE/vs2v5j66fmKfM9tiq5ew9Kyb1gE
98242Gpbw5E+kgcQZS93TmE8oniiAo7dmh0bNyTmb7xwmCIfyKMEB/2qeOHm4+Z2HVfDX4IYM
MZXITlqCZVDLZOEJXUerBX+jKO7LAgXKtVx0oP+5yTsgq43Cv2tH0XYrd2sNM0MkWb1X/Iuh6
lWBWeJ6V6UmCLeAg7/TtmKkmPPFQnX+jR3JJJDVBD5ib7eTMw9BeGz5VYHCde5ag0qbsMLR1n
mdivp1MlonHPiIu/Hz1pFFI0430GFHxNxY/iat8Xm5U9iDv710NLWgRgIYkwDzcPZJyjZQDL2
IO3utJzVqP09yurkRKj7ZafxyxBqbOjbxuMIctoSyUxHBvx7q4gDVEhhvTQITeoZCoTmcwNJs
Rn+SoUXtW1jfIjc0VBHIfOGdDKl9AyHlfwfyR+8ewA0Gkfkf4TTs++Z44UCY1sxMNU6zMWiD5
xOx5SJRY6VEBWZ7T3N7tuL9zKZ/+e/QPG1zBIQHM4XASXmmbhFNW6C4wmI/YBsun27QErNUal
y5gP0GABceWji0q+Um+an+SeLrvCsyAKcpQ6sRPBMn1Tr6GNgWX11kQv7o+Kgw4/1Hm7QndOI
4+YWfuhDpmLLmbI6hneO5FoCosISwi+z0xyQXhiP3LZyeBtjRvWD9N8XwycwLpSj0yReFVT3D
d1zQ0mgQq98YC4=
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 a704161abc..03972441e6 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -587,6 +587,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 bc5e36c6f2..f2fc39586e 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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 29 15:43:41 2022
Received: from localhost ([127.0.0.1]:33558 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nZHkj-0004s2-Az
for submit <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:41 -0400
Received: from mout.gmx.net ([212.227.17.22]:48835)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nZHkh-0004rh-Cy
for 49946 <at> debbugs.gnu.org; Tue, 29 Mar 2022 15:43:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1648583013;
bh=aPQx28B/hWpUGp3CXbMWuGjsJ0K6mkKAzj1bI74EHrw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=E+NMBbgfBb7D4fowrMO7Zf0WDKE1wRBkNZ85zfeW9l/fxdzn9y8gImCfyBQzqUKr0
FqNU2aOSso+FhoAcKEpXGJsFspPcVoIkrzEVsDHNiLHbV5vcMkAX36Koryq+ee60KS
dLL1zg+ligENNXDw/5LwMxD3br6aKjQ4mAct35xs=
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
1M3lYB-1nYSfe0Ldz-000x79; Tue, 29 Mar 2022 21:43:33 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v5 00/27] gnu: Add tree-sitter for emacs.
Date: Tue, 29 Mar 2022 20:42:51 +0100
Message-Id: <20220329194318.6106-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <877d9s2qa9.fsf@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Cll45YghO9blUYPXluYP7whyyp6G+aR62ypoJ9sAQSVuPAdw3kc
ig7XoyMlz5e+FzgTsBKfnFZJiYWobDEA2kJ5FwOwCJdKhZrGvMIPfjdEr+CZ5u2f5KrA5IH
85EgSUbbXJGi3ogJM1AZsyAXLAL9vntsTkrRHmHfEeISFFatFoZWmIYyV1EqHrxLpwvpE8h
9T7DPfAkJCkq1lihG+3HQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Mv3/nkHPKfU=:ctvUy5d7AJ88vvcF3/5uEs
Qb3iwlEXeX/BqWndYmFU7s6g0LqXPuBfex7IDxBmiYuAT2x/2DNxj03+l2eduY6hhKIiJBWzP
kZnyGPKQqOS3fFLX5H8cGATUDzE7xaFNO5RFaf19fOvfAGyf3Zyj/pcjlORTdMllhdUxlgZTR
FqVk2sh4pjGeIkspD5IOoQj8N/iWfdPYCUbI5wm0LZEmjrRvOsIdoq2feXxClTodLbmXLsKVc
ZPfczqv8GGZMbkFwalKWvE0W92z/tWdgU0LZVYuLdeR0pkN2Ev1QFwmnFPkMOq0OSog0YIXF/
jLbP0HYY0yG39pKr2j7+XBjyC1enf5u33QmmWR+rFHMb+2QXglaow+kVQPWLy+d++l8R1TAm6
AmMCb1P/NQwf6Pa9xAWQMFwfEVW1sktaE/aRIaaDF4S8MjaTj3YtDjKypy2sPOcwNku9WFPeO
8UZn7qXOiAWX6PVj1n47WosJbIa9jW2QE6KDRsww24cB9uPvg0HKJh9yM3bAVpomziIbxeEhj
tbf//mHSV/eWjSck02oDcsvtEvz99w3x2fap1M01hMQsyFx2iTv2ft9hwxSVVQTkQtRvWjH2r
U0Ve8A2uaZ/IntCKR1RrEsLqcRGbHq1hkifFRHVEJnzUrtL/JYnutFQxbtXoe9kxpp/cpgy/K
C8Lm+z2w4fe1Ml4oZK92nxQY6InhZzrTwuCA2JFOV7w5Zf6v1iZihSpaw0QAMqryW9VU3Erhl
fyndsXkmcz+eYUUbDSih0NnFaYneL3rNmvcbfwyBXVkM+v4+RvZ9XXDB33BytGZEoEE8s5sHB
cnGoFO7qtr+KfqSg5vE6ssEv3dojFeHNPeI9zA15aS9cKK6ISZSh7KfhofUg5fi97Yz9LWXT5
HVH1tuqWBoXXMGPtyDuDnBeha3ztALhKTIDZE1CdsTVV7ugq/p0DEREyq21OlZ1OUPbi9NM64
2KV1clKj0fjXInD3D4Bs0sf8JUzJ4nTI2jmOhHB/7ZP7KC3hzo+HM/gLzfay6quAGK1FHq1+a
3XmKrtVOhrfkSrJRMxMLQQjy8aT7t41OlZedkwKJcMX9Ic+xPNLf/cUS6D5ySAtnHbeVf5fjE
C0ht0r4q7QFWSg=
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!
Here's v5 of my tree-sitter series for emacs, highlights:
* New tree-sitter build-system for building grammars, based on the node
build-system.
* Rebased on top of master, moving the new tree-sitter package in a new
module.
* Dynamically link to libtree-sitter.so from rust packages instead of
bundling it.
I think it's in a pretty good shape now, WDYT?
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 | 932 ++++++++++++++++++
gnu/packages/vim.scm | 1 +
guix/build-system/tree-sitter.scm | 190 ++++
guix/build/tree-sitter-build-system.scm | 153 +++
9 files changed, 1398 insertions(+), 53 deletions(-)
create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fi=
x.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-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Mar 2022 15:34:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 10 10:34:25 2022
Received: from localhost ([127.0.0.1]:35270 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nSKo5-0006iy-41
for submit <at> debbugs.gnu.org; Thu, 10 Mar 2022 10:34:25 -0500
Received: from michel.telenet-ops.be ([195.130.137.88]:59752)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nSKo2-0006im-1e
for 49946 <at> debbugs.gnu.org; Thu, 10 Mar 2022 10:34:23 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by michel.telenet-ops.be with bizsmtp
id 4faK2700c4UW6Th06faLZc; Thu, 10 Mar 2022 16:34:20 +0100
Message-ID: <4849eb7dd3faa87d81e4bfbdff88ab6496d9be9d.camel@HIDDEN>
Subject: Re: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs
(and neovim as well?).
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Thu, 10 Mar 2022 16:34:14 +0100
In-Reply-To: <87fsnpkjgg.fsf@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN>
<87sfrrnpme.fsf@HIDDEN>
<24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN>
<87zglykpmf.fsf@HIDDEN>
<a1c721ae86cac9bd0e9a9f2ef02e75ac75253d17.camel@HIDDEN>
<87fsnpkjgg.fsf@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-1ybn/Kn7uEr97Vu/JoOv"
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=1646926460; bh=1/bU8oBKBYGRAVczJrVb8SEpuzP4pSW7Q5IYjEi8UYw=;
h=Subject:From:To:Cc:Date:In-Reply-To:References;
b=eY6N1TD7B/q61uEDjBEYiifZDKYe2ymBNbAa17WaydARbPZrH5qR21jtnLSqBXDmY
hETlMAqKX9LNG37rKL8i41jk6oNFtXCA/V0aI8oAW4ksNyv0fqRgkn+pk86TxqvxpH
USW38WD72hWkH8+So5kDAokupTAgUhmUa3rRFmIf7fJGGi6vvDaI/MSKLj4/KaWWWp
A1Off9X9l+kSczhfBZlpZgMqBOdpkOjFTu9ssDDGW9R+PIjjQ+kz8oesuGe3KzalDx
01tTuAEcegCACnZ/y+fV5uW+zlQBCrNVMeoHma4ANte0RpuCbRkg9sZyrD3E/ztqVp
Yncz9gskrJtvQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: 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 (-)
--=-1ybn/Kn7uEr97Vu/JoOv
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op do 10-03-2022 om 13:19 [+0000]:
> I'll see what can be done, sadly so far I couldn't find a way to do
> the right thing automatically for ocaml and typescript.=C2=A0 These are
> packages that provide two grammars, and I didn't see a way to
> "discover" that there are multiple languages supported.=C2=A0 [...] maybe
> by passing new #:keyword parameters.
>=20
> Another idea could be to call back into the build-system phase, for
> example something like:
>=20
> --8<---------------cut here---------------start------------->8---
> (replace 'build
> =C2=A0 (lambda _
> =C2=A0=C2=A0=C2=A0 (for-each (lambda (dir)
> =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 (with-directory-excursion dir
> =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 ((assoc-ref tree-sitter:%standard-phases 'bu=
ild))))
> =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 '("ocaml" "interface"))))
I would go for a keyword argument (#:languages 'auto by default,
or an explicit list like #:languages '("ocaml" "interface") for when
autodetection does not work), since it seems more declarative and
conciser than overriding the build phase.
Greetings,
Maxime.
--=-1ybn/Kn7uEr97Vu/JoOv
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+4iGRcl7gUCYioadhccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mDAAP9MWRpS6Ig0yLS+y0G4NqNnE0CK
s5x8jz0SOK96UVk5DAEAqWt00a3XDP7YFRaXiPeocZNjVsWMeMSqoJbeDMLlJw4=
=ywGA
-----END PGP SIGNATURE-----
--=-1ybn/Kn7uEr97Vu/JoOv--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Mar 2022 13:47:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 10 08:47:56 2022
Received: from localhost ([127.0.0.1]:33586 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nSJ92-0003Q2-F2
for submit <at> debbugs.gnu.org; Thu, 10 Mar 2022 08:47:56 -0500
Received: from mout.gmx.net ([212.227.15.19]:35835)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nSJ90-0003PN-In
for 49946 <at> debbugs.gnu.org; Thu, 10 Mar 2022 08:47:55 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1646920067;
bh=y+NeC/h3PGrfCDfSmVwO60bAhrByP0oapAV09iRI2Eo=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=YeCy8XIIM+JF80Dx277r96FBlRG4LXEwszcN4Te2wBT5yNKak1pplX9/XLBWL15fH
s2wvbybDQBeRzQJa7P8VQf4b0Ur9/piG16GLuGodV6OYKlCLwBtAVCwMDxEol17Hbv
DfoWmCWgbmPy0+gXS/7fUmD+AtiY2/t23OW7tWW0=
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 1Ml6qM-1nrn4h0T9A-00lRpk; Thu, 10
Mar 2022 14:47:47 +0100
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN>
<87sfrrnpme.fsf@HIDDEN>
<24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN>
<87zglykpmf.fsf@HIDDEN>
<a1c721ae86cac9bd0e9a9f2ef02e75ac75253d17.camel@HIDDEN>
User-agent: mu4e 1.6.10; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs
(and neovim as well?).
Date: Thu, 10 Mar 2022 13:19:34 +0000
In-reply-to: <a1c721ae86cac9bd0e9a9f2ef02e75ac75253d17.camel@HIDDEN>
Message-ID: <87fsnpkjgg.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:7ZvbScERjRvM7EjFIQJx4FabrpX6qTwYT5PwtEp+qulLqjdH3e7
qTvqgqs6wnnxQa2lQSTmZn4ZZ7vcw8irmUkD6hB2a+AmAJISWhBGG1++pCC5btHGJkjCKqR
UB66BcchjmhCLJ2aJfb5CEvPkOmBarxunMwvOrybggFTLoEtvVQnBZ6g2uYf/P26DTpEd/Y
GOs09Xvpru0oAeTxauySw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jtq2Vs+MA9U=:arZyxUV/PXwJ1AvSuZMP4r
bRTgplKNgI8SptGwwh3bxzuUu8KdRUVA2IouT3SKXOEjOJUPSm7a1BU+RTTOniIm17Wa81llQ
crvVvZk3a2ICdOj3zwt3evWjs8z16tEIAe73rYsqpINPLIiuwj81Rk50kGqTILO6r8hXC1hiw
3BjK7/FRBj+Url/IdMPmTnsLr4nR3EAy1Ejnhj8tPUEteU8AakL8MNwrSoDkyjRyfthARf6Og
+LZW3voHHO+XXRALpkw86o7YYyaHQtphePIsJGYoaWJhsT7YG47NAevrzpaF5Ifsh9mqIIaLN
mGYhszr2OXmYUzHkbQ0HTNgVPRh+uKmM01GxZHLzhLslP9lSJsob0DiIk/dzT+LiQkmJschxt
DNXTrXI5E8t7jbbv9FxBUkaYTE9lDkFvsvy5Cq+uz8KV+TxKF20tgFe7jyVvMAIaqZ7ZH70TU
RO91x78fPsmegkpcVn/jjiQn/WwMtu7bOCijfEgiCB0/MN9i2nMHiiRhqIk5To9wASa6DQ96Z
4lvqyxKE+GKu4x89XKfjJttfb4wbGFG2leBCAs+B9BWxv02lvzT5EpIy0PpwXd5ka8NOeesIr
yWAoxAvBoBm3pjHHkVZYZRVtcHhvkLeSq/Bqe8BnZKtc1hrAhd9jGM1r3sHcxq5kZWa3rNn5z
knjCPtzVHQ9bfRZQbXo/gE87/TsLA4Uzj34S2cRcsRqFEgMkMTqh9PDzp/A9BqZB8nifEH72N
BcpxclXYacWaEWFrEIlgmGur2dE+muT6iO/lyVTt593fTBLK/EIRyyRtVllu2UsC0PSg6+YzT
ZV0edBnj9yatW/ri9qbdPuEuyhPAa0hxHG0Ofc6+Ohox0V9KQRUFL0k3+uBqZN7uX/KsNyBHi
nO8pY0/KCMaBfHWKpcFeBn0EeU7UaphR4TERQGYjkz7e2ZYy8VDOk9C9M7eVL5Uu9UgMTH+aW
53Aih21PcPrtYHQTbowSs7o46COUTqTgJEznbkCkoaCVjlKaerq0FlkAHsb5oTR7vxhw21+/R
n7uF7gT//wmhCxaUwikdrHuLHE/PnJeY60y7HdrbEPC1N+VR7aZlay+vN86wuUkeuAh2kWwHJ
YLQR1+b5exLi+c=
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; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op do 10-03-2022 om 11:17 [+0000]:
>> Before continuing to work on this build-system though, do you have
>> any
>> opinions about adding it to begin with?=C2=A0 As opposed to the current
>> approach of defining a base grammar package (see tree-sitter-c) and
>> have
>> the other grammar packages inherit from it.=C2=A0 I'm wondering if it's
>> worth
>> adding the build-system, when I don't think we should expect the
>> number
>> of grammars we would package to grow too much.=C2=A0 But then again, the
>> package definitions do look quite a bit nicer with the build-system,
>> so
>> I'm a bit on the fence about this :-).
>
> Build systems=C2=A0only cost a module or two, there are quite a few tree
> sitter packages (19 or so?) and the tree sitter packages have a lot
> in common (custom test phases, install phases), so I wouldn't
> hesitate to define a custom build system for tree-sitter stuff.
Sounds good, I'll continue in that direction for v5.
>
> Even better would be to unify things a bit more, e.g. it looks like
> tree-sitter-ocaml needs a custom 'install', 'build' and 'check' phase,
> but they looks almost the same as the other phases for other treesitter
> packages, so maybe 'tree-sitter-build-system' can be taught to mostly
> automatically determine the exact invocation?=20=20
I'll see what can be done, sadly so far I couldn't find a way to do the
right thing automatically for ocaml and typescript. These are packages
that provide two grammars, and I didn't see a way to "discover" that
there are multiple languages supported. However maybe they could be
split into multiple package definitions, if I can find a way to do that,
maybe by passing new #:keyword parameters.
Another idea could be to call back into the build-system phase, for
example something like:
=2D-8<---------------cut here---------------start------------->8---
(replace 'build
(lambda _
(for-each (lambda (dir)
(with-directory-excursion dir
((assoc-ref tree-sitter:%standard-phases 'build))))
'("ocaml" "interface"))))
=2D-8<---------------cut here---------------end--------------->8---
I don't know if that works yet, we could do that if other nicer
approaches don't work.
>
> Also, 'use-modules' only really works on the top-level, I recommend
> #:modules instead, there are some problems with using it in expression
> context (I don't think they are documented anywhere though).
Ah, I see I had (use-modules (guix build json) (ice-9 regex)) in the
install phase for no reason indeed, those modules were already imported,
that's what you meant right?
Thanks for your input! I'll work on a v5.
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmIqAX8YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31URewH/iJ1rOj+497/oN1u3QAH0R+r
6scDBDANzi195NONgoOeI7POyRYh22LE1d5mFwgGqIWaNl6NYJhQD1i+aKYSk/8n
VhfvuaSM2KXNf8BX5BS0NXwJSAt/7qg5R9Q9ZqVNYQdx5pjRbwGg8KaQiAd5LYKE
40NdqyszEBIaPMyoaLVRFQfLk+C91b4aTspCWHldawHys6klG+deePUpzBb3fGVX
Auw5wPszK+1E4eXKp0ATA1x6qt2hO/9gAKj2DVWyqfuDfp4BFtcPFvmGZROCvtis
lpEhEmYQQJhVLmyZmzlhIn+3zYzAOuoGHOSwsJSusnVYXTd5AABd125jeG62ED4=
=sie6
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 10 Mar 2022 12:36:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 10 07:36:45 2022 Received: from localhost ([127.0.0.1]:33548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nSI29-0001V1-8T for submit <at> debbugs.gnu.org; Thu, 10 Mar 2022 07:36:45 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:52956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maximedevos@HIDDEN>) id 1nSI27-0001Uq-1H for 49946 <at> debbugs.gnu.org; Thu, 10 Mar 2022 07:36:44 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id 4cch270034UW6Th06cchu0; Thu, 10 Mar 2022 13:36:41 +0100 Message-ID: <a1c721ae86cac9bd0e9a9f2ef02e75ac75253d17.camel@HIDDEN> Subject: Re: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs (and neovim as well?). From: Maxime Devos <maximedevos@HIDDEN> To: Pierre Langlois <pierre.langlois@HIDDEN> Date: Thu, 10 Mar 2022 13:36:35 +0100 In-Reply-To: <87zglykpmf.fsf@HIDDEN> References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN> <87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN> <87sfrrnpme.fsf@HIDDEN> <24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN> <87zglykpmf.fsf@HIDDEN> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-bz0xcgenH2MBAWxhK7xa" 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=1646915801; bh=MoFDw7KS0lqWEZ+LPc2hmzrch1N/hdHFC3HVk7F3HHQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=epN0naJw4N4AzQhsKZN3uSJpA9eCNxuIHv7aIHfPlw2Lhmtlhc+RJ7Q1fSNvYDSzF ItGlyhFToCUp6wqMEWWa414n60WLD7TskuWT1LAUkcEdx2rxx+rPfZTCsQhUjUXdiC ICvGicmDqVXwrh5cYaIZXMLKRvH82w3tbvlQdNMNn/FdvQEpK9YtMyDcKuGNVD3y9v Z9PpL+qpEcO0bY+FZvTBrBOPTTdPWB+YSWF0uf0w95yZfOjtDN9nJzrXmmc3CwyUs5 IILnOoKir7DqIhNwtHBsF22VuknvZlJG19BrLYtO+jFFrGhGd/4vcgS6z/awJgO4uo mwxTsTmGvl6Pw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 49946 Cc: 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 (-) --=-bz0xcgenH2MBAWxhK7xa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Pierre Langlois schreef op do 10-03-2022 om 11:17 [+0000]: > Before continuing to work on this build-system though, do you have > any > opinions about adding it to begin with?=C2=A0 As opposed to the current > approach of defining a base grammar package (see tree-sitter-c) and > have > the other grammar packages inherit from it.=C2=A0 I'm wondering if it's > worth > adding the build-system, when I don't think we should expect the > number > of grammars we would package to grow too much.=C2=A0 But then again, the > package definitions do look quite a bit nicer with the build-system, > so > I'm a bit on the fence about this :-). Build systems=C2=A0only cost a module or two, there are quite a few tree sitter packages (19 or so?) and the tree sitter packages have a lot in common (custom test phases, install phases), so I wouldn't hesitate to define a custom build system for tree-sitter stuff. Even better would be to unify things a bit more, e.g. it looks like tree-sitter-ocaml needs a custom 'install', 'build' and 'check' phase, but they looks almost the same as the other phases for other treesitter packages, so maybe 'tree-sitter-build-system' can be taught to mostly automatically determine the exact invocation? =20 Also, 'use-modules' only really works on the top-level, I recommend #:modules instead, there are some problems with using it in expression context (I don't think they are documented anywhere though). Greetings, Maxime --=-bz0xcgenH2MBAWxhK7xa 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+4iGRcl7gUCYinw0xccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7p3ZAQDHSWusjpMwlDcrWyExpSyvUDj4 0uy5lRCgLpkHcC5KWgEAs/8hWfEvdUyqdi3XJFBEGxp523SHWM7oXAOjXbevNgU= =hmgu -----END PGP SIGNATURE----- --=-bz0xcgenH2MBAWxhK7xa--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Mar 2022 11:34:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 10 06:34:54 2022
Received: from localhost ([127.0.0.1]:33482 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nSH4I-00067D-Ki
for submit <at> debbugs.gnu.org; Thu, 10 Mar 2022 06:34:54 -0500
Received: from mout.gmx.net ([212.227.17.22]:45735)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nSH4H-000670-8n
for 49946 <at> debbugs.gnu.org; Thu, 10 Mar 2022 06:34:54 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1646912083;
bh=xQ1FF7dB+ocH3EwvTyiUoNb9LbDYqSmBCmfSFg7nKvA=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=dnNtAuKwSaAAtNiwIPUzXEBkf1+wDRCinoTZPh4qL1BIeFOGt7v4xRX33VK11sdka
FoWIszjNb668z5PktaW2ZvrzC32ieUSh5CstiAT2eugin1FoIUsbiJgbN2nl3AiccB
jWZktZLCh10eujPHKrSRugrYyN1E1z/pgLWXS5Q0=
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 1MysRu-1oNpUe3BNi-00vyaV; Thu, 10
Mar 2022 12:34:42 +0100
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN>
<87sfrrnpme.fsf@HIDDEN>
<24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN>
User-agent: mu4e 1.6.10; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs
(and neovim as well?).
Date: Thu, 10 Mar 2022 11:17:31 +0000
In-reply-to: <24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN>
Message-ID: <87zglykpmf.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:FhyPIOisxHG2ZP5mMElVwqGQwjx09DQ05kC4QrH94l2HcIhYJ60
fXhYK23HDbKv6cLhMmqbtQ08N7JMLjnRNJdkC7ffyVOSmWjd4CH/WOoD79tdkukKItDIFgb
X4V+5wF+HZDNEjvuiCJhOKzCimCBIAgLIqZLjKjhol3ym9x5CMa0HtcTo1T+fEZpTmjcrsA
Wj2kv9QODeHB8J3mXk7Jg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:EkFQgAxE6iY=:QDNsNdCBeEHMaXkRxgIjB4
q01Nm0DU8OAJuTG3iy77YmXVPPnn/auOr3SYDO0hP8w5FaHjdQzWH5wu8gBd2ebzrmfRPYmoe
esorMQ5GXhxG1zlOYWbbBnWj4vMh33f6J7qtcop1AWFIhr4ki17kSKICVnPL7ViTk+b3vGLzZ
KfuMYpg8C8PBa0ntfOl7pfU/aIciiUukx54Hoy1UZkZrzqcVULIJDDk3oZus9f+SK+oYQhL2i
pJm0Vahcd6SgS30zQZHc/toDHVz10aEs14QuaxpVp81IMxkUKgDOjert7F5R3DnewaQtfTnxE
nKzFmzXrhoDqwjyHMGInHNILDcbQ14ekKFa3wIWA7F+WmApAOtU7I9THb9SJuHpbmcgNuLcL6
r/w5bOyhGol7ds7Nd0UuMEsIbcInH1e9/mUDD2LALxGMF5s9ltwVel6EJHnI1PSwA3FnA8r2i
gEutjhshIWJ4Xjjan7XgBzPxQYtT3rXztWG6tAZPrAHMWfibtK7hT0ajaHfQQpfIV6urFDn9t
SwbUS8GXX7HNm4xt1DL1+/v9hfKZaUhqMjlY8Cy05A5s0zeKojqUh7R0LjxAGD5YqzOAbsqVZ
VbszT5fjxQ1lKcGRRdDn4LrvXYGXftbKtNk3hikVggL12CCVLZTPt9Orubl3PMg4heNSAGCW/
4xmoxQetkBd/dMx1d9/wfRb+zLXi60P20UGsUmmhbTn9rZdlGLP3BApEGVokyAhlclnji/VVX
Wqa06O5bM6p1ostu+bKGqTQDFXkOpIeIW0eEP/zvFtzo5fbq4XV0YP5lSkZwYjh/BNUX9SsZH
2VTFqfaywPKgZfzgU6A5of74su5Gdwh1zPrQWyAJdKk7lXwYHmNurOFLv1D7eDwfm9Lw2DspQ
HeI41kOYO00uRx9SSWdbmNfr9+DsBIQ66eQrEfHbhf7z+cX9tPstzfUk05/YLpizZ5dcbshF9
BA06vOccwDbeA7WIJVqcZ0feaca1dY3dAc224jx3qgFpbvx7kaMNxanONTNoZC/rHsHhoeGuv
gwZfjEgxG+IwOX/cm4Y69F1FeQLihY/4ncBDyDC0BA8XN1+v5K6RZ0Z8NIjxzeB6xCN0hXU77
z8eBK53EcUrSRM=
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; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi Maxime,
Thanks for taking a look!
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op wo 09-03-2022 om 13:46 [+0000]:
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `("g++"
>
> Wouldn't the cross-compiler be necessary here?
Yeah it should, I've not yet implemented cross-compiling support in this
build-system yet, but I'm happy to do it!
Before continuing to work on this build-system though, do you have any
opinions about adding it to begin with? As opposed to the current
approach of defining a base grammar package (see tree-sitter-c) and have
the other grammar packages inherit from it. I'm wondering if it's worth
adding the build-system, when I don't think we should expect the number
of grammars we would package to grow too much. But then again, the
package definitions do look quite a bit nicer with the build-system, so
I'm a bit on the fence about this :-).
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmIp4kgYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UHuUH/jZ3h6qi5xZVtDlUXssaPKdD
eU7Z3RR/sjxpmlIX12BR/OuFhzs9A/VNN0Cdstg/QSUi/HfdwAZKe8WziSP51wZF
I0ztihtC12N3HcADWG2PJBz0xpFUkSZqbcTBIlLc0M4hhkEMLqyQ/JrGH0O5En1e
u+RO2+LlaN9RS0g/+hTjPjE1HJpjNpFVX/anPX7Zoyn5kePaL16UJRomLD538X20
BpsLtvA4pu8OxZ/80zLqcGtxS/M4GPUoqTTuIdxPfiVSog6Rav3W8xdJqZ3L1VQX
2Hc6EEFQini2E7w976PD0WVtBBMLoaaCoRIMQC9gA0Jwa7oiVF8qh9BGXsZKAkk=
=BxcU
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 9 Mar 2022 21:04:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 09 16:04:22 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 1nS3Tl-0002yL-Uw
for submit <at> debbugs.gnu.org; Wed, 09 Mar 2022 16:04:22 -0500
Received: from albert.telenet-ops.be ([195.130.137.90]:47850)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1nS3Tf-0002y7-Lp
for 49946 <at> debbugs.gnu.org; Wed, 09 Mar 2022 16:04:16 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by albert.telenet-ops.be with bizsmtp
id 4M492700Q4UW6Th06M49bG; Wed, 09 Mar 2022 22:04:10 +0100
Message-ID: <24f64e912876f56fe40fbaeaec02ddd5e8ef2c4b.camel@HIDDEN>
Subject: Re: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs
(and neovim as well?).
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, Luis Henrique Gomes Higino
<luishenriquegh2701@HIDDEN>
Date: Wed, 09 Mar 2022 22:04:05 +0100
In-Reply-To: <87sfrrnpme.fsf@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN>
<87sfrrnpme.fsf@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-q7Ykz+gCt4tadNvTzsOR"
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=1646859850; bh=Qr8SqqMhTXQpOo3tVj0b5qobvjPveu1ntFhVG5nkuXQ=;
h=Subject:From:To:Cc:Date:In-Reply-To:References;
b=TXziibhrDSBs3Q984lSxxOsAwOOVPdLGUlSSOa2mPAZfY4Ib63zM8xkimNXIXsmSV
L+1D13jdzTpYJb3SV3LnEsJgGM0Mq7CtRPYDFYC98gZnlM3AjNjEySl0hZdljbBcRv
Si6PuLO23CPXCwGl8ceVD88ApZsB+jWk29Pyyx3AVIXKcUnSht7mum3fQj8ekHiLYA
/TsJa1KBVO8WYaTPuH8/bGokq6JWrPXKYN/UxVSD3bxuW0dlhyPv2YXcp0q+MLiAvi
U9JyN7ZmSmAlk9h/nrk2Rb0wfUNs0lAVDbkXHoyVDe50Dr44Xqt7MjoPEcH99dLTXP
N365bh1WS8Rfw==
X-Spam-Score: -0.7 (/)
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.7 (-)
--=-q7Ykz+gCt4tadNvTzsOR
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op wo 09-03-2022 om 13:46 [+0000]:
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `("g++"
Wouldn't the cross-compiler be necessary here?
--=-q7Ykz+gCt4tadNvTzsOR
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+4iGRcl7gUCYikWRRccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jLeAQD7x54jXP7DwNAFdiU0P2AfnzRg
1T+6QQiZew7hE/0JdgEAmnmx7kUo6O+Dk/RVqaW/e+JUEkZA2SX5RwMBa7eYAQ0=
=HGH4
-----END PGP SIGNATURE-----
--=-q7Ykz+gCt4tadNvTzsOR--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 9 Mar 2022 14:54:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 09 09:54:20 2022
Received: from localhost ([127.0.0.1]:58858 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nRxhd-0004dZ-LY
for submit <at> debbugs.gnu.org; Wed, 09 Mar 2022 09:54:20 -0500
Received: from mout.gmx.net ([212.227.17.20]:52461)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nRxha-0004dG-4B
for 49946 <at> debbugs.gnu.org; Wed, 09 Mar 2022 09:54:12 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1646837643;
bh=P5tHrL4CQgzRpczxitO8Fg3unaQqWZ1Er7jC0pzMj84=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=cubUYNj4j6dahNGS13P09jeIs5cYb9fHtYxETZCsdsZHwCYu8EBq/e98SyCGB1i93
31+Xw51QaDnaibXE9RqZf8KypdCWt0MRAptBPuYPxay+mUC5QgIb1ceSc5XlOc+0/l
Ie/cEhuiGXpCZy6v6Oi3h7jznv9csxu8ZdFV2CmU=
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 1MVNB1-1nciIX47MN-00SRKM; Wed, 09
Mar 2022 15:54:03 +0100
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN> <87lexl1goc.fsf@HIDDEN>
User-agent: mu4e 1.6.10; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN>
Subject: Re: [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs (and neovim
as well?).
Date: Wed, 09 Mar 2022 13:46:29 +0000
In-reply-to: <87lexl1goc.fsf@HIDDEN>
Message-ID: <87sfrrnpme.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:yGdqPkv0q1dJyqigF6Ro3vwKo9MrVyLHBCtSo8t4F6C6TdgwSe6
S1cO2tcCqyqPQp1kkaFxJSXDZgsN5EhIkQ50yNoLXnOUXRVkPE1XCTJDN/zvntqkWDKG8P5
3gikmNk9/UVUBZMtU24GlU7iJDOt2Gf91urcSyj9C3mkL+cvHWVCHiAZtg0QolyNL/OXKz8
o7RH0p0ojMUxMpxwwT7cw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:doJAjd3ZZ5Y=:M3CE7Q66q9K3/OcxgGX35M
M+ayUBSGZdq3/+5GPcYHNVTFN+dUAvTMgE6IhXypGyA4nbFOKECEcc5dstuS2I+27e27yP7nW
g3N6fpzUdoVHDPdYW9pBToZ1+mTlbseB3UrfvgHmUaDDfo7zWSdiNFm+cHukf1+FNpUT7dy2v
5XwO5dmhSeTmMLLaHyRQhxViZxVosxNAhQl69iajq6ckADw5rum72qSfp/TSlrRGoDt9HH16Z
oZqJ8LMqBlj0ZOhPAnYWpOgjR3+yLIMoTOpMscIkFiI9FqGSDa2dMyikUgph5Gcxdh8QOALas
4oA12PVFEkTlhRF0B2zxYksZ22B3hz4acuYXeiViYpBZmL1z3+gSKg1GkXe/Z24GkYJRX0toI
JZbPXVOyhJZxJDKnhnQNH5jetUxbMnseKXLis1p/6TnwPo9ouabIyLWdzazoSmW/wPuXOxB5u
MT0ul8uokYyoVmz6kS6AeF3lB+AkKtrubV6a6C8Aodm/CdT4S31R5ar4Qh3u1scOSNrlJd+fb
TdDlsB77EtEKSeBmeNFzONlh7G08mgV91Dsow659oqJpAInPMAIYqGSjxzlaU/lOfpzeKbHsJ
3AZa6iKTMHGv2omeheHc36LZJXtezwDrUa4lW4W6p/hHmhKGMki4ehN5TAypiP/uK/lPKSOzK
+/rhUf5rewJeH4+3+58QE7iAJldvfoHykw/JYbg/9xP7r0GDIpvIqkWds3EaHgmcuhJZBMPEu
pbR1rFNdXs1ZNgcHgLW9kmpn/49RruhiApTXtjIAvlgwPaw6e/92apozdPvwx1tbPsQQ22PoN
n6bQeVrHkg4OI1ZelOjRAlnM0iAjPzShR3wamSmQeT8m6jiXbj4uNgaXImErZ3AfDdzn8KSmY
8dwqEpXMGGTSPw8+8ccdHV52dd4FNL6Z0SopA8MpApfyodTR5qvgUAoY9Pl6jJX2UAGvELq4q
9yJW50dVl0wyR3W3YEkiM7IF3W24X6vvOKEtW0qwBEr6SONOO2wPJdI+9LCY38scoeKF+7CZi
lUGqb+WIa5HgpbtUQmDzxs1rPUvxPymp0tNitkdPulTtcVeIFasqyuHbHnj7MvpEPFmxBn+7q
C3AJcW2zM5EEUk=
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.0 (-)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hi Luis,
Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN> writes:
> Hi Guix, Hi Pierre,
>
> I apologize for my delay, the last few weeks were quite busy :-/.
No worries! :-).
>
> Pierre Langlois <pierre.langlois@HIDDEN> writes:
>
>> I'm sharing it early as a WIP first, as I just noticed the other day
>> that Luis also contributed a patches for tree-sitter for neovim[0]. The
>> series I have here is quite a lot bigger though so I'm happy to rebase
>> it on top of yours, Luis :-). The package I had for tree-sitter looks
>> basically the same, I would then move it to a new file with all
>> tree-sitter related packages, if you're happy with that.
>
> That's OK by me!
>
>> So I'm wondering, are these tree-sitter grammar packages also useful for
>> the neovim package for tree-sitter?
>
> I'm not exactly sure about this. Currently, most Neovim users install the=
ir
> grammars through the installer included in
> https://github.com/nvim-treesitter/nvim-treesitter. That ensures=20
> the user gets the version that is ABI compatible with nvim-treesitter. Th=
at
> makes me uncertain if we could use the same grammar packages for Neovim a=
nd
> Emacs, at least for now.
I see, I suppose for the moment we're not packaging nvim-treesitter so
we don't have to concern ourselves with how language grammars are
delivered to users.
In the future it might be cool to package it, out of curiosity I took a
look at it and it:
- [0]: Clones the repo with `git'.
- [1]: Run `npm install' and `tree-sitter generate'.
- [2]: Compiles the generated grammar with gcc.
[0]: https://github.com/nvim-treesitter/nvim-treesitter/blob/90485c890503f9=
73271db1ae02ddba6d6fd46397/lua/nvim-treesitter/install.lua#L378
[1]: https://github.com/nvim-treesitter/nvim-treesitter/blob/90485c890503f9=
73271db1ae02ddba6d6fd46397/lua/nvim-treesitter/install.lua#L228
[2]: https://github.com/nvim-treesitter/nvim-treesitter/blob/3aac7f9db9ee19=
73152426c097216e0071dd2293/lua/nvim-treesitter/shell_command_selectors.lua#=
L96
The only concern I can think of is that when it runs `npm install', it's
likely that it downloads a `tree-sitter' binary, rather than use
Guix's tree-sitter-cli package. In my series I had to patch
package.json files for each grammar to remove `tree-sitter-cli' as a
dependency:
https://github.com/tree-sitter/tree-sitter-c/blob/e348e8ec5efd3aac020020e4a=
f53d2ff18f393a9/package.json#L20
Otherwise it would pull in the official tree-sitter-cli node package,
which then downloads a `tree-sitter' binary :-/
https://github.com/tree-sitter/tree-sitter/blob/master/cli/npm/package.json
Anyways, I don't think that's something we should concern ourselves with
for now. If we ever want to package nvim-treesitter, I think we might
have to patch it so it uses Guix-provided grammars instead of building
them locally. For emacs that wasn't so difficult to do, but the real
issue is making sure the grammar is compabible, and luckily the emacs
package had tests we could run for that. We would also need to run
tests if we're to package nvim-treesitter.
>
>> I do wonder if I'm going about it the right way for Guix though, for
>> instance I'm wondering if I should rewrite the grammar packages using a
>> new custom build system, do people think it would be worth it? That
>> could be done as a follow-up of course.
>
> I'm not a very experienced packager myself, but from what I saw in your p=
atch,
> it seems rather unnecessary, as the grammar packages are very simple.
That was also my impression :-). Since then I did play with building
one to see what it would look like, also as an escuse to go and learn
how they work. I'm still on the fence about it though, I've attached
what it could look like, if anybody else is also unsure. I think I'd
prefer to work on it as a potential follow-up after an initial set of
patches get merged.
Thanks,
Pierre
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmIov4kYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31USi8H/0ImEqfzU20ae2q2Cb4BgTR3
v16AjRWRFrM9rU6Q2bwoj6tx3Coe/xpMmtVTHOwlwzunwKLttdmyzbFAVGIt7pOb
MLLuxBf8LsF42/BJdnFmwDS9sP+PAq2mVpSt0zG2VBs8QO/NhuuvTZwpsea8pBtL
kOF22UfKfrKwu7f/PyntMS5pubBWMxl4x0qvDhzeiMyVzvlJvoM/4EkG34fgt566
9eLsvjvjPpLVvNlvIy9sRNfEJKSUp8Ql0LADjnYYJa7JchVP74uBWUicIW0jRaWl
cnHnek6zjmtSKoxsP4L3W/+lY4/+UhIUg+fWAa0lps2ligbe20cqWGbq0c+XKvE=
=r8Qv
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline;
filename=0001-wip-build-system-for-tree-sitter-grammars.patch
Content-Transfer-Encoding: quoted-printable
From a38e3e66788129bbd441f9d28e450dba8a7438d1 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Wed, 23 Feb 2022 20:38:51 +0000
Subject: [PATCH] wip build-system for tree-sitter grammars.
---
Makefile.am | 2 +
gnu/packages/tree-sitter.scm | 312 ++++++++----------------
guix/build-system/tree-sitter.scm | 109 +++++++++
guix/build/tree-sitter-build-system.scm | 124 ++++++++++
4 files changed, 342 insertions(+), 205 deletions(-)
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 8850c4562c..c5da931041 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,6 +167,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 \
@@ -220,6 +221,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/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 0186518b23..725ab16910 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 emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system node)
+ #:use-module (guix build-system tree-sitter)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -224,70 +225,7 @@ (define-public tree-sitter-c
"0454jziys33i4kbwnvi9xcck0fzya792ghy32ahgk1hhv96xga9w"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
- (build-system node-build-system)
- (native-inputs
- (list tree-sitter tree-sitter-cli))
- (outputs '("out" "js"))
- (arguments
- (list
- #:phases
- (with-imported-modules '((guix build json))
- #~(modify-phases %standard-phases
- (add-after 'patch-dependencies 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "nan"
- "node-gyp"))))
- (replace 'build
- (lambda _
- (invoke "tree-sitter" "generate" "--no-bindings")))
- (replace 'check
- (lambda _
- (invoke "tree-sitter" "test")))
- (replace 'install
- (lambda _
- (use-modules (guix build json)
- (ice-9 regex))
- (let* ((name (assoc-ref
- (call-with-input-file "package.json" read-js=
on)
- "name"))
- (lang (cond
- ((string-match "^(@.*/)?tree-sitter-(.*)$" n=
ame)
- =3D> (lambda (m)
- (match:substring m 2)))
- (else #f)))
- (lib (string-append #$output "/lib/tree-sitter")))
- (mkdir-p lib)
- (define (source-file path)
- (if (file-exists? path)
- path
- #f))
- (apply invoke
- `(,#$(cxx-for-target)
- "-shared"
- "-fPIC"
- "-fno-exceptions"
- "-O2"
- "-g"
- "-o" ,(string-append lib "/" lang ".so")
- ,@(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")))))
- (add-after 'install 'install-js-module
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke (search-input-file inputs "/bin/npm")
- "--prefix" #$output:js
- "--global"
- "--offline"
- "--loglevel" "info"
- "--production"
- ;; Skip scripts to prevent building bindings via G=
YP.
- "--ignore-scripts"
- "install" "../package.tgz")))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-c")
(synopsis "Tree-sitter C grammar")
(description
@@ -296,7 +234,6 @@ (define (source-file path)
=20
(define-public tree-sitter-cpp
(package
- (inherit tree-sitter-c)
(name "tree-sitter-cpp")
(version "0.20.0")
(source (origin
@@ -311,7 +248,8 @@ (define-public tree-sitter-cpp
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
(inputs
- (list `(,tree-sitter-c "js")))
+ (list tree-sitter-c))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-cpp")
(synopsis "Tree-sitter C++ grammar")
(description
@@ -319,7 +257,7 @@ (define-public tree-sitter-cpp
(license license:expat)))
=20
(define-public tree-sitter-c-sharp
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-c-sharp")
(version "0.19.1")
(source (origin
@@ -333,6 +271,7 @@ (define-public tree-sitter-c-sharp
"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
@@ -340,7 +279,7 @@ (define-public tree-sitter-c-sharp
(license license:expat)))
=20
(define-public tree-sitter-bash
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-bash")
(version "0.19.0")
(source (origin
@@ -354,17 +293,7 @@ (define-public tree-sitter-bash
"18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
- (arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "nan"
- "node-gyp"
- "prebuild"
- "prebuild-install"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-bash")
(synopsis "Tree-sitter Bash grammar")
(description
@@ -372,7 +301,7 @@ (define-public tree-sitter-bash
(license license:expat)))
=20
(define-public tree-sitter-css
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-css")
(version "0.19.0")
(source (origin
@@ -386,6 +315,7 @@ (define-public tree-sitter-css
"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
@@ -395,7 +325,7 @@ (define-public tree-sitter-css
(define-public tree-sitter-elixir
(let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869")
(revision "1"))
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-elixir")
(version (git-version "0.19.0" revision commit))
(source (origin
@@ -409,16 +339,7 @@ (define-public tree-sitter-elixir
"0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
- (arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "node-gyp"
- "nan"
- "prettier"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://elixir-lang.org/tree-sitter-elixir/")
(synopsis "Tree-sitter Elixir grammar")
(description
@@ -428,7 +349,7 @@ (define-public tree-sitter-elixir
license:expat)))))
=20
(define-public tree-sitter-elm
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-elm")
(version "5.5.1")
(source (origin
@@ -442,18 +363,7 @@ (define-public tree-sitter-elm
"10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
- (arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "nan"
- "node-gyp"
- "@asgerf/dts-tree-sitter"
- "prebuild"
- "prebuild-install"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://elm-tooling.github.io/tree-sitter-elm/")
(synopsis "Tree-sitter Elm grammar")
(description
@@ -461,7 +371,7 @@ (define-public tree-sitter-elm
(license license:expat)))
=20
(define-public tree-sitter-go
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-go")
(version "0.19.1")
(source (origin
@@ -475,6 +385,7 @@ (define-public tree-sitter-go
"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
@@ -482,7 +393,7 @@ (define-public tree-sitter-go
(license license:expat)))
=20
(define-public tree-sitter-html
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-html")
(version "0.19.0")
(source (origin
@@ -496,6 +407,7 @@ (define-public tree-sitter-html
"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
@@ -503,7 +415,7 @@ (define-public tree-sitter-html
(license license:expat)))
=20
(define-public tree-sitter-java
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-java")
(version "0.19.1")
(source (origin
@@ -517,6 +429,7 @@ (define-public tree-sitter-java
"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
@@ -524,7 +437,7 @@ (define-public tree-sitter-java
(license license:expat)))
=20
(define-public tree-sitter-javascript
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-javascript")
(version "0.20.0")
(source (origin
@@ -538,6 +451,7 @@ (define-public tree-sitter-javascript
"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
@@ -546,7 +460,7 @@ (define-public tree-sitter-javascript
(license license:expat)))
=20
(define-public tree-sitter-json
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-json")
(version "0.19.0")
(source (origin
@@ -560,6 +474,7 @@ (define-public tree-sitter-json
"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
@@ -567,7 +482,7 @@ (define-public tree-sitter-json
(license license:expat)))
=20
(define-public tree-sitter-julia
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-julia")
(version "0.19.0")
(source (origin
@@ -581,6 +496,7 @@ (define-public tree-sitter-julia
"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
@@ -590,7 +506,7 @@ (define-public tree-sitter-julia
(define-public tree-sitter-ocaml
(let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192")
(revision "1"))
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-ocaml")
(version (git-version "0.19.0" revision commit))
(source (origin
@@ -617,43 +533,44 @@ (define-public tree-sitter-ocaml
'("ocaml" "interface"))
#t))))
(arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- #~(modify-phases #$phases
- (replace 'build
- (lambda _
- (for-each (lambda (dir)
- (with-directory-excursion dir
- (invoke "tree-sitter" "generate" "--no-bind=
ings")))
- '("ocaml" "interface"))))
- (replace 'check
- (lambda _
- (for-each (lambda (dir)
- (with-directory-excursion dir
- (invoke "tree-sitter" "test")))
- '("ocaml" "interface"))))
- (replace 'install
- (lambda _
- (let ((lib (string-append #$output "/lib/tree-sitter/")))
- (mkdir-p lib)
- (invoke #$(cxx-for-target)
- "-shared"
- "-fPIC"
- "-fno-exceptions"
- "-O2"
- "-g"
- "-o" (string-append lib "/ocaml.so")
- "ocaml/src/scanner.cc"
- "-xc" "ocaml/src/parser.c")
- (invoke #$(cxx-for-target)
- "-shared"
- "-fPIC"
- "-fno-exceptions"
- "-O2"
- "-g"
- "-o" (string-append lib "/ocaml-interface.so")
- "interface/src/scanner.cc"
- "-xc" "interface/src/parser.c"))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "generate" "--no-bindi=
ngs")))
+ '("ocaml" "interface"))))
+ (replace 'check
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "test")))
+ '("ocaml" "interface"))))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib/tree-sitter/")))
+ (mkdir-p lib)
+ (invoke #$(cxx-for-target)
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" (string-append lib "/ocaml.so")
+ "ocaml/src/scanner.cc"
+ "-xc" "ocaml/src/parser.c")
+ (invoke #$(cxx-for-target)
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" (string-append lib "/ocaml-interface.so")
+ "interface/src/scanner.cc"
+ "-xc" "interface/src/parser.c")))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-ocaml")
(synopsis "Tree-sitter OCaml grammar")
(description
@@ -663,7 +580,7 @@ (define-public tree-sitter-ocaml
(define-public tree-sitter-php
(let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
(revision "1"))
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-php")
(version (git-version "0.19.0" revision commit))
(source (origin
@@ -683,15 +600,7 @@ (define-public tree-sitter-php
(delete-file "src/parser.c")
(delete-file-recursively "src/tree_sitter")
#t))))
- (arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "nan"
- "shelljs"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-php")
(synopsis "Tree-sitter PHP grammar")
(description
@@ -701,7 +610,7 @@ (define-public tree-sitter-php
(define-public tree-sitter-python
(let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42")
(revision "1"))
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-python")
(version (git-version "0.19.1" revision commit))
(source (origin
@@ -715,6 +624,7 @@ (define-public tree-sitter-python
"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
@@ -722,7 +632,7 @@ (define-public tree-sitter-python
(license license:expat))))
=20
(define-public tree-sitter-ruby
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-ruby")
(version "0.19.0")
(source (origin
@@ -736,17 +646,7 @@ (define-public tree-sitter-ruby
"0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v"))
(modules '((guix build utils)))
(snippet tree-sitter-delete-generated-files)))
- (arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'delete-dependencies
- (lambda _
- (delete-dependencies '("tree-sitter-cli"
- "nan"
- "node-gyp"
- "prebuild"
- "prebuild-install"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-ruby")
(synopsis "Tree-sitter Ruby grammar")
(description
@@ -754,7 +654,7 @@ (define-public tree-sitter-ruby
(license license:expat)))
=20
(define-public tree-sitter-rust
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-rust")
(version "0.20.1")
(source (origin
@@ -771,6 +671,7 @@ (define-public tree-sitter-rust
(native-inputs
(modify-inputs (package-native-inputs tree-sitter-c)
(prepend bc)))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-rust")
(synopsis "Tree-sitter Rust grammar")
(description
@@ -780,7 +681,7 @@ (define-public tree-sitter-rust
(define-public tree-sitter-typescript
(let ((commit "111b07762e86efab9a918b7c721f720c37e76b0a")
(revision "1"))
- (package (inherit tree-sitter-c)
+ (package
(name "tree-sitter-typescript")
(version (git-version "0.20.0" revision commit))
(source (origin
@@ -806,39 +707,40 @@ (define-public tree-sitter-typescript
'("typescript" "tsx"))
#t))))
(inputs
- (list `(,tree-sitter-javascript "js")))
+ (list tree-sitter-javascript))
(arguments
- (substitute-keyword-arguments (package-arguments tree-sitter-c)
- ((#:phases phases)
- #~(modify-phases #$phases
- (replace 'build
- (lambda _
- (for-each (lambda (dir)
- (with-directory-excursion dir
- (invoke "tree-sitter" "generate" "--no-bind=
ings")))
- '("typescript" "tsx"))))
- (replace 'check
- (lambda _
- (for-each (lambda (dir)
- (with-directory-excursion dir
- (invoke "tree-sitter" "test")))
- '("typescript" "tsx"))))
- (replace 'install
- (lambda _
- (let ((lib (string-append #$output "/lib/tree-sitter/")))
- (mkdir-p lib)
- (for-each
- (lambda (lang)
- (invoke #$(cxx-for-target)
- "-shared"
- "-fPIC"
- "-fno-exceptions"
- "-O2"
- "-g"
- "-o" (string-append lib "/" lang ".so")
- "-xc" (string-append lang "/src/scanner.c")
- "-xc" (string-append lang "/src/parser.c")))
- '("typescript" "tsx")))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "generate" "--no-bindi=
ngs")))
+ '("typescript" "tsx"))))
+ (replace 'check
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "test")))
+ '("typescript" "tsx"))))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib/tree-sitter/")))
+ (mkdir-p lib)
+ (for-each
+ (lambda (lang)
+ (invoke #$(cxx-for-target)
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" (string-append lib "/" lang ".so")
+ "-xc" (string-append lang "/src/scanner.c")
+ "-xc" (string-append lang "/src/parser.c")))
+ '("typescript" "tsx"))))))))
+ (build-system tree-sitter-build-system)
(home-page "https://github.com/tree-sitter/tree-sitter-typescript")
(synopsis "Tree-sitter Typescript grammar")
(description
diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sit=
ter.scm
new file mode 100644
index 0000000000..bfccea4007
--- /dev/null
+++ b/guix/build-system/tree-sitter.scm
@@ -0,0 +1,109 @@
+;;; 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)
+ ;; (guix build json)
+ ,@%node-build-system-modules))
+
+(define* (lower name
+ #:key source inputs native-inputs outputs system target
+ #:allow-other-keys
+ #:rest arguments)
+ ""
+ (define private-keywords
+ '(#:target #:inputs #:native-inputs #:outputs))
+
+ (and (not target) ;XXX: no cross-compilation
+ (bag
+ (name name)
+ (system system)
+ (host-inputs `(,@(if source
+ `(("source" ,source))
+ '())
+ ,@(map (match-lambda
+ ((name package)
+ `(,name ,package "js")))
+ inputs)
+ ;; Keep the standard inputs of 'gnu-build-system'.
+ ,@(standard-packages)))
+ (build-inputs `(("node" ,(module-ref (resolve-interface '(gnu pac=
kages node))
+ 'node-lts))
+ ("tree-sitter" ,(module-ref (resolve-interface '(=
gnu packages tree-sitter))
+ 'tree-sitter))
+ ("tree-sitter-cli" ,(module-ref (resolve-interfac=
e '(gnu packages tree-sitter))
+ 'tree-sitter-cli))
+ ,@native-inputs))
+ (outputs (match outputs
+ (("out") (cons "js" outputs))
+ (_ outputs)))
+ (build tree-sitter-build)
+ (arguments (strip-keyword-arguments private-keywords arguments)))=
))
+
+(define* (tree-sitter-build name inputs
+ #:key
+ source
+ (phases '%standard-phases)
+ (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
+ #: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-build-system
+ (build-system
+ (name 'tree-sitter)
+ (description "")
+ (lower lower)))
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..bf1d2e363d
--- /dev/null
+++ b/guix/build/tree-sitter-build-system.scm
@@ -0,0 +1,124 @@
+;;; 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))
+
+(define (tree-sitter-node-inputs inputs)
+ ""
+ (alist-delete "node"
+ (alist-delete "source"
+ (filter (match-lambda
+ ((label . directory)
+ (directory-exists? (string-append directory
+ "/lib/node_modules")))
+ (_ #f))
+ inputs))))
+
+;;;
+;;; Phases.
+;;;
+
+(define* (adjust-dependencies #:key inputs #:allow-other-keys)
+ ""
+ (node:with-atomic-json-file-replacement "package.json"
+ (match-lambda
+ (('@ . pkg-meta-alist)
+ (cons '@ (map (match-lambda
+ (("dependencies" @ . deps)
+ '("dependencies" @))
+ (("devDependencies" @ . deps)
+ `("devDependencies" @
+ ,@(map
+ (lambda (input)
+ `(,(car input) . "latest"))
+ (tree-sitter-node-inputs inputs))))
+ (other other))
+ pkg-meta-alist))))))
+
+(define (build . _)
+ (invoke "tree-sitter" "generate" "--no-bindings")
+ #t)
+
+(define (check . _)
+ (invoke "tree-sitter" "test")
+ #t)
+
+(define* (install #:key outputs #:allow-other-keys)
+ (use-modules (guix build json)
+ (ice-9 regex))
+ (let* ((name (assoc-ref
+ (call-with-input-file "package.json" read-json)
+ "name"))
+ (lang (cond
+ ((string-match "^(@.*/)?tree-sitter-(.*)$" name)
+ =3D> (lambda (m)
+ (match:substring m 2)))
+ (else #f)))
+ (lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ (mkdir-p lib)
+ (define (source-file path)
+ (if (file-exists? path)
+ path
+ #f))
+ (apply invoke
+ `("g++"
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" ,(string-append lib "/" lang ".so")
+ ,@(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"))))
+
+(define* (install-js #:key inputs outputs #:allow-other-keys)
+ (invoke (search-input-file 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
+ (add-before 'patch-dependencies 'adjust-dependencies adjust-dependenci=
es)
+ (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))
--=20
2.34.0
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 7 Mar 2022 23:33:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 07 18:33:51 2022 Received: from localhost ([127.0.0.1]:54828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nRMrP-0008EW-5A for submit <at> debbugs.gnu.org; Mon, 07 Mar 2022 18:33:51 -0500 Received: from mail-oi1-f181.google.com ([209.85.167.181]:42626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <luishenriquegh2701@HIDDEN>) id 1nRMrM-0008EI-VD for 49946 <at> debbugs.gnu.org; Mon, 07 Mar 2022 18:33:49 -0500 Received: by mail-oi1-f181.google.com with SMTP id q189so1410745oia.9 for <49946 <at> debbugs.gnu.org>; Mon, 07 Mar 2022 15:33:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:user-agent:from:to:cc:subject:date:in-reply-to :message-id:mime-version; bh=DQGcWtddXt2Z8VYkjgAubREwUK1Rn+ThR1H5GsCDR3E=; b=Dzf30nD92Z/SI1jdYAZP4c28DgH6HCJz4sf7IRAeE9BE+9Kn74JvChYSWacCsYMzRi tD2h85zjLC6yf5+LJnbw29evztK1ZsBz/QmdouMrH4WXAkz90q5hnjShMM7cvV9ntOxD x1EWNlONwq0LFu3npEPNxwafMUSpDNnO+yNKDgY+GZhuGUmQYtE3Sd6Sde5nKIvdmMMG Q2/Agu61v98YFLY8iizJESfrFKI14wMW72ShQLaGNlM+lPE9ycxSGlxiVgrb8f52FIPP vfByhzXAqrtYqHXdDiGCPQpk1WVWc2NgoauX5BMjO2kIhaI+i8xubk3oHArggZJLexPg es5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:references:user-agent:from:to:cc:subject:date :in-reply-to:message-id:mime-version; bh=DQGcWtddXt2Z8VYkjgAubREwUK1Rn+ThR1H5GsCDR3E=; b=56XXjiha4QsTv+OhVXG3gWy9DLKSaWvRUH1KgS0B/V3VzDD8Ph+qPT8olwTEUSetgi BFGyXuy/nuhHuEa0c+ZLeE5944cPGRs1gQrl2B37NzuZcf/gBTRf6nTLESxDJIwR8Xg6 x0+VvqGKzC4KJ4FSFgXDCyrlUN3RM/P1E6VDlPfCp5szzc1XUGOiyz6waidHgiRHzVXs KzBXOSJzZQUVnxY7IHdp3YU1SQG58F1RbsWAamJw48Q942U9p7xdMTXSmblIG87KpGV2 YedY7Lpg+ZMxrtUYGdo7tjIRG5pJ/zf4Jd6PJGUC8+nSkGLBlnqNvaS8M85XrjdhDWPV 2s1Q== X-Gm-Message-State: AOAM5321CTJO/ReZHLmc5pbcH3CnAfwEwJqV3CfoOD5RwJ2jNG3eYRxK MC7YTOL6dfBi3r+JTUAuj5bRJS3+bEAjCQ== X-Google-Smtp-Source: ABdhPJz+TQ1uuBC4TBWyh3/uBooORORcZVh+fPtU+p3WMDZBM23v5qxSBAMl66B8yEjYdNBznOIqFQ== X-Received: by 2002:a05:6808:1919:b0:2d7:9ad6:7e4a with SMTP id bf25-20020a056808191900b002d79ad67e4amr914627oib.42.1646696023003; Mon, 07 Mar 2022 15:33:43 -0800 (PST) Received: from LenovoGuix ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id y2-20020a056808130200b002d542a72882sm7460554oiv.3.2022.03.07.15.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 15:33:42 -0800 (PST) References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN> <87leyinxly.fsf@HIDDEN> User-agent: mu4e 1.6.10; emacs 27.2 From: Luis Henrique Gomes Higino <luishenriquegh2701@HIDDEN> To: Pierre Langlois <pierre.langlois@HIDDEN> Subject: Re: [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs (and neovim as well?). Date: Mon, 07 Mar 2022 15:30:21 -0300 In-reply-to: <87leyinxly.fsf@HIDDEN> Message-ID: <87lexl1goc.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; format=flowed 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: Hi Guix, Hi Pierre, I apologize for my delay, the last few weeks were quite busy :-/. Pierre Langlois writes: Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (luishenriquegh2701[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luishenriquegh2701[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.181 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.181 listed in list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. 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: 0.3 (/) Hi Guix, Hi Pierre, I apologize for my delay, the last few weeks were quite busy :-/. Pierre Langlois <pierre.langlois@HIDDEN> writes: > I'm sharing it early as a WIP first, as I just noticed the other > day > that Luis also contributed a patches for tree-sitter for > neovim[0]. The > series I have here is quite a lot bigger though so I'm happy to > rebase > it on top of yours, Luis :-). The package I had for tree-sitter > looks > basically the same, I would then move it to a new file with all > tree-sitter related packages, if you're happy with that. That's OK by me! > So I'm wondering, are these tree-sitter grammar packages also > useful for > the neovim package for tree-sitter? I'm not exactly sure about this. Currently, most Neovim users install their grammars through the installer included in https://github.com/nvim-treesitter/nvim-treesitter. That ensures the user gets the version that is ABI compatible with nvim-treesitter. That makes me uncertain if we could use the same grammar packages for Neovim and Emacs, at least for now. > I do wonder if I'm going about it the right way for Guix though, > for > instance I'm wondering if I should rewrite the grammar packages > using a > new custom build system, do people think it would be worth it? > That > could be done as a follow-up of course. I'm not a very experienced packager myself, but from what I saw in your patch, it seems rather unnecessary, as the grammar packages are very simple. -- Luis H. Higino
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:17 2022
Received: from localhost ([127.0.0.1]:53861 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VY-0000D5-SC
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:17 -0500
Received: from mout.gmx.net ([212.227.17.21]:37907)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VS-0000Ba-9A
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:11 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195504;
bh=KQKtk/Htaalubl8Qbew8r1AMYScY44rvz5nDNhyGK70=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ErTac/D165TjUudgHhD33mLhCE7OwFwBFBhqw+PbRZkTpP/hzZTloxQ1Bm//IjE2N
w1obXrMw7LdrMnTEdVZIQTFgJ/8I1mELNN1FTU2e7uXJpBEC6t2gUlIAtloD1zEENR
VoVsOPeBf3YLWeMpryectZH0/azBYXuvTzahexhY=
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
1MeCtj-1nsCJw34y7-00bH8E; Fri, 18 Feb 2022 15:40:03 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 31/31] gnu: Add emacs-tree-sitter-langs.
Date: Fri, 18 Feb 2022 14:39:48 +0000
Message-Id: <20220218143948.28989-31-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:gfPn5D495JujHjxoOvXFmlgEwmkgp2xmT7B2kilVOS7G96lQJua
lqADVp3VxDCRuj31rqszRskRjNFpnZDDcSKuphHvIleXA0mZp8B4aUu3kMPsQiCsQVohCoh
omysZKQsGufNbogJNioAaQMjlmoTMnQ+4hm6/QuIoLH5xhoJI0VMmZB7kDFYZKr4cTrL5CP
J7lxialsEZzVNj3fCg++Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:8FKs1noL39Y=:SHgy61yQIvoYdCCSVpq4Ri
HlmNuZY5HGN3cYk6quPbSeSn7IVQZkO4hGqq4as27hSdqjKsQBGo5wPRVkpG3yswqy97LIRGc
sJ7hxJIqFWphHq3jvTUVFesPuUq6CTnNryUDO++h800puv+AB+TCcQm6MZYrVSMmqSg+NLV4W
zjr+J6teJbqSyaHrheZnAXnJRLDAcYZfLveLqzY3g1CaYIHwq7ODh2pjhQzKVae5h9dK1KuFQ
6liN+0TRu7FmDlSOvare9GvNu7D9EwEYs/ymzAUjNFbhI0lUKk4QODzRU1vYZUkjEvwjG14g/
ZcrB1o0Z4np7GoGP1Fct+U9DMOzOouSzfWut0SzmqnJsV3VyNEhmC2vCmfMvSlbXcVrT8nDyY
Vkfk/+TZryHmT58qBgl+vckw42SK0BUVfYARljSF0pLrGTlxLc2fO07vENBCwK0iHgvwec0W9
AleAVaBdhZLQvkIcjQ4r70WTd7HsxdZ+x9Yf39dnnb3e1jehs1GxRg/TeXN4W5/+zS1oGqupE
adxwiGbg9DZTL+ETzURmBUB2m6kfJnzvrCSCw1F1gERTrAHUPhDVKGpPOaHES3eDxcPGdgcfj
LgplbgjJrTsI2A2Ul0gkw5iS7131zoYnRyDDkgfiFn6aQsm4ghwxzXUnpz56jZPahUYnZH/UO
bWJOC3HLlniefzBp03EF8CcvrfSfitqx5rcYuuKGrRZaz/ytf13GXnDSSi+xhEbaUZf0G3xp3
v9CySP7/uef6zpR7rWwio9nuZXMiYGebqRswWroq6z6Cbzu8zOmzmpUgDQ8HPIs/jEmkptnmM
xvJ7Q2DyrCuYJV0BYTTfW3eisPjiyO93xhryZz1i13i9OXGnWgY5zKksAj7dGgOQYZKFL13GX
ourH5T80FGIBX+NY3psq3/rn4WSPBYodRF4KepqfVFbTSzVfnX8Xz83Qv7iCcCfvmsJj+VPor
xjOYX5hDacqflTz8JGsLn848nNtfG/ayCalvDVnVmJ7Z7b13WnfIdWyMy4wwtxBjgodidJYsH
z+vSW5eZNFAbF6rV9T7S4SkSUuMn6O+sV0ZBEurwPSGmC17Po307Rc666L2axKthedSqdUk1o
7WyekP3tTbGM2A=
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-langs-grammar-bundle, emacs-tree-sitter-langs): New variables=
.
=2D--
gnu/packages/tree-sitter.scm | 136 +++++++++++++++++++++++++++++++++++
1 file changed, 136 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 9a427bed7f..d1341a2ddd 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 emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system node)
+ #:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
@@ -950,3 +951,138 @@ (define-public emacs-tree-sitter
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define tree-sitter-langs-grammar-bundle
+ (package
+ (name "tree-sitter-langs-grammar-bundle")
+ (source #f)
+ (version "0.11.3")
+ (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.3")
+ (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
+ "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6")))=
)
+ (build-system emacs-build-system)
+ (inputs
+ (list 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 'remove-cask
+ (lambda _
+ (substitute* "script/test"
+ (("cask") ""))))
+ (add-before 'check 'bundle-for-testing
+ (lambda* (#:key inputs #:allow-other-keys)
+ (delete-file-recursively "bin")
+ (symlink #$tree-sitter-langs-grammar-bundle "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 #$tree-sitter-langs-grammar-bundle
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:16 2022
Received: from localhost ([127.0.0.1]:53859 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VY-0000Cy-Ie
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500
Received: from mout.gmx.net ([212.227.17.20]:57187)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VR-0000BZ-Hf
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195504;
bh=q5l62gBpoZKPzm96+LheJg1Bl/M+i+Ac6q3QvD+szqc=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=i/E20J91zNQMeWbbPDjomVbEqXFQG878f3QbQDcfU7pqNxG7dpRRRneAHJJw7IlEo
hlhjXD5BAVwlxUI9oG25ltDUjtYTDrYxBkz8KOgyYrVT8gA8MTvzdwWDy8OxzEff+2
eh935O1UoGGJ7gKYLoSSp9UTbGDE8gUJqDB4BdwM=
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
1MuDbx-1o8D0Q1n8X-00uaAK; Fri, 18 Feb 2022 15:40:03 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 30/31] gnu: Add emacs-tree-sitter.
Date: Fri, 18 Feb 2022 14:39:47 +0000
Message-Id: <20220218143948.28989-30-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:MxV5QvGp93P623elE5ZMBQYrpfiWCMIDTxk7WkW+TcbZ6bc8/rZ
UuoHzeyFQAYHMm8HF4LSZ04lVrbed6lgGGoYIeSApWu3m3SOWjXESnueb8WzZGuNQzgD6i3
2znDJLWxXkQARvIxhl2ImL2tBsopNEPi4GvfGBL1k4oak2t3yE/2PRjhh/eE2ZxHXwuy37M
I4OFevpNUkT6ikv+IP15w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:YEDNy+sd8ok=:xmV/eyiavms4OVy0GxUcwC
VtocrmbYtBAGcHvdJZYhg8RcbSDr8EGqcwkhDwb/Wiwk4AJD0WlqaR+BIzxVxubkKxqKOznX6
cDnaxrDr1/vuqIXxlKpJLSEt+Wo/WQ3iOZ7N9RCBCr+Md9qnbY19aD4igac26ni07CEnLcSRl
z+fSPLzDydYbz8mIBm1YXZrwprSdftSl7F3xBfpjO7Uucd7DSk6ppefXSFkDgk62aPJFIe20s
0YBpUFuLrDM+n3/M3PzqpmaSJAXq5y/MFp09qEPP5xyc4c95CJUDn4wSe12XZp0+QR4aEnw/v
KHEl6mikm5CWjsnrvTNNm6/BVdvT77YesVKVtrl3vXrDYpvnqB8KbugUNj6FVJUGmy9AquPgu
aw8eHAbHzHXLFWvBHXMjqGpO/8uc/fABqDZ8t9o3iS36XWiBe1KubKuq/vnfPZRfaKknM31pT
0xUQ590szQn7CcouJUUZAMXzydNnCKSGpEpj8Alxas0mEX464qIom7IO3N6iNtV97C3H2e+fC
Rj6rT2FFiUwIASXkY5eBKP1f/zTWIBir6Ehw0HL3DOJlmK1+mTPqaIhepbTyKxFsfHByQHWhG
vSDZilNBwck1LqLhr+JJN6jiutHqS/yXURcgYTZL4p3FmXSIcedrdAD2ElRNDUB8HRmo183Y4
wayonfTNMIo7m4r3KR1OEZDWnzcI7ON1paSU297Pu1hOHX40YB77CczSYQoutEKEKEHyHShaE
DfVs0fySHbVAmfe72Jo+fmbI4McEzc9z86DtLiqAMpRMiM04ddPFZ1mz/LG773ijGySNbYfYw
+aCoEcs23ofIT///Gtc2n3yGjkcReaPRt+cdQtxXUoQCfNFd2JC6MkJAxmHipmowkzmAHetly
avrOv3WyhZVw5IPQYaxSVVcHNB47SThE4agOva1gSx1NP8jb7cX07rY7QJT9pI9WcPwuBZ80g
D20n0ep3v1+u5kX83ii2RxM+VeNx9hf8v0ukxoPjl7h8fAWD5ZIfnFboWArMN5p/V0cbxDArf
BL7Tl0da+Uc1SwXDfqsrxXLMLmWD/jOwYKm+iyO3AxVkLkUdruA9p1Kyh4xi+nAlwss6xsjcz
gp2Qm81PW0pJyQ=
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 e2af7cff5a..9a427bed7f 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -923,3 +923,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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:16 2022
Received: from localhost ([127.0.0.1]:53857 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VY-0000Cq-9U
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500
Received: from mout.gmx.net ([212.227.17.20]:57925)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VR-0000BX-04
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195503;
bh=bgRvxc6JdEOga5uAKCUD3tLNX26XRo1+8bZkYZVisTU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=LmHYKLCkamr9sSc1OonOYvafN+VkoWKjqPe78JUSQpxpjZQhjQ8dSrrxR5qxPiIE8
pzrlDZ537UVw9j4Hr2LnYtC2xgOj59bIigKeyViqWPyqKXoqB6UVJl8Gpf5ewsnGPD
36W/Z0dsTf76uQGqz0vvjKe5Yk3Eo4IOL+cTdUf0=
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
1MkHQX-1o0PX93P9l-00ke04; Fri, 18 Feb 2022 15:40:02 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 28/31] gnu: rust-emacs: Update to 0.18.
Date: Fri, 18 Feb 2022 14:39:45 +0000
Message-Id: <20220218143948.28989-28-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Zb2v4Cocq/DxyQ6WiDSfmRslwGTQiJT6VAZktPjif+m0jWAnu2J
XJgbVpOKE9Zqs3oMQDpCVBopVMkVKxYkL3gvLFZXjPdIeVcm1yyjHmco3fKgiba4tBWs85n
G0IQChyFVrc1RDUlJLfa2cSt1wlu4WlBgwf9bJU+Q2FW4XTecKHSyIvPgA4xCn6TVNO/iC1
yWRzNbGWprqVTygS923yg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:MzZ+ZR3vvAw=:QmmdLG1SVAfmi+GNrUcel0
AG2PtX7TJ8hZDMdw0ywXD74rH1smgTRkZ5SVWlJsNzEtJ9gxhh+pWJdufIgpPV1pnEqQrkzha
LTZITZeJhpNUOq1Ar0R6NoZb1BkWH4FBBIrRE+fQ9NpEF3UMgDIJ6nmcTq7D63uxVBBv9wQ+/
2xka+PfWVmsn9K2sqJBTHq5k7UuMGVvjbxxIoWPJ+fdfm4pMQ27YCxDcOB/o0ugWsBpbfjD2S
OWjaxajkGVm7rMXt8sW+KpvDHcHm/SbKOpfRNmrt9433/NqYPDUU9u+qZyGTV19/GOENh9y/J
NjtK0r9e1O4HbERFiPrTwYNY970m5ouqymrc3fIsWiZX6SNLyTq3FL92eVcHCNjFDRdoN7cfB
8OEbMOhxYP0jkjPc29rpeESCtmxCG93sT0HcjaII7VJC/vrZAUO7HF/+WESFTWaJ+/MkPrwWt
+ANT7kKTYiO0CcrCSzX+DnS+uhVQ0aLWKUa+Wgcw0mD8N+f1kCcV8vcZ5pAgla6aN+8HGi+Rb
+0tYgfzlvr7ei+nvai4Qia8XgwnSB0FfVwWlR4PxRCMxPD/fdlxkgHbIndxNzfAprDmanwiMm
TwME9ncAoR0KpupLOQtcYU0v3eAKpY+eYEvKAiLwwXQjEbJKpHt4bcwCz9yZltiLw3D0oQsdS
LEKX70OML+K9eWxIKLLA66DWYnPur4xsgn4DUgSAT/40Mz+nfcnvrN8+Y2PSGz1Cm5D43E7rZ
eHU+NIBXvtju+kxaeceaWQQM9vceYiHaQCmNdS198kDWYWaKEw6IBE5LyYY5PRhibh4/4MK5I
niq0PjHrWupddDpXZJ0L+7hCr5GQy1sWWuUshPxv0ipwuj2ZL+DlKhoX6f6Wi1YTAovoWV9OD
k1HVzAjAx06plj0nZjkQPcJAJQVsMq9gU2KQErigN/ZXqYFu/z2+CrTrCu3DNtv6KhdJUbdU2
AJsS7UkjkCocsXeJ/HCQI8yBDtmmUjtxtYaew9xgXaVIM1FywuonY5BGL1xFfLP7JrJk3HfmX
6mf71ykmJyzuey8UDBdRaGWj2NoOTS2Qs5O6j+RF2MNkZQwfRir3Lrwpmi71cTzFZGFAslOi3
+vaT/6lYrXOy3g=
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-emacs-0.18): New variable.
(rust-emacs-0.11): Inherit from rust-emacs-0.18.
=2D--
gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 154ad963a5..6c0376c01a 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19045,10 +19045,10 @@ (define-public rust-elf-0.0.10
"This package provides a pure-Rust library for parsing ELF files.")
(license (list license:expat license:asl2.0))))
-(define-public rust-emacs-0.11
+(define-public rust-emacs-0.18
(package
(name "rust-emacs")
- (version "0.11.0")
+ (version "0.18.0")
(source
(origin
(method url-fetch)
@@ -19057,16 +19057,18 @@ (define-public rust-emacs-0.11
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ "0r860i73b2680i2fhdl2l1wwvvmf2zksncpckgkksdcx310ak5v7"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-ctor" ,rust-ctor-0.1)
- ("rust-emacs-macros" ,rust-emacs-macros-0.11)
- ("rust-emacs-module" ,rust-emacs-module-0.10)
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.17)
+ ("rust-emacs-module" ,rust-emacs-module-0.18)
("rust-failure" ,rust-failure-0.1)
("rust-failure-derive" ,rust-failure-derive-0.1)
- ("rust-lazy-static" ,rust-lazy-static-1))))
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-thiserror" ,rust-thiserror-1))))
(inputs
(list clang))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -19076,6 +19078,28 @@ (define-public rust-emacs-0.11
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-0.11
+ (package (inherit rust-emacs-0.18)
+ (name "rust-emacs")
+ (version "0.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.11)
+ ("rust-emacs-module" ,rust-emacs-module-0.10)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-failure-derive" ,rust-failure-derive-0.1)
+ ("rust-lazy-static" ,rust-lazy-static-1))))))
+
(define-public rust-emacs-macros-0.17
(package
(name "rust-emacs-macros")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:16 2022
Received: from localhost ([127.0.0.1]:53855 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VY-0000Cj-0j
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500
Received: from mout.gmx.net ([212.227.17.20]:34767)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VQ-0000BW-N1
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195503;
bh=uzkXAidjpvKCJHj9kZcg66Nx1ec/MCg8eSSHwvOZEnQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=QTdxHDwrVjXYzirJslElrTPPe0xRD/HYrPjrc4kPsTCr6ckJB4ZM2OwBaHryvHHKp
bhKb6PhY2p9t21ADIB7stgHUFlg0Qw6lxpy6CDYztpBp2HkoJCJfuRTQZtMOcywuXK
sa0fTQyrvr0UVyjJxJpfk/qjxrDib36tXMV7KG7Y=
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
1MSKu0-1njIK2281Q-00ShXh; Fri, 18 Feb 2022 15:40:02 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 27/31] gnu: rust-emacs-macros: Update to 0.17.
Date: Fri, 18 Feb 2022 14:39:44 +0000
Message-Id: <20220218143948.28989-27-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Kvd1JuRnQw7XvzPsh4l7oZ/cE+JYscb4TIm/oD8wyovhG03aNm6
5bYiu60Y7VyOGe2IBNtsKlzORWnEYVc6GpnH3LOWPMEfl3vBEYSlLfJqKXAmlwDxO2S18i1
vmoO6K1R+iYhMOc5atL311g0xHLIp9qrczjeBT2SwSvE7fIweV2RNcJX8wvY7lkL5vLRVCz
mQqQEYPhFKUyrpaflGf+A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:5PxUbuHl4Pk=:X06MI92MJ7/ClHqNCVeLE6
o5UHukw9FoWpwzdXm7je6AKFzUmToDqByLKQLtY3DAOxo2h+Vo3jAtephOCntmQt1WI0JDihb
Z8oEf36GNwELpMSG2SZnNf0Jkg/08GnfueUeP2phOwVtaBZSCbIGj5MKZwHvGTpG/hsjbjCX5
2MUoaY2VKayGc0e6Hh8k/bvyHFBbDFe9F6cInuhEM5ytsKMTVFU+/WtP7mcJ9/xaVxGWhBJFy
fuD1n/kfrkx8M4ujtujwRw1yyjNXn7uqSQEd6nR6vtgBFiAhWNFmwU3F/ZYqeuV7Cke+Ap4T1
DLAVRmICPSE5b2SFyjxk60TfFrUCleKMq7dCUfB7SNXWOfOPo/ThyczSWz0YwLlLAz9WJUYF2
N3U1p4XI2WsBkIg5shtL6zLi8mzWKiOaaJY+GpIQ4GODrUdCuf0ReAtlSFbbFz5h8bLdGSfUe
Sl78H3XZqU+5mvc1Uh04u0X4EGOx3m91cb3DZUO7kVpC3g0lBKGgDa/OEw2wBljMBkf66ctLg
HEgSJZ5vjBhv2LwlICKvz3ZwnylhQ6XjxgDUsMjrJaT14zQ54XqdoOgcNCSE3xJkck4xzXcuO
YrGweWo0QziW2QKgnMh8EUmvtSeh4xHIclvFKeTVekylpMDRcUs3C2pZ2GMYisGNqJl2o+uj/
XQd38b5GFhO8x3z9UJ5IkpWzT+JM9ehjMu9JLI9LOEw26gQ8U3T5MF/DzdrNJYtL9gEuh+3xF
Lvm6XfLapKj+SoZHsrmi1CD7OJXR9b+vWkp6AcFnSjjZhEfC+8JLWATo6kaDwXCapndxqy1ev
PekMT12g9R1hpJiLD1HoiNesNA0oi3G2YaziqLNG2JnAX9mEq3i8VKMTC6+UbInmjSYnRS5at
IrMEigwM3dEKnManW3aj61/GbGAscHRKE/hhTpdhv1C6x7AHsKO1jkGiuatXRPj7Vgo0zoe+g
VauMHECWuq0hXOgBUP03h/4QjWL1n3dQN1gUoK5NNzuQhk+1rfjWh7ajrzJw3CBYCPMhADKPD
ZoFmIPe4sjFbV6okKoJYn5kwQTp/rV2e+pYSi0vS7j1/Dgv9bYNxCT5sbi24+Tg9H+iV0Mero
WAmqSvmPa22Nlw=
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-emacs-macros-0.17): New variable.
(rust-emacs-macros-0.11): Inherit from rust-emacs-macros-0.17.
=2D--
gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 23444f1e7b..154ad963a5 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19076,8 +19076,31 @@ (define-public rust-emacs-0.11
Emacs' support for dynamic modules.")
(license license:bsd-3)))
-(define-public rust-emacs-macros-0.11
+(define-public rust-emacs-macros-0.17
(package
+ (name "rust-emacs-macros")
+ (version "0.17.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qg1dcn5acbirq617qq2fgg9adswif2dnr292s3qnq62wzgnyrb9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-darling" ,rust-darling-0.10)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/ubolonton/emacs-module-rs")
+ (synopsis "Proc macros for Emacs modules")
+ (description "This package provides proc macros for Emacs modules.")
+ (license license:bsd-3)))
+
+(define-public rust-emacs-macros-0.11
+ (package (inherit rust-emacs-macros-0.17)
(name "rust-emacs-macros")
(version "0.11.0")
(source
@@ -19089,16 +19112,11 @@ (define-public rust-emacs-macros-0.11
(sha256
(base32
"0390y8vafxdi334hhgrzvcqjq3n5ckcmvilqcfp8vajjq8irrly6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-darling" ,rust-darling-0.9)
("rust-quote" ,rust-quote-0.6)
- ("rust-syn" ,rust-syn-0.15))))
- (home-page "https://github.com/ubolonton/emacs-module-rs")
- (synopsis "Proc macros for Emacs modules")
- (description "This package provides proc macros for Emacs modules.")
- (license license:bsd-3)))
+ ("rust-syn" ,rust-syn-0.15))))))
(define-public rust-emacs-module-0.18
(package
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:16 2022
Received: from localhost ([127.0.0.1]:53853 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VX-0000Cb-Bu
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:15 -0500
Received: from mout.gmx.net ([212.227.17.22]:49327)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VQ-0000BU-LT
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195502;
bh=t6GcbpfJsTEUh0uqMEnAVGdtZAU4rJJ3B/CJ7mwhhFE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=VaCMCnOaXolgoXKHdua5X7tHxF1iPHpf09DRRD6tCvNYxECRdD0umRUYH/TxCELHo
QokVI15m+8qe62ZSOS6yDtaJJvqxzmJNBTmdpQaL4vaGmM2m44Aa0JdeAWIfJZpzma
qXZ46pX3482imTnfF3/kveIyBmtThOcSH+0ur00M=
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
1MMGNC-1nb56t3nJ0-00JKfr; Fri, 18 Feb 2022 15:40:02 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 25/31] gnu: Add rust-tree-sitter-for-emacs.
Date: Fri, 18 Feb 2022 14:39:42 +0000
Message-Id: <20220218143948.28989-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:jDwuDTG87g1DDlihetmQfsiJxQo35NxMz38bvSlH3jEymD54i3B
6U1mrkDESvSKzatNJIkSYDqdp9+8lmpaYgAyVnv3tU6g/KpCrlEDb1e3feVuAsMv17wjMgM
qlpcTlr7d8Qnz3FnkcbXYuHriYtjUUB0KtOI/4mRPre62wC6vBKLzKGau/0EagHay7gAICX
UENrC2lq1JqAKKmM+8Miw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jZSA774ahfs=:kUirvADLJ3ahqm8aUG0ylu
85o53qlnUqxmaSK7jJFRmHrbmzvygABa105tYeRym4Zbwpzz7Tqpte36E2wFRJX98+87rMtgz
NMJzeYnDOqJBGHcc6Oy+GbD7m++seQHBPgZQj5otOtlX8NCPuxvGKmwdN61cFblgeGivqZiAr
xcyxr0F3KW7wxFp6b7RWPzEz4H9EPCX+u46/taDdiwKkigbVM6WNNzqCjzE1HArNUvTLgRk4r
AQvcAytCL6QPHNG9XWW9INaJcMutJMV8texw300c0sRbHvUgjZn3ZsZoq2mgEO4lj2chAlpW6
WvqYjmjIxOHOrLxrSyGSHxForQm2tfXZHc+vfodqRJH8ygObhLO77V1oJ0NPKH8Ok/oOqteLT
4VDjagDQPD+lrtBjpKpW6vNJK89pAljwCnxZ8NOpUX8HkUJrJX0/aIYXiibxekY5lDbQfwEPh
/yMLQR3wE1e6iIXPLrAQ2o18KeojX30UcouZprFsYbMRFA7I2yUGvsd3vAdC4bnVeEgLvfL00
3FSYvrJWdu5wH1Y1TtBdSaXCO2oyxFQsNcdGI5GRg21tTt241l4QH0nDuBuMbDwD2dHRyEYEy
4B1BHM9jZdXsj/D0J3tGlqFp+E6lbXq748/HK63dN0aw6Xss2GMbT10s/QhOI1COEkmXA9gMp
kKWKHYSQZuCfqrvOeWT/2Nw8C2AkNsprtcBaO2+YtGc6LZlOd6HAIK8Z//AlvhDY0FB+Vaw1/
jKqy+1cUaCufN7G7D96ZmEdpZtDHv4Gxxyp24GRNR95LJAS9hFMsK71e+xYjjkyfwzguh0bmP
70D0ScEWppahuIIdHX0bXPBEeKFiaSx0l1J7axkK21QYVe02inma8AnKNHebpD84n0Z3dvPN4
N2Fl93CaH1PU7oUjWDnfu91nAcUpIPg/6dub3FRRwYaVPoJp6MUZLirSV388kPBVi17quuNzK
S/SMub3jxthop92zVd2X6C3vWJrJapBim2U4/iqCvPrBZrWN8CkePYdQ41CDhZzddRjdjU3mz
3fgj2qnpQfUUpOzGRc4QVkA99Z5NQDlTa8Rz66G2asiOcx70D0DtWnMmiuYBv5rWAVVBSPaCp
SnMysmARExQQ7I=
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 | 45 +++++++++
3 files changed, 144 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 97ab160c3c..0c113956d3 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1775,6 +1775,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..beda2d8391
=2D-- /dev/null
+++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
@@ -0,0 +1,98 @@
+From 475b822f47bdc58d832533448b6f6d9818554f37 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 068a60285..79c3991ed 100644
+--- a/binding_rust/lib.rs
++++ b/binding_rust/lib.rs
+@@ -8,6 +8,7 @@ pub mod allocations;
+ use std::os::unix::io::AsRawFd;
+
+ use std::{
++ borrow::Cow,
+ char, error,
+ ffi::CStr,
+ fmt, hash, iter,
+@@ -162,7 +163,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;
+ }
+
+@@ -1799,19 +1801,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
+ }
+@@ -1835,7 +1837,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ TextPredicate::CaptureMatchString(i, r, is_positive) =3D=
> {
+ let node =3D self.nodes_for_capture_index(*i).next()=
.unwrap();
+ let text =3D get_text(buffer1, text_provider.text(no=
de));
+- r.is_match(text) =3D=3D *is_positive
++ r.is_match(&text) =3D=3D *is_positive
+ }
+ })
+ }
+@@ -1946,23 +1948,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 309b38386d..3c8b4588c4 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -22,9 +22,11 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system node)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
@@ -150,6 +152,49 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(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
+ (name "rust-tree-sitter")
+ (version "0.20.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1yg4p54hsfsxxknjq492i8b4rvibzpl2zdvr2bwvwakqgah05v33"))
+ (patches (search-patches "rust-tree-sitter-text-provider-fix.patc=
h"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Force
+ (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-sitter\");=
~@
+ }~%")))
+ #f))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(#:tests? #f ;; Running tests misinterprets comments as doc-tests.
+ #: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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:15 2022
Received: from localhost ([127.0.0.1]:53851 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VX-0000CX-31
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:15 -0500
Received: from mout.gmx.net ([212.227.17.22]:49467)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VQ-0000BV-LS
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195502;
bh=vdPZJI9kZoVgEVxJNUixQWXLVKjE7gGyNAHsrmWO1bU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=S9Hl/7ZV56womSOOEUZTjgd5+47tvWeOIg7M409AzzJWCFSyTSrK91rVJTQD0PpiL
zOh0lWgj1atct/wyJcRsZIDq3E1NT9NNi6pfnjS4/zw0iRD2PPBU+b4eOlq9IXXhsn
nWJM1cCMm2UQOfIpK0rF9hyxkGRhlRyT43CZcj1k=
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
1MtwUm-1o8U7a0sOa-00uJ3B; Fri, 18 Feb 2022 15:40:02 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 26/31] gnu: rust-emacs-module: Update to 0.18.
Date: Fri, 18 Feb 2022 14:39:43 +0000
Message-Id: <20220218143948.28989-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:l4617jFVMJSCWrybiFXK2Z+poNepJwzirJAsBcqsOmqrs+DFwvv
B+U6ZVZLVuXg//7RXOpnvIaREwnb8E2q6u0QwjpTuaDB6UPX+t7wqrWakf1lDBw+hCHxwG2
7j+OQAmy7/kDY0s0KB+lGMaQAx8BM3g3Hkwtl2OdTPVcO3BEs00sbS0xeXFOFb6gnGDFD4w
RbgceJ0bOVbqYCI8w9GuA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:IJjg7y4iohA=:d+EJQjm7B9rjZhBZtOgd8B
UOfBtA7Eeq1H8pPcVF0fAK2jPFT87TNRpbXn2wa+CR/BspGFw79FqDHN8wnfn7nUj57riOj8/
SQYcGg1eZQVhOpI3aofOEoDoF8aAFcvCgeq0aisLsqDRS+4K1po4GywZregn9SURl9SQ4m2Fs
KpeVeiCXatqfsKj1NguswsH8Rb65FdSlzQyNctaujElAmuUlFK29yAWqPd3XP3yRyOmLsJZuY
FgPEZwan+9Zl7KzZ7Qa1a9qPWV4OtX4q7aZ1xdEhJm/aYz8uEGobexRmRroyB1ZIBIdbmi7S7
wwTX1QaToD0csuvDj15kio6fL7g9BUhusRSl/tCMr4frs0liIGN9U33zB1keMt6WET+gu5aYp
rM4h+3n+oBlqev4cLjnKy/qOjNF3nuBgzj6iHTbH7CHbesmbxJZW5CjHkTmPvCFyS0pPQw8tr
SBUYH+pZIeLe4hRfUKIWm4hTH7qX/hyponShrYA1/pbvZZKr3bKfSG73BF2+g4Y1d+gaffiE0
grZ9XSiI7GrHOjJ9oP2hIK//gh+V2npSC+MkLwsjtiD14QsD5xCu2j46oc2nu/Al9Xi7+H0sK
srYU8Y+VFXpUcDQSJeoCx5tQ/AJ39mFqv3PdMlIbKU3VLg6yceWW8Fm8PAbMEiHRXViM6kn82
/Vo3n9h/gQDq54/YijnY6ql8VOXcWAB/ZGU4XvwSFp93qBWLzCPCwQtK+ayYrfZ8oAOEMuuJw
jFoWDBsxQmdSa3LxOoApalRSzubQfFxGFo1/D5Xurzx/f0OpPWYoh8EZTPLN1FcBtX8n3ynMG
bKDa55xeXlGJ3AtR1mlqKTgLJVKU1TMWy48ot4Nz2Z/eC/DWrzEY5IDIYYwKocYEQmu8d8QnN
3sZp8GDzUtJwbwxlwj9pQjF1+X/aBgbONNlTIIW4NL75qSiDsFJMOiz6Rv0J0CKwBoaQI/yoU
ayL54J9uAOqegLoX2seDH32qOp7g55SJ6osips2m382dfPQ22KQyyCxS2+eH5uIuOon+H00un
f6rpk7p5yYQ7Urs+4CacHVFi7kHc07mPYVWOBJYokF2pKxuhtudKxh6/GLxvgbebtyDFqFac8
tSzxOb+0S8x/5I=
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-emacs-module-0.18): New variable.
(rust-emacs-module-0.10): Inherit from rust-emacs-module-0.18.
=2D--
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a4bd79607c..23444f1e7b 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19100,10 +19100,10 @@ (define-public rust-emacs-macros-0.11
(description "This package provides proc macros for Emacs modules.")
(license license:bsd-3)))
-(define-public rust-emacs-module-0.10
+(define-public rust-emacs-module-0.18
(package
(name "rust-emacs-module")
- (version "0.10.0")
+ (version "0.18.0")
(source
(origin
(method url-fetch)
@@ -19112,11 +19112,11 @@ (define-public rust-emacs-module-0.10
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ "1ypjyyv2ca3vza4sia91ckxamgfk63yd8frkvg3d4ph4fk4pn1mk"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bindgen" ,rust-bindgen-0.48))))
+ (("rust-bindgen" ,rust-bindgen-0.59))))
(inputs
(list clang))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -19125,6 +19125,23 @@ (define-public rust-emacs-module-0.10
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-module-0.10
+ (package (inherit rust-emacs-module-0.18)
+ (name "rust-emacs-module")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs_module" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.48))))))
+
(define-public rust-email-0.0.20
(package
(name "rust-email")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:45:11 2022
Received: from localhost ([127.0.0.1]:53848 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4VS-0000C4-D7
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:11 -0500
Received: from mout.gmx.net ([212.227.17.21]:45019)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4VQ-0000BR-KB
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195502;
bh=7AAmr7vo0scDJJ7QeOojM5YXFaeb+R3sAw08rGkoRaQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=DO6f+/NYy3qCWjmCZvpyojqpfCUZHA/CwcSocwuYQTSOqx91ppiBw360XzCxNB7BC
H5uTIpdIAWu21Hju85nsRfpbs+ond2i36HajIwNJWfbKssHJPAlbMtPidxc5gtX0x/
BmLtCS8lm0s7DAOkVtKwDAcANPdTe7SUhE4OWkTY=
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
1N49lJ-1oKHpY2XxZ-0107YK; Fri, 18 Feb 2022 15:40:01 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 24/31] gnu: Add tree-sitter-typescript.
Date: Fri, 18 Feb 2022 14:39:41 +0000
Message-Id: <20220218143948.28989-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:AE9ZCNgbpudma1Q/fqvBbsKQa/+Ze2crH0GmB6bFBi2Wp7l8Kbp
rQ/p86n5ruW29A8pxCY38bR+zsT1NFUhYCiExNyw370hkM9Jf3B4RpJWfgCbRQJWENsttq8
YDHpp8aL6tP6OntW0snHEznOz2o04YhcKoN7fpnDLBXCgG+vE15D94JsebreA8xtdPT1tPy
DZTzLOQNzepGvTt38MKfw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:QEvJ2zak6Vs=:0H+wCd8fCbIIyg8+HIKD0X
JP61lwLp951VaFtJ4Q7MYH2dXQK7zd3aIeD+aCzgHqKhHqeOKFE8rl+j4y8LDit5Cx4iWNhL9
mRVlXgmJfJGFIzyyl5QkjgL8VXsIyVx0NCzA4/J/wrreee3ai1Y9edny9rTZVjVp0t7QnIL9Y
6HL0HdgcAFajlRlja3MYV/ttWuc83JLoj4wdcTSGltTk5MNCamgqJWnUldU0umqKRNBYniMr4
//IvBvm+SWb2ngGhQyr/PC9plRb97PCDFWjg1/imCTdPYHt2Vd6LWX5+sJ6WPTMgffSpBlUHT
+i/7M1q/XikKoubTGxwboq1Sj7+wtinkNpBDaUnvCwXR+utXNBXSf5bZL+rdi8mOIHMDwPzRj
SwmdmL5thyoy9TjQqBaMlpmVUoMpqpK4B/2rLlq91tqzHPazC/O3vJvqEgAcfb5aiPfZNgRsx
AKE3nPRDyfO6kb57jfROFxA3x3mAvSF/+Ho5ZCh71k7ZH/yUOerrwp7v4EU/1R2y11L6V7F7D
pJdapDTbZMfV+BpR0NZZ8ok/2fWUkONEnmyiaioiQb0zIDIGWASHCnd2cK3zay/bkhcib0RWq
/nZqOVVYXP+fMhsAQWZghj+MEAqJvJKwa2STObbT+Ks3RI0UK/pdtGJ0x759PdAJBcgtbl12N
J7cUbAgBYCMDrd/Ezgqz7JWqYeuiWcVnnGygVmGFZh7sO/uavdJohdTE8w36uKGGOuaAiNoGN
Ter2OCVMd558rKe9fWnq7mbG+15vHC9x0ySAKr4dSm6n2BGE7cEcj9PQsbWmyJHkVupMuUBeO
lgnD+hsAz8euUTm9k/gOosBecB0vIknfqIuPooY5CKtu3RnjPwGbxgY/Zur5gSzIK32h+r4Hr
IFLbDt/IeG8ySrtiy+Yk6pMgdSJsJlnRpPcxb3p4S6cCd4kpochqjFkKUlGJCzdvm4UAQT2Sz
RAtAXzu/zzCNvsY3lMbBIOlFDIOJ3PWNgoyNMgH5p/3NwfxEfB5VK5311eMqD1qOhtKxjR2rk
kiApL6RSndhKfZF/IodeUJqjWlKZ/95c52oHpNbS11yuM8fS3VzRH8EwG1O3dVfh4g52+TNK/
f6IfUWqhdp2UNA=
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 | 69 ++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f4df5c5335..309b38386d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -731,3 +731,72 @@ (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 (inherit tree-sitter-c)
+ (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))))
+ (inputs
+ (list `(,tree-sitter-javascript "js")))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'build
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "generate" "--no-bin=
dings")))
+ '("typescript" "tsx"))))
+ (replace 'check
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "test")))
+ '("typescript" "tsx"))))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib/tree-sitter/"))=
)
+ (mkdir-p lib)
+ (for-each
+ (lambda (lang)
+ (invoke #$(cxx-for-target)
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" (string-append lib "/" lang ".so")
+ "-xc" (string-append lang "/src/scanner.c")
+ "-xc" (string-append lang "/src/parser.c"))=
)
+ '("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-s=
itter
+library.")
+ (license license:expat))))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:44 2022
Received: from localhost ([127.0.0.1]:53814 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4RA-0008TT-D3
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:44 -0500
Received: from mout.gmx.net ([212.227.17.20]:46321)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4Qb-0008Oj-1W
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195203;
bh=cukqLcW6uKn3dPWx96V13WQFcXG12qWspdYi4xGzZJA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=NR/0FHex2OGX8JS7GaFsyLh1qMpRZ6+psT2r/mSq3KdFygj8t91QSsig6oIB5e1jC
Zqc+7rbBHrdh0uFA8PRFQcmyw4mwXT43BFLkKKFcrsQSiv8Dv8zRfsSfiGlFpB8IHX
kwkttkb459/lOwrG6o39KxnOOO4rvyzXH4oEtvys=
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
1MVvPJ-1nk7fS0WG5-00RtGK; Fri, 18 Feb 2022 15:40:03 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 29/31] gnu: Add emacs-tree-sitter-core.
Date: Fri, 18 Feb 2022 14:39:46 +0000
Message-Id: <20220218143948.28989-29-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:MYZF7sULy9f7dK8yq+UxzRTIGIF/jrw1rlSglA7w/OdCgo0zELl
dFe3w240l3CDkT27HPPMfnARsc5F5abfCR/ohf1TWNZ2c5/RjznYnbXg3/RZ2rzhJwYu8Fp
7ykBO24i1RA9zOKdq1Ey8OeJiuEyvLw5jrKLITpnp2WOy4Wowcn/RUztG7ZtBuhLmQSMtFM
nLFBqOMX+105qN8eso/Vg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:AvfX5kt2c/U=:AdpzBRw1B7pHoby8XWgQrZ
/V+YDmkaX+V8oK2T/wRab2yTRDUyQ3ugfPfmKuqcjbGiPCng+HznTI1gW+hvcZ6MqDp4xvsEf
gzZpEHm/vHQihkxlSdATUNVirmwBM2GD5b0rY1Ql5Pyldl43O5br5mR3xfTmTwtgFFs6xiZgk
KAYoY8Kzw1BTq+xnvRkR5YHzEv1HCm5r0hzH+4ANfsnP5ocW97SScevXyiOppH80Ig/26kWIq
Gxue8qzvEd0OLn0Gg5rmeJCjitNoJE2sb0efDuPmQqfYKldKpzWuAiSB314eEkQZAbaBYX9OH
j/0m5GoyMxGaIhc47vfemcJrycJdgRfijBMTZx/nSqEZTAWoj65ERkgs4noOrFt5JhW1XmvBz
DXLn4manQ2ovaZO6viutCTmHMyGS7WIabxHLB7ooby/OqmVec85RbsKJx00eCw4m3dmHOHIN5
GeXtFecfWPZ8dV4WOw2aLk/K3ctb/1JPrLGFA4Mc93JpNjEFDRVni7S4Zp3zgyatKt6+nk8Cw
mJRLsfYJdeahQMxU7twk8x1IT5rxWfDCkmYIS0FIKkfUJ5Rmv/Jxv/bIDMkAhiAl6hLj3jFqE
u4Iu/SIDHHVw54vdwKUAdAgugeqnDa0LBMPLDzbhxuOYC9OXkNvIloMuk2YtZXqdG1iHPvw2x
K1nOBJ91JVvidU273kVSab4j59XOEVyVq1lse5cn69G53/GUhdtY+Q/5OzY+s5U61V5lpervE
G8/MWYrlEEN5zOX9ggdtLixW186rID+7fA3+CCUxkk0qQQMqNz4uQPz2Lbkpy5bNvvZgEjhNp
9WngKbmiIbtq0uf4Cu8B8xrNYEbwvVUw6nDi//p4YFgQ9lzPuj3KtSEPY1iQkaFkWjhlRx4AU
LGZA1R/ZCZLKnNF+oNOPGhFMVfExo1kJ4z4mMLFmPIN0ZeH0s6SwaZTLLTB6mV3Wto1BWAyxK
0qH+16PbVR+Vd8VbhEI/peTMf8Qt+qBpEHIzygk7XylDAsDt6HMGLL8KjpYPy4r2AJCo/NuSL
QyCz6Nqfbi4bQhtFfKmqCi24N2m6HONcMRZ8ErTwd94R10OlnFgQFCJIfFox4eWQGDMpW5OVV
Wa/Fplhjpw1PHI=
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 3c8b4588c4..e2af7cff5a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,6 +20,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 node)
#:use-module (guix download)
@@ -845,3 +846,80 @@ (define-public tree-sitter-typescript
"This package provides Typescript and TSX grammars for the Tree-s=
itter
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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:44 2022
Received: from localhost ([127.0.0.1]:53812 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4RA-0008TM-0K
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:44 -0500
Received: from mout.gmx.net ([212.227.17.20]:57007)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QZ-0008OI-6e
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195201;
bh=PqHFfoXzwIj9gC6v2bUUnfpIGvrN1B2QtpMAp9GgQBk=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=OEKN9hNbzW1F+7STHUUeDmi8k7VlSXL4iDhJZnTvr9oeQn0bb6ix5Jg3+9mZQHXEX
Xga30UcZ3BxVRfi4RsDucyBeoMVitnzHqIuPzFxYN5KtwNDqQ5RRq8+l9TS3rWc6k6
nMR7OJSpdWmLGSrxfCbTL5QVVYlOrDO1X5g9427k=
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
1MirjY-1nxRWH1HHw-00erd3; Fri, 18 Feb 2022 15:40:01 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 23/31] gnu: Add tree-sitter-rust.
Date: Fri, 18 Feb 2022 14:39:40 +0000
Message-Id: <20220218143948.28989-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:31dLGtFUaBz8QV23qB6s8XsijKzrGYx3HSpKVYFsvnFBHI3Soeg
XHi7sNxu0F4SqlObreQz2nrWg/XF+G3I6PY3eC4i8iW1rBQGwA8KLeoolR/8vscHqT/F+E0
ZXP0qImkNrw287hXZOjTvQ4GoW7fsxaP7aHIoSZv9QBELzrGzA18xA+290IVy+MyDlxhA1f
e9oHUAMch8u6W3F9WTPSw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:S4wp09nEGPY=:/5o1cSuU9Y/PhuQAaMTmhN
YVEPPpqmkEQRQOXe/ebcdqKjFVfWkNdhDTLiu9B3ieZgbalygkZAwr4AQget+IlPkmlAvH5ix
K0oxrKGu2Y3m3M0Mx73mcHu2l91BRTx+kHWdNHdqyZAJv3K2Mn3QuSWf8UX44Z2gtyjP2VHcr
+UN6AojIU8t4JPBKNlzIGfGunSZlXjADBYdcikW6v5Iv0GfqjN8OxxtVBXF2UGI96MSzf1bLw
JvLUGOkiflHVLe8YbpsFKn7Cr2Ev3ivnWBoJNQ14GUqFfcnrW7ABuEZxwvWiBvqQ4t3gd8nDn
qnsiohqlMKetYNjxQd4PTN2jeK1fwbDFglTGJGUlBBhSMCDokTpyw2ujmigjNyrPrvfGmSh2O
HfULCKhVyMcKuJZWj6/JZsJzq3Uqo4F2o1dc/gII+1dHp0m7nudT0ffpHs++hkt4A68k3HXdd
fXZLm/Xf1EPNUoH08/CpZ6qSbC94GtJnImkQPx8ZvKGuGmo+NClMu20nROoVABKZ/FAVRf/nh
jcbxVWtDTrQnhXpWrvq8XU+/c3jslDQCqzG0o/LZ3Mt+WD5KOWuhjqQjXNn67vojFrEIRtohd
FTKtwXP2+XvwXvAX13ABL292FsQJy5q9y3pA2sQ78IN0yC4Ml89J3bR41bOHmJtc+19W+vsNq
Pc16QYZf2KiWhHy2Qk6QBDrBsKaer/KWG8A85yVgyLDpdJ0hs+Ouj0XpQ1572ZaWjFmY7OtG3
CTRepDnAS94OMf/Tu0XxoXhGGgcXIeozWjHLZXT3jeqGhC0WVUiwCcaL84DOJ7hAQJNkX8c4a
Monm0+p5kjwYj08N8n5vbNQkVYnb+5fbPWy3Wy2O/JxRt5wEt8cue3bWH66LjilYvTDaLo/c9
J4NaWdfqRlQzk7iKYdZefh/jmyuEhBTfDM5YjfNCkn1vIeRQ9UI/gBw3l/xoODjAOk7W/u1Vh
LbnDMo8HZ3FnjlzG79zmRqiEz0mR5SaiYe39+bpM60OwM/c/MmCurkZLhM5kkyIX7w/XtlrEE
7U5SMeYhHq2bIHaf3sRNzsBOt7M8KrUIkHLSuXtvDH1tW7MJGNEG4jBe/0/xUHldXC2nkotTd
tEWfrANdZBwVfs=
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 | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 6fc9a0c91a..f4df5c5335 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -25,6 +25,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages icu4c))
@@ -706,3 +707,27 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (native-inputs
+ (modify-inputs (package-native-inputs tree-sitter-c)
+ (prepend bc)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:44 2022
Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R9-0008TE-L3
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500
Received: from mout.gmx.net ([212.227.17.20]:46809)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QY-0008OG-TW
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195201;
bh=dBBgBvkWthiEN6iNvJpZXCK216Xa+ZU2nTsDnV6s6Vg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eGQVps0OiTdKrixrcB4QZ8k6xG1qgRGimTzDBGsEyXvvSlJCtyOohf9mmv2+cI8kg
iCyAVJRf2QxUShpy5UoObfxcIRTTGqm6uSbVOgRR0WlfyGyiIrONsxsHZR/weFPud6
qLW1ilBLu1DxExOzMMTzaEmySv7Te0g8KqjPNE0A=
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
1M9o21-1nO6hY01bR-005nzc; Fri, 18 Feb 2022 15:40:01 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 22/31] gnu: Add tree-sitter-ruby.
Date: Fri, 18 Feb 2022 14:39:39 +0000
Message-Id: <20220218143948.28989-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:bacu7K91GMa64ktG5DX5ubN/5f3/5ztN0wmc4nozDAmbt8X1dlN
JFvvg505TsdEuN88NPbcyoUCzNUfMzRZght2D3Z/yp5m2TdICEneqIvQh3gsP4DYrw8oklP
whdy3JTicYg+b4qLjcbLe3/MX9Ra1DhNU8+tg85J4GWBMOojLCXM6Z8EcYOpBBWnMNN+tkQ
UE0TWqwyzS41geQj5Lslg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:7/1fb7e0mLY=:6PScilyz+NQLc85547jGkf
unewJ9fyU/bUDzyb8bX0wNCIJMF898DznBwqYLoJLjqUnD3nbMA3/FHyH08BUqEdo5RrWklzk
A+NRInNSlGte8N8c4mnnTShmMxO93+vCUk8raSGagQV1cJ5NAp09F+aZZGx1WSp65Tn9cB5kO
UHybC/MJhcMgTOp7yt20gt5Z1wlFB6T3beFI61UFO9EEGeTJStz7nm5dZtCgvF/V4TaWHZ4nn
EgqlfH/Q//A3HJlxZzoVX17YG50jL0NQ+aYrjHlSExhDJIWHkDtmEbEYP2W7rGujeRVop+n9t
eFflr0yeG/ol+k3bZrWkyY8y7NbE1O02Bv5BApJGIpb0n9YK/PxbBpcEskhWD/dMew2TqREVh
mdQwgny0kQdcyq81Eo11WE45BIggfYOfU5wmTx6WINjc7zH45y1fe/paUi97SWku+bfuaNW9I
drO8QHtn9J0wzTvWsk6nEpQwnauckPYYI+Dq48bA1wE/y/DjArQmXya6ae7PM3EcWl/Wr1kB8
YTUilFmXgi0Lvsh54hrkKinBcD7EWPN13KDF20hfPFFltNa7kE525ifMWT1RhnK4CUEVRV66d
VzZUssdXfN8iyj+XZTHokoOJkZatl2b7fzaLrmb60bLS9z5xbrHGjNvOnwD2dEWHUYNRx+7Tp
SdSZnQZSfM3qxQ9raZDtk+ktVgMTLwv7K6Se8+dE7Cb5STWbQ1rWySvnHQb/13tooO1ml46R8
KW2a7B/DNiKJaw/gKALYEQVBiDSEixK1K2znBTBs1taYfHO7DcThTgIULN9sJ2r1lDVuzEXrv
f05Tb2X72fWzTrp7d/OmaMMxbjHxyKJlQUAZzgBCmGAiK1Imi6m4GNE8ehVTa2OITP6f64nmR
sk9fPOwO8wsB5zr5nIgmiY8gfZ3PSTCr6mBdeqNCI67z64KXQiS7z3hcmV1lTy2WVQakzDOkO
ruIaY31HShJqMujHJx4fH0sS7GAKpw5x6yK7IDT9XojOI35JzC+LQWTvTGVkj+Uwg+5vAOGmb
iKABmpkBcclPE6v9N0wHMavFmsPtzU4qXVWV3SOWh3UzGzAGHbTJtRWYtXErsX6c4V4cWuqJ6
rDakEjMsFm2w8w=
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 | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index cecce9af50..6fc9a0c91a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -674,3 +674,35 @@ (define-public tree-sitter-python
(description
"This package provides a Python grammar for the Tree-sitter librar=
y.")
(license license:expat))))
+
+(define-public tree-sitter-ruby
+ (package (inherit tree-sitter-c)
+ (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)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "nan"
+ "node-gyp"
+ "prebuild"
+ "prebuild-install"))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:43 2022
Received: from localhost ([127.0.0.1]:53808 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R9-0008T7-9t
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500
Received: from mout.gmx.net ([212.227.17.22]:50687)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QY-0008O3-JI
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195200;
bh=HQE6RfKRkML5WrNo2X1EFl6xFkux7yBjGX4uVG8jOxM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=je/Vq0uqmmswpNaBmK0bp30TJ3YhLuLOr9CnoLKyo8ldxIziHluE//O2YedCEb0ot
z59ZmDyq2dETHNKXnjKajs+ARek2BOqfEWi6L5j6Eq5DHcPK6iju5dndINJa1KuQqU
YFKlc36DSi9SrBxHEKqMXnH2UrIsbIzCZ31RmhUY=
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
1MdvmY-1nsTR82xyY-00b015; Fri, 18 Feb 2022 15:40:00 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 21/31] gnu: Add tree-sitter-python.
Date: Fri, 18 Feb 2022 14:39:38 +0000
Message-Id: <20220218143948.28989-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:kb38W1NsIJsIhnJBfPRe3ad8c/1Ro06mLIgPxgV/JU8TyNViWmz
GyTLb8JxfIDlbXqwjhGmHpQGnbeWR5ImuGsyk2sGvi+W0Mif0pODFVWKw5yFS4Ohz/Na8j0
r903cOxOHp1eo7jU1+sZPonpB7vUxoJYHst0PULv/0XAAAQJzargfDuYS0F+J61e/S+F7Lc
FkO7pjWJcbtCFhrNre3sQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jwu81+EXegA=:K0HajytcYvmWXR4tlejv4L
2R3y8bSlPQ+f4SnIoz8D+j1X3ziUiIUCIt6jStrzoRk3DXjubb2nBBAZxG957xrpeA4ad9H+D
8CU/ET0L+gSjxHTqzrUz/5zmxgD9CVKZwKu0/xd7RvsCgg2lCaEKhAmadVpyGcnpbWv/9GoWp
JaBu7Y0qfpyL42I/SnEASi4aoGKuryyooMMb1z8C0arDthFGxG0vL+xW9mF2ouqZnvZiwCR4u
l8WpF1Jlapi8ePa1V+W/rIDzh55MJTeotrI5fq9g7IrLl+b15lPbEwNMXvzbM5n6jEkHIDawv
EA+UbqEWVFtmMVcCUWuAQRao3ep4z7/K8KH3pLwKBtaJf+dEbmEHhX8MZ+GvQCN7uvyRpL+kf
M1B/8Uabkxn+k1Hfz7JQOKGiDvV2w0MaIfGshAwiS5oceGaMwQxpeVML0IuK1YgvYIqB/RIOM
0w5qNQ0xWjCX4IYIvztprqJKpHDMt7XuiuOaIGD9xIJOi3X5+CIwPS+0MbwccCH29YNG159M4
3T7IAKa8j6dEYTv5z0ahOyIOVK7SbMdf3Sevahv+Wpo0SWkrkvymxzpsghD9n+3EBgC0XkJrn
QkFPpUbSZFZBDavuaY+NqIj/N8PViIQ+Kce63ER0gqcG9rpnU98IuLovVHKKNTRBfIiMpLTDS
d5FVyrE1QZuOkOVGl7LGJCuoc0zzCi4763bG6xEVahi4sAGfki3INylS0MsdrOadm2xN0MAjp
cov8lidiWUr6ZN/puht5tEsSD6QaQ0LgHAAoP9NQlbB+4cwpmpoUwcL2c8KRrOkRWO+7nSN+Z
1ItKZn0XZ4ZbZnQTJRNWjdmBF3/M7AbcKeeaHjS6V3JYhNGbcy8Hvk7GJY82AhhVVlLXzYy0S
xAf9nnHFIDlKtXbk6YzJGx2DX+3mH6pPN1deXx9DZpUFKk/LZREaxk5/Zj1kTGmWxieknHM/P
PARHVaM5oWpqTTy2/0aPhxHirdLpEPbx2ZpEmkGhKr0H7yaFfzgaj0zO1G3JvyJcRh7NNRZ9H
4PrUmmk+brLgo2IVYyDaWjiKtdgBuxY4L1tAU5KhIPxZPBtb7kXywUvVrU9ccWcz7ihlIwPuX
sUstS3n2Fqhg9o=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e64e248215..cecce9af50 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -651,3 +651,26 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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 librar=
y.")
+ (license license:expat))))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:43 2022
Received: from localhost ([127.0.0.1]:53806 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R8-0008T0-VZ
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500
Received: from mout.gmx.net ([212.227.17.20]:51233)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QX-0008O0-Py
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:08 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195200;
bh=eOSEF1aqo81mbSHLldmurqTzWHacdSxUo9buWxcAAig=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=gEp2X0QjOhrXrgAd81SsLycHZuCdXqCzEutBfivBgZcA9tmAoMvjToH4UfIKfDwQU
pXh9eOb8aiDFq+LOYOHGZGdKAJ4Qwik76bsMYfBDvjmZ1cgZPmC5pk+meak1Oyn4Vp
KYy7DS1ZsExpbu6IViePlKZjzKg5FbaBPrWBW+/I=
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
1M9Fnj-1nNYSW3h6F-006LDe; Fri, 18 Feb 2022 15:40:00 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 20/31] gnu: Add tree-sitter-php.
Date: Fri, 18 Feb 2022 14:39:37 +0000
Message-Id: <20220218143948.28989-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:wVROAKxSS7YTskVtXfry721Q1DOE0Qt9+rMOgUXP35hEslRDw2h
flcccc5qbFbRreqWcYqXy2o9PKaPv9d6lrx2DdkMFcYGsfy66rNCF4/6mgihWdMa/H1SLG1
qvZ7WCFeP2YfTaygQcE1hz6CspdKhBa2oryKf09j49APBq1ZtwFU88xCjYvoXWi/Rr2KNi9
/jH7LL2Te/IDlSnkmQNZQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:kmeoWLcrFvM=:cmOSRmtUtz9Ya9lxrQmuwy
80GgPppOUaxD2Q7zSIAm9HCnc7/RCYHXE8C2fY86Q763hZfK92o7HDuoDzWBkFkcBlr8nfcja
QpL2llBgOfMb8xXGgluT2OD3INOomRoRuakA8BHDNXiiOkgb5Ry8Pket3MFGcQyR2qMY8YLvj
KcwUoqa6mBkao0CIT7JefPh7Be/LwuPs6CogzJFfsWJumMpVm1mfREjtQtRBWft16Lu8qdXW0
iRj/VnqHD5b4QinaJ6ZXDgVCyDMQtJ+yGINKOEwXiQ+H46ajXCd2G0w+1fcjgt+QJ5Hv21QiH
uT0clSqLO6PadrOOe4jwRJQaLZWSkVvj0xXTYScZgc5nMrbo8sTDvvCeECAIuQxfJr769lvU/
G7+Y6qyqSSJnP3fF4z6pndLI7IxbjfpQkqgCnNCMKYyJA/c59wu6Md1qsSy700hr0ms6yqe1n
oNJ1o8LQ2gnBgCU1PATMWuEfOTscMJs+lF4iXUi1oL381uXPMlq7pqiZxRzLGzxnJCNSZ/Zoj
id0xC+j6UsrEsfOvcJdV6hX6rC2zR5WqtdWkW9P8F2hwYMuB3XrSFkAFllMyse9/5S/yWoAHY
QTkpE7mCQ/gypgCRzda0BTP8O6JhemqM45uOCBKmerwleKpeG31M1c8uOmngCcd5fqk7Xtfcb
5JA0mUDSQK8wd9KBzN/GD8apBIs6O6OL09o5mmN7aEE+m0RsG40roUWq1toXGWyic3KEeYVWz
/PU5iZgxitasQ8Ktq9lSwnXIbtLQWdZlVf8379ZjMIVR8TB6TbUyh8SM84ab1ntFM48H+wxa4
POSu/Q1FTPGbSDPvj8xxo3XbYZ9Rte0cr7KkaepdesLJzXNFFvptucWPqyJV796B+bNmDFb2W
2SWqptIgM7DEIxn/8Xr4Yu5T96rHT/0erU430LU2jMG11rkqNVirIBLtCjc0Z8Ea9AuY//zwF
/4HjaKGRlXvPffwzpVW+FrC7YF1UIPXWbFdpEA80sxsUuhdYLlYE0q7Jk+FqALLl3Az9ti5ip
YHk4fv/Thzo1rJ0YdRgAqFex0k9jrMUyVdRQpWg5H22WheM77nssqR1F2BsshammIY7DrFgGN
bsStznOWya2UoI=
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 | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 904697154d..e64e248215 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -613,3 +613,41 @@ (define-public tree-sitter-ocaml
(description
"This package provides a OCaml grammar for the Tree-sitter librar=
y.")
(license license:expat))))
+
+(define-public tree-sitter-php
+ (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab")
+ (revision "1"))
+ (package (inherit tree-sitter-c)
+ (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))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "nan"
+ "shelljs"))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:43 2022
Received: from localhost ([127.0.0.1]:53804 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R8-0008St-MV
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500
Received: from mout.gmx.net ([212.227.17.22]:38647)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QX-0008Nl-3M
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195199;
bh=OTNKndmXVb6PWPWF70EDSZ5UIlgaSBkaeU8l0/Y/Pe4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=G4G7heUHJJO1LiVx37xVPSX+7+hpIjWRe9um/lyZl/eAqz+JW6qzfS/jcGD5rOCfu
NK9iuIviiNLSJurMr6xTqJEBl3Xvk7nWt7P5c0gZYNq6jG6Mdm+/CcAq90sQ6hOWK+
y9iVsXUwp2sn/l/klKxxeHjPIA9wPJppXD4rK6ps=
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
1MG9g4-1nUwJ107LA-00GYsz; Fri, 18 Feb 2022 15:39:59 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 17/31] gnu: Add tree-sitter-json.
Date: Fri, 18 Feb 2022 14:39:34 +0000
Message-Id: <20220218143948.28989-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:mYK+G109TkdlsjZUP5/wDxEaUdtVlO9XDFVfmM+20zPXCSO14rJ
ZM+YjOgeF7++lo4nEdrUQQI1jMtOJG+Jk2aATKkHYbtwLz+iaQcv4xeycuXmPX8TqN/utpw
6qcD5Wj+cG3GqJ1P4MipPVtJa/dqaThUX7cBXW4yoQcDw8DmlQOuJUmREpQmpP8QgeLIV7J
xqnE/vmpzoVXkw8UDuU+Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Jvze+3P2SUo=:qcrMcWNZxxQW1M8hAbtXuL
/HjRO6E6ANClXm9fWk+IOB8vfdMMrGYb3AQScNhihub2uoW2ThUuQSmDjXgpWSS5embo2g8fr
X58ki04TsnAKyAin3VQd+EMB2QDqXyUHOQZzOQbNAFQNkv9I2Gcy2B3nr+tyOBVQIohLid1q5
VzBUKGHVgf4CVOIosekBU9fmINYtZA4MePlegjfNa9OiD40ZINn/egqtV3QC9ICyU4cFeKxil
5ZbOVjxL4FfWbn+YTY+RAcL87IVRm4rfvaSdw+lSceCHPB4VGnMjC9YBV+Wy3/6KbrdRIxxZz
7Ys3vdoIb1QfS8x5QRRii9eJDmHAUUr3bIgt/5DhzCAw59Z4oj3X1KYYSqqLz3w3uhac1iRbr
9Z6L06ID1j54NyirzQBaHUuHGtP/Wv9dpxdRZzapK1PhEnW9loKkErok9Pdnf1FNQzJA21iC1
xtjFFbkzECThiTD0t7cfRRZooKTQH4avX+czy5xOZh4WBmjkUnS2FCJJrRMM21Wxjom0jzfeN
G6y7nT/h3FMUkdrzrqK1PQk10plIf4/pPZNL60rFK+TzudTbvVEShWrXeWS/XdyWq3sPpcNb4
N6ysgOVhzG1axvRBAg5k8CydnXET3wfuhCoxI+BeYVL70bB+vXEm+gUOr4d2g+sMoaFACI7gd
nXsVKaZ/5LQGsq8HKlp0Ac8CJlMa2Dqxxw/kIw14m36Bve0Sf7Pt4Mi7uaTitxMAh4denlMV+
xVmhgAB07mcsF/Vn4usTxE2xNGIQHY7WdxwQzOblBnKFxznPj9yqn7bqgWWFp7pTMO47KyEvA
BZ7u1N18WavA4NoRXG2nYeKKhZvLy8K4rcag1cyPZKaksbMd0s12/fAs2XtMNC39AxZUo+3zZ
dGHoHIuCRkuQVznkb9AjKi9BHvR+/IUFoMlAYLag8XbPT1mDDEMgFT9O6TWHHxGatElLQwNjF
W42ibWcBXb4Gwr9qmdKlw+k+UZo97cneqcAIiBGIdNcmNIGVJKSZacAENIOQ81Ck5/MCPdl42
XnKfv1j6IIM9+6DMeTSJlgIywiLdbhsdsdb76o5Il8+oP2GotyM4GvnQMtYGsYGeG1ugSr1pD
UznuViuiuVb5V8=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 976e4cf9ae..ea5a5a5156 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -494,3 +494,24 @@ (define-public tree-sitter-javascript
"This package provides Javascript and JSX grammars for the Tree-sit=
ter
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package (inherit tree-sitter-c)
+ (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)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:42 2022
Received: from localhost ([127.0.0.1]:53802 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R8-0008Sl-BF
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500
Received: from mout.gmx.net ([212.227.17.21]:59195)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QX-0008Nt-Ck
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195199;
bh=fxyWEIVFPYU+j70gfgw7PfCR0WsN8YaTl+5OAZlgjkQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=la3orWir8ku8Dc1yIywaK0QU6Hpvb6SlVOJOootl1ny6kofRdT2EWVQdv+POk/Bgz
zPVK9W5bzD7xj5yAy1b83MYxi5/7v90N6JiDQRCGEwkkoJWlFuZk18d/z+FvSSkO/g
ZaI05XAeZZCTfwiERq0Spxdbk7XcMct+g4E56vSs=
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
1M3UV8-1nKWC51KNe-000YSN; Fri, 18 Feb 2022 15:39:59 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 18/31] gnu: Add tree-sitter-julia.
Date: Fri, 18 Feb 2022 14:39:35 +0000
Message-Id: <20220218143948.28989-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:yi0zkPcTWTZ0teTW12Rrv75AhnFSMKYvMjxpOTilegNgbmqYWnd
FHE5bLh/W75cifPgmJnkpouP4XI/RQ/2AI3616KdmbwFriPeUIuNm0JylnyVxEAE06/CZ+k
zk6yGZjrPczxq8RU1QUKgeUMN9r0Mi9OcohYTRFOubPtkobv51RFVek7QmmVRqj4efKamc8
L72EAho+C3bS11yTLaCnQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:nqsVUfVVnnw=:hzHwKoJCszJ4E8P5YsHVff
v99ZHJc/Up+/dSPCBlqm55bJD8O0w03iBbI0s9HgeluO/DeI0yt//729kNl5v9Upd69sck1gs
pdwzQbSPXAXIRblQhOR3WhvN7mvdq5RQt06ndZwJKLFHXqRTpliDU6wNJ8vBdf4WZkubH6TYi
KA/bppffpR8fuBypNBXtcmluEmFATX7+mZ3TgtwCJ5rt4g0gTw8l1oERHg36nfmBRx9k3sjRF
Tmlr/mUzvPH7Xinu99JGegNNKz4AFkmspIezHc/lwQW7Ic9pdi2O8ynL7x71lWDuxAMWKRWaY
o8ZwM+hR0ySwNx+mC2Jtu6lMtZ3v0C276Ksa7ImsEI/hr9gi5jW7QDNuWeoWZK5gViZ21TJMM
/BHVB0cJXJ1+bjNPjUDw+9HgiTD/HeY1A8Vg2MH5/89zPgF5fjqpO8JoVJAKTGYuXoiypC33C
/6cn0O5gKjBPV7zhtN5W3MB846npBiZVYIEzlVtfe/z70Yd+tr+KURyFkXyctIM+xef8Izyvs
pW2TUbn6PWbTJAYW0agkRhpB6jzMJgJANZrHCy3jOSjel+AGhE6+Md4r52PAr1CUub0lv4N7i
CdQzsdTWSspMQWvehLqJh8YP4iiyw/tVwC/mXc+zP6mf6eYxB9k1I2bJan0/A5Sd01T3eoXrL
R/68Dbza0lKKggvxPrqPHu0+QtO4LlhZTTKaSau8PEKOjaELJ+SHHgbmMaI3EpIcYTSZzThlW
vFmz46jtHqEbpoC0f98kQfhkGmZMQCOjS8cQ2QGuSqodDKIfVuD/EX2QFY98B16rN2F5BZD2P
ZFA7rJA5xCbXjztZuc/IGxDUi3W+c0XWvofugEvLj57ywKvp71hQ1JnJOqtmsLM65C61fW/d3
/jlhCD8U3zJVLXVuLVD9ZKfBS4jSZLm979ceiRd0E6BQfryJ5TH0TNlBqJHX7CXiZXkEQnIWy
GTTakBI027cUwKtOMlEYZDpeSp4uwspT0jja+RdkZSdNi1I3aWkhqUe0kcKIxU3J/TSJM91BC
iohqtj1gCqKG1dJK9yUhuPCn3PFCd4sqOAFPI+kKe8LzFon1j67lfbV/m8HaIPAUvYFUWfJQi
j6Qaw8CPWcbf2U=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ea5a5a5156..081ec8caa0 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -515,3 +515,24 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:42 2022
Received: from localhost ([127.0.0.1]:53800 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R8-0008Se-03
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500
Received: from mout.gmx.net ([212.227.17.20]:55707)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QW-0008Nj-J4
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195199;
bh=zxxQWIkw8qs+oBn0TKZSs1eVn0vk+ROb6ROmKrliY1k=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=RyViOSA29lhcNt2PPPHNBRNO8Bx2WC/JLLbp6tWeSMhzYgya5jdfBvRFL5/cZwXod
cUeOtIBFu3SNw9pIJU9+L/nd2zdrc79MhBKlPCtE7DVeSGxX3EoajLCJQ3XZ2Re7bt
xdmg5ImjNpWLEnAiPWUgNl/YsHsDXP9hmKQcCr9s=
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
1N6KYb-1oMUlT39zd-016k8K; Fri, 18 Feb 2022 15:39:58 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 16/31] gnu: Add tree-sitter-javascript.
Date: Fri, 18 Feb 2022 14:39:33 +0000
Message-Id: <20220218143948.28989-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:k7MBkNM1f1hwMAhhpqaZZYSDLj1p++2UMDuWb4+wnuzJasBSWBz
BNIl+lVXcqYz55iGhgaPD0N+sO74WZnxjdW4iiV+a6PsCDsvU4X+eWqGtuiP8oEmEINaO+x
cZlPcl+rZFX1pV2+hkFlgnP+Qaak14WoylI92UkU3mRxcwnvYmQU4OLKVurPbyReWTBiwVd
Rl7dz8NbOsaXGVBC5T6Hg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:P1EUHWSMeaY=:WHC+OuTMLYwicQgMjIpBVZ
udLQzSbr3Xx/H4Ox9sIfdhpZDYrNFO/XkyJVJP2JFQTKP+so3X9RjlI7FnSlkEOiAyPScxNT+
EdLrbgN2NR3n7DIodH8/6kN9TRs1dCuYmmF2oGTi8o8GD7/HSdHYQmpdjc4PUh8Zt2xkPYtWm
qSFv+rzlhdfDEREuNVXCznocvdkkysDr8ejT3KtxQupRe3/QzceMgQk4mC/nmagUreWSDs+HE
SFZvw741lcl0uXtJKcBI5s1wxfUTtNQOcHQlXA7FXBEYIoaiUqW1WNz80yHpcdQTrcmJXqETE
umWOC5/zI0ewq0qwU3Bvrqr1vVntfbLTpcArmxBk5bvDa4m58aolc3iY+rlTYFC1oQvyaXD6K
PHlmkQPx9cMr1imSvDkyiMbbyGnZ0JLNbW5dvQ1/Arh9f9FH63/nZmuPJGB7JJfF+RQH1RYlr
+51rzPyPq9G1V1GG0gtM8DKES84wVInDZZrkRskcS01bS8ocu+ipJB6cWpKU+vLSfGmGWieIB
3zqFnIBNhrOOCYVTfdzXqcmhejTVUuAib3rO2XySfg5lVPXugkdg4L8JXk7khrCOctOZyVLZa
oSscxOZgR4F0KphkELm3ImUC2xbOeVIiDPVfppMnWbfaWIsWWe0c/WTV/GnGc7M9mV9T4BkbQ
cGF70i6R2nXODhBxzoR0P1ClqtFIbV+jui/EqiuJWeqPfbXGDZbHuLfGsyGyIhkdnkxKnPgwb
3mHylkcsM5D/NTl6qkw2JfB3jAMeAUkfVwVa4v/T4GiHjziq1RSD1/q0A+09ruO6lknv8Wmv4
H/PWsTDA0DUJYL67IFZTSKtXoKYd4H2k1J/+kB0v3QMJgItHERnIJ4OrZDc9L5XsXsTus0wLO
ZsdRHxD6qkjnXjnzWuprrZGriBFKl9t5a/E0Qc3ygPh83EBVngWc/X2m0mmhgtxcD/2Bnq8QA
zZZB03tZxtnwmgBSdH7ApN85muTnpoKaxXa6rVoZF/ufiaMQDmhPWqK1Pv5EF8wnSuPEdBqkV
dSucrPclxeSURlUQprLFORVRGgVrZrY3lUpsxbfEfe8RSwuDytWMAIeJ0QNPH8vtVhtkC4MMM
n2ESdljRaN1v2g=
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 | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d93f6a584a..976e4cf9ae 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -472,3 +472,25 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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-sit=
ter
+library.")
+ (license license:expat)))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:42 2022
Received: from localhost ([127.0.0.1]:53798 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R7-0008SW-LW
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:41 -0500
Received: from mout.gmx.net ([212.227.17.20]:50399)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QV-0008NZ-FY
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195197;
bh=UxRTXAxYZoUGi8KYjX2qz5kFiIeBYqcKccoSXQtExSU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=lyoyAJOll9AXqMm9Qb2lJ1S0T/VXw5rB3vePy2EEZ7mm6ZJmekZGeRU/aLdqEuprx
KvMg8GOby6t6JYPfFiqjAUUqMMNrSrHyHtBSq6E2JeyDgTrC5YUqts8SlRnkZPCckO
Ycu6oUWI55W43LgSH62OvN9N/Vx97lL596Gp6aLw=
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-1nVDQE2bRj-00GHuA; Fri, 18 Feb 2022 15:39:57 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 12/31] gnu: Add tree-sitter-elm.
Date: Fri, 18 Feb 2022 14:39:29 +0000
Message-Id: <20220218143948.28989-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:RXQesLBIJ2dnAWanGMXAYYGjYCmQq6QZDBTEGPOnm8eJLDAQf2m
PkKzF5uopgC74q0d76miVd7HM+S6XH6/HDvELjJYTTXMwgHsRAEpZA6JEtoBr3yxHw6EgY9
fLoBPMt3mQ3aSmmbeoydqXPCTCX2acwEtriCkra1rJwioEhXEeTsM+7wTBNnRpY6ZVXPNlr
WX/kTcnMvXcsx+YjDU4Eg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:X5Kd/FM6lG8=:jEn8SZAjl004SqfEEiq3pN
wSjfgwQLBEq1QRaRiH7uLDWVmhFhBQzyF9K0lT3klKKAUD2aBUolDbyyJR4EYldeCO3POtoKH
mIktGtBsldvUZsQDpHpAHuov+m1g5PeA7KKeioBFVPA8NbIvhXht1SN6I7QQOHQ5TIGTRFhL7
KITfIDbmKNGLiTAhRmtw57jBfAhLD0IE6dXS88MsWwQ3P/1ObiWqJGy4eW/VHMas+UA7Srx6N
hrOJ3jW10bw6c/FNLC4FYUeSuepSawwNkGaof9pPXbEyIQ5ZB42NR81H9E7nZVvQacyVBDlgY
VMXHIY0zSX8BHXw5GaGTNC+uPRn3hv+Drc+Jdho0DJdr4L4gamPXjHggSForVKQc+ex+uTchz
IxO7bz38ligBBcLqRl15V0OwC0EA2PBq6Z9ZIzB93a0yzJ2AQ8O5sNN4Oji3/NoplMOjIe7kS
v27aywsVCUpFJhN0Okbz8uoBwzfliXroFjb3AmagHcwUNqjWAaUye3JU8PqXhY5wiLBM0mIRa
BqLmgSIVkKz4pJOk5Lsd8V7s8lZQNKIlCRJs4g79LiDJLNJzjwRkox5+fd7vZmLtBUsRk4LY1
4bOmSgUVAMdQGzRtisj4YopOz6JxZQo60C74xV7iSoHNd4FTRycHG6tMqVHV98NGW88d4uUDI
5QKODdZD8RoPFd9bpGXhG7rubaVAlAO17N2kGGrKp7ULDNHPBSBtVTebB1weMAmgZdotEsqsb
v0GlLNkxxw86XPvNvAd1ImyY07nhv5LvqgyjEZOW/T5amsScVNE3RqR43kBup/PxRURyzROJG
cQz0TqGlHar2uge+cwB7NTqp7xyyfGA13b5qFXci8USWvCLcPRYRtKv4v9HqaNcsBES7+Y1q8
EtaP8XCEKG1GMwSHjZqY1Pcg4eOYtwydPTTkQoY58A+dFgDaKyzFDIt5YAGFk16R8W7IkWvgp
k1y8sGTfA5ENwJfK0BwR1KaVPtFHCbi0fQ+2UQAvEgiAil9JScSu4UnBVZtjhQMFEKfDEGX6u
AhC7+TdSSgDHixUtQ038ab70pst3qUhpp6u4S7M9vSt4xGz4EXvb6PyStNerY8jyGs0qXkk26
QvQE0BuyyYv/r0=
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 | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 134d2768cf..5ade030283 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -376,3 +376,36 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "nan"
+ "node-gyp"
+ "@asgerf/dts-tree-sitter"
+ "prebuild"
+ "prebuild-install"))))))))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:40 2022
Received: from localhost ([127.0.0.1]:53796 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R6-0008SO-Bg
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:40 -0500
Received: from mout.gmx.net ([212.227.17.21]:33933)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QV-0008Na-S5
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195198;
bh=3DBVjgQ9zyW0mpZCQUaF/9VAW2pThHXr9hk1vhPgxog=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=jirThsySHrOidzR7Rwx4KoZ2k8f98CAzh3sbmILVBZBq7FiJSQUAST3rD+JNeeZMW
wbN8L46NolfVttgTxgWWba/w78dhR+Vn0wTzfPSSGLfy00WLUEtsPkA85O/RUsFcg4
mj8RO+Mgrms6vJr+dEuLOepRK1dJAAWr8efMqROc=
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
1MOiHf-1nd0wU3keF-00QDWM; Fri, 18 Feb 2022 15:39:58 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 13/31] gnu: Add tree-sitter-go.
Date: Fri, 18 Feb 2022 14:39:30 +0000
Message-Id: <20220218143948.28989-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:eBxCEyvMZbu/V/c4Cqnh1E+qIBkFaKVQ2J/EfW3CexEH8sNOquR
cpdi26+v9ZPjNVGzNlRACt5m2y5I4WjiSL8vKt0vVoB1a4m33oiyLcj55fAgLsbU8B0GW0K
3J1oj8n+W8T2GJgXWu84BG5T1awWVmMKIoaA9NTVhyQLmXR1GEF6PbnhczRn/qAS7ifmKkE
7JvyaTv9EyaFPoGGQuHQw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:8xSQyr+CSXA=:MMBOUKp9Z4BVb8nR1BLUz1
TwG+ntC/PXZ2X2m8WkFmHZ4880y/Y9lMnR/aFaSXn2tcCGLoXFvA2VEgobPqmRsRFM/KxsJ10
P9hHVxrIv497aBDrQrTnbSkul/eZTrXQegHKFXS+Pz9Hcj2eAvvVcLtzGh/71ABCSertCW1UO
iOFLxMlstvugmXxBbRlCsL6esoz5h4WIUDLImZlYG7MG6+LB5eKCu+TJs8DE07AxiM7//cyRs
zenBfzFv8sYyMArhtr9au9lc1oXGHqFcP80TSLLuleU8Va89pnOvEarjH5rWSoiLQ1FgPgmQo
VOMELwWk/a57AHmDD+j3pPYFnW4ugWGfxXoCU369IJkx2Az6HWkEH/gmrF5mFHX/68VYACrJ1
6ucRhjVt3JAT0LqD6WlzwZKqSODkmIGBPeM6Kl8yR/WnHaBTPFjSeLmTygAWJ7YzEiFJw5Afq
yYtPCdOsnwee1BqApjt63OhdH+6/JQ4OiUez0cj9D+fvoSvIM7Q6NhW0EuPw8RjErTwjSKsu0
stmDz8gFKY1IjQ3AihE8RHarvxYRNJQrusIVTvXJUQ1270rBzlw4RLBgZ5eBh7PzzoXitc0Df
fqVFn75OwHch8VRh6d7u5ucHBiw1bLsNJxlzxYwUDnh5NBpnG3OHi4wRrh94oTdg3jf/1n5bm
29Hv+tJ3YDK8QpDFCWvhmUgBfzOSFx2PokKBHZGYo8ksJMSKQBimiMcvGCiBu96P3S2Z39bCq
YHvOcWrCBPkfkPOQZlA3uuedZ1c04vGggnFtF5NyPzxEBExoBNugqNe0pH0R04x7e5+WpaJlL
nU1D2kgFxhhOgJ7jr7Rq5BlS+YMQH6yebJgokvMOohdW+w9E/xvcNL8j3jMVhM3jBYNpHgwGJ
/ECmB7M9rXEj3UDkAWfns1PDrDK0PnGh2VBFFgEIRjI/CO7tVa6GQJdVufhOG2taW3a/HFZ/4
NrxoaMZACL43MJbxdj4uP4GVdJBhcYGC67HulDWihz8iO93PzC8gav6SjMGEgRNZmjVIMA3LB
M3kFWD+IN60VB++GF7MbOpm/WLzlPbrAqKkeBmtWiqbNjpxURvRXnCiB5slTiQUajuUiusae6
zvNoHFgDW3Vj+I=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 5ade030283..c1e58d9c8e 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -409,3 +409,24 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:40 2022
Received: from localhost ([127.0.0.1]:53794 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R5-0008SH-W0
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:40 -0500
Received: from mout.gmx.net ([212.227.17.22]:49609)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QV-0008NY-AI
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195197;
bh=VJsdUN+bfzVV1vzGAwmqLHRk10gtWE/kYHPDYrChqKQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=IQi8GWOYpPLQ3SMJ/7apfgsSk57qLu6OSm5wA3OUlvJnzWzLvfCnjBSiBSQB8sy/7
4+tVp56H8dhQs2AqedVpU7cUrOUHRt/8qJ7bnycFTCqDaiFWt1cHkDvYAbBgVFhU0F
f9sRmKkq4W8ZG/ud7Ok9tCWfwgdP3sR1skOOb5G0=
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
1Mz9Z5-1oFO2A1PIR-00wFU6; Fri, 18 Feb 2022 15:39:57 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 11/31] gnu: Add tree-sitter-elixir.
Date: Fri, 18 Feb 2022 14:39:28 +0000
Message-Id: <20220218143948.28989-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:E4hVVQkcUsfvNFl591+XGTeobS+Z8U9FHyP9Kpq4Pi5o8BnKE7Y
z0ivov88R/kMBRtlgAa7pluxNGiYaDatsvyIVdihSD+352Ttr2rvTvwKwk3aoyCvisEoDwr
Gkldq1e/a4xTGEXuOUhJdDls3nsSyHdtWnmuYIRJFT3cjuYGV8HAgN/fwy082eG6u+kMYnj
p36j79N876lGu153hV7XA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NVQMIryPM9k=:wHnZIBnq2D2aeKc3KaJAhQ
lYhx3bz81wkZW7O7WMh4u2xiQ2MjIuW8jjt1Ng6Nvg38Y6giCUyJU/M40uN10RguCe63emOO9
QdFy/i3O6+3YO+umx3Z0CedkDympttTV/FVQ0SrNpiTKjjtReAlZCUNgcWCAT16nbjD8ctsjY
8dzIesQDRAmp8xRQAoVfjPger5KjKwrVZUZDvlfbj9bF4XOVu1MrqXMjcnONc+cvh+lG78AMS
4YyQ7r0lWujQe4BN1PDn348tj3Kwv1HxvzDQFpLscVLApy/kM8rHsjPnULNCQfXUb85pd8wWv
mrvMLFbZP7XyJbcJlOrKJDp5S2kQobU3fa1JjTYpg3tWc35tP1cUJSngwr4XgYuV97/9fZFlM
MXBaxveR+bGtMeuca+lLc+Km6i4nvk6PNhX4IrP9lHd5DM9OZKBW/uYFXdvhJV2EiXlJkKg1g
Gq/7iQj2TOB6gaRLS2q5+B719M0cFqqoRhnRwakSH7rAUtFQfVu7vZ7/jjq7X52Th8ns2p+3s
kLcfjuF2IQC96bGAsT/nqSy7Zd/6fcKIg4Wp47AgALmW/3azxAvfOjxMtWoLklymuS3bLahDR
mrgiHQD/nIUwOieJvSss0k0DFINI/WeZopwBtOVNfTW+/jguImruE0JRjD2jYzWZOObaL2eeR
ltiF9VKKbMJ6I0JBWOBO+Hbzo3amBDSGlD1qhWwGGmvAePymVwoWWFLdaFmukqgVZsYSrLR4c
jk+3EWiGsfUqohM28BlDouOZIMr9Qt2DBvKg/M4+q1xnJ7Utwqfser2fgcJBAxt6VbS5PdTAp
+C0cyl2oujy0ccQXgN7sqFbamj1IRrjOtxFh8TbZwX+5I/zvf/3tq9lw4VPTFClQpn9uS4/vc
ZaGXoWEUeif1k999qtdrC+TGMNDeObLBkmAbMunhHQbklNWedfsRsR6Srm/LE9xzhfmZFPvtS
d696/SbB+84aTgrwg1AvkptBvQeEykCj4upDE2s3wORX6K1f6mNLl28BhYAwgCxrglvMplr4O
GDx6ys+xyN1rodnhge3PlnVrN4CNT1jRh7bX20ibdS2KqRivw/+YKptQRHMuxE/xIo0DjSSSa
M7rW6l6gk44UXo=
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 | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 5bb7e7549a..134d2768cf 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -341,3 +341,38 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "node-gyp"
+ "nan"
+ "prettier"))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:40 2022
Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4R5-0008SF-N9
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:39 -0500
Received: from mout.gmx.net ([212.227.17.20]:47677)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QW-0008Ni-Ak
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195198;
bh=XVSix6YzYvtttcXxKR3GOxHL6tllPi69jI6otcFg3io=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=XdRehzaXlZvJVQcYabmwDNbSFpsZiNCvdLd9NunjTTkP6n0GwQsllZcWenM0HwU42
MPOIdbdvF351Y7+UzfnHCfYo+4F6trWBssbbpm35nNqYkijdAxjf/sHhBjcwzRwEjg
Rfwxq8GRBPZ+CRs7ay94sPoBzC2eCQOnmpTkIAEk=
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
1MpUUm-1o400Y1vK8-00pthh; Fri, 18 Feb 2022 15:39:58 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 15/31] gnu: Add tree-sitter-java.
Date: Fri, 18 Feb 2022 14:39:32 +0000
Message-Id: <20220218143948.28989-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:nOhY/UfZ7BAbJFvFgcQ0CxdblHtP6Hkrj/kf2M9+EuCE0rFQxLL
7R2znJRGMd/mkIZ747vLtRLrbQq0DY3dCABLZhRnMVFzffzWNk6ZhYTj8gcSWgPSb830TEF
PsRLt7DTe5uNSBqWBwUrwbL8ujd9klYBZCDjQ8CF2kL7ul5vqWOkRcF676uQZms6SL5MPpT
j95z0JjEZqq2HHlcHNt3A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:T4KKPXqHpDE=:GOR7kI3AR3vkGgm5Sh9cG3
1xdORDO1zUNuhM3cae1l9/6FDvpASUIk7q/QnrBs9P9To6NbhhJ6ixI9RTgTonlZjeQ0fnmwP
9XtowEme0LIGGvrSrOmgjgDhAAiTHysEq4VQmarfVLS5O7MZi5wtlV3TebB14h7aK+xp5CCM/
Dni+2g1BrYulVIZfvq+YvEIyZpfAyB20A2EoC+e4cns5R9rbRHtmEkv8iLctop+a7b8Yzuezr
LO0Vg9pg8YvjcIRd6R8VGuifXOylJFAX+XsQgd/hW+CLc33f5DZPue6be2K87nEwmDR42884b
QCSOI0M9t1XPoPHeyAziy+Kyn8biqBf9qYIoAOITeZbYLONlkmF6F5aJDVuPw23yrRPc6SjvQ
KDentk+2Yxr2nes9RFCl05COI+T3Figg3/fHgfHscAmk53YRVYkHoNxkYA6RTNZ8ZmYE15ekE
6/bvFA98MjJM8hV38JFbj5bKBXX0C8a8uNbHMQAnqrT8yYzpgGH3h6Ze/SXczTcVa290LLSf8
8Q5Yv0RAkiM31jQH9bVql0Ppj/Tt6r6zsh0OW9jNsaA48RaB1p+c5kLVkIs2pV38PWSexC41n
a+y0y8iAfUBv/g9PCysMwemYqQ3hLyWo+qsAUa6MQdos9ma0EgY0WWogxqDVzOijyD7wRsGBG
xcNkYS4XUc3zqMs1YRgzMB7SHj5dPKsDyaok+NKj1hV0yjZ8EHj0fXqAC6DdpUMtua0BDgm76
ttmAMdk7z9uI7VXg9W7DF6T9x+rSBbrQHYf1FD1OTxB9Hb0GbxR9CUGKafgmLD/JLyRyC7i9h
+nGAdTHcriRt65Yll7mOMsyYAAk5SIPIqXujHq0USLLohsC3gV63QuLgn0izx89USPNBtG6bd
s0C5QSL0Tqb8fhnZ5KdDVEpmN/qC0zb8oBrEHJx7/boAXdAyRmIMQo3KucguHFgdSZ2INHbis
486JhGHf5Up2mzA6/MDngrsIkVv5GkaXZur7sJwFRskZANTyMzZEEua34AQvpuKLIBHmWWTdd
xhHLjdn1bfGFuGai/zEO5DqR0a4rJeNysb0upS/sb7trU5CeMZPF0f23qcJiX4ah9wSnEqG1m
ot+fgSsBM0a8Pw=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 4bb9425eb1..d93f6a584a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -451,3 +451,24 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:14 2022
Received: from localhost ([127.0.0.1]:53790 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qg-0008RV-5v
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:14 -0500
Received: from mout.gmx.net ([212.227.17.22]:36475)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QW-0008Nc-0N
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195198;
bh=QEkRj2G207ZRBXzqNXf+9ls5TVwcsqF5AoaAlPJSKao=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=jfQ5VEkBvAWO9Xlxc2GGz7IJqb9gzmu+Z2n8yNX0hLldO2Z24A34JwLX7upjSbDIT
/d7ph8UVpMVWYm1vWwyUvYB6s0vna5NdhyeUVfwq1lzFjZ3sbpeSaN53KD4pbrNa/B
HVeXllaH3oHHunEsh7mbKHSub1HW91VUHP83j6Mk=
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
1MybKf-1oCcsN0lH3-00z0NE; Fri, 18 Feb 2022 15:39:58 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 14/31] gnu: Add tree-sitter-html.
Date: Fri, 18 Feb 2022 14:39:31 +0000
Message-Id: <20220218143948.28989-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:7Nyo46uJfKJeORdQfkFIt9YpE3hg/7Urc4A3DFEat9gDm5YfBRK
gp1FX0xwRtP04lYHi70jbMDDbeYfO0s+ggZth5cUJq8fNAvNdwKUH+Dw0pIwHZR81ukqVPV
Gre8ZDUz9i1BnakYj4RujB8lM+8Z8hBUDSSVdsRW1eEoMv1GdcVm7OV+WSUVVI3fhBttvZx
dfJZ18uc7u/XUpb3trAaw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:lTI8FBZ23as=:v9+/2RQq7GSogptvv/Vbh+
9OdyNYCvIT7Lv1VoboSypRPkGtOE5h21sqRQ+RwHV1j5Su9rvgEqUpxTKmJRmbEWila6SjDPA
gDk1RhtX0PXZqqVrbRYwWVX8k91Lhkznqj6fCELk5tRNZSLGmvY8YWtELAQz0lYGqdCpBRrn3
RCz5RJ0jahRCNxyeGvGMF1VlFKx2Da42OYYGoXm6rcga0UBj+oVcY3y/wHjxgbxzUoUDfrvnn
DyUS0oZ6Nic/PZTMeN3EwbIdWHBE9zeqfSsVAEOZAXIFcYybEGmNEjg1htibnBZ0re2mexuaU
10wr/NpUrRduuEfOL7bWWxWmiFYql3luPoXQOBpbI1A216U6pdZ1zRkk5tBCy6HEGmFRAW2h/
+X2YPN9BoWmcLyIRtU0H6U2WfNjIRA0Szg/W6fl6xpmGp+ezBaNut+zzaVVCNuBnVonMiPqam
txXyaezqAIR5AP1Czr+LrXKtvALiNoOBDd36Sl203w4cvnS6GRJuDzm3AwbFlUP9gGinl0Wrw
GyeOEaJ6glSdvUcnxyTv0r7Jw4zQzFoMEOFaNVXgafT79poy3lfKSaVW8EehHAtwaWml9+6CD
r+61Rvzzk7FHjn6eTSOFmeKcEJQelBcHnLvMia3P6FoAUUpgIH44dd656/bp15muPNqlfYcLt
A9QQhdHKofnqt4VuT7YgvRKxYeV9xqXegEamfy8eAUEqsx/T6CzWTX6ffQEWf5aY0XjsohSko
aj76VgkIF5E0SdnK+Rc9p3QkIgeSPuOeO1WL1EXdI6r42t7oBRtGyO4eG7vRooDhbc2ClffZS
nnXR0tH68PM2WjA1jwaAo+b7//y0RwjZ0SBtDvzNuhqZAFTZ8kTkA70ulvWpT/ew19c3I2Y2Y
3NVUGbD+miMkGNYq5bfmOSjjPiGDjnO3OFMSrTc/STWXxuwNVL8FTWOD/1o4twQHfw4LKXS06
+zIINWOCbwfCkBEPC1wIEmkNig5Am/4l1Df1fOBHAdNjy6Gj2DxvgyGBnymVwVb0ZeUBomZWt
sD/FRk9nsp2x8UanOC3wnZhX+ugyP6z8VxoBvwepMRe+JidrMcQhobUYdGq/OJfoLlrb7ar9M
EgZahcV1V7RZQ0=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c1e58d9c8e..4bb9425eb1 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -430,3 +430,24 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:14 2022
Received: from localhost ([127.0.0.1]:53788 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qf-0008RN-Ij
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:14 -0500
Received: from mout.gmx.net ([212.227.17.20]:51195)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QU-0008NV-O0
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:05 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195197;
bh=7isz5VBzfbzLN3UGyC9HWjJrngGIMaXZUIL6/jqlw4Y=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EtVAUMi+8+rt/R/aGhKnfOIWKMj0sz55lz9F2evqFAqesEfSr1DpL+ON4OrX9w0QO
A/HSWq9SDPZOfKJOX0QCpu8SPEsiAXc263rKRLXLbnqXjEGgtC3BO6Ek7eBdh0gLqt
adL/OfQos9DSweqBUVwW0kWQArOu4+7nyT2Rxo3w=
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
1M5wPb-1nMRzr3GGJ-007SDW; Fri, 18 Feb 2022 15:39:56 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 09/31] gnu: Add tree-sitter-css.
Date: Fri, 18 Feb 2022 14:39:26 +0000
Message-Id: <20220218143948.28989-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:WdRDSKGiM7voI0urEfX54aXn47B8fpnzSMmTeVe/BJ7hPyzO2AV
CeSu80e1qMFema3xmm3Ei/Ck3J7ZG2tmfhJOhkre+3Br1pMrcx1PF5gfMknTozcnbdXCDmr
gLCsC0Lukp+1JmKDnHvtJHIEtV9SWSanja3Z5tdEHue4f8GwpOnxyZNt08nad67cAJxLIky
3Vz3pDn+ET2nRhvxgCMeg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:FCXdvOOCoAM=:KdlJ1ojcQcf01MVbPcYo16
fYof5FHQzYA4sgMYj+0nVOo0mdK9oGv0Hqr+SYXZCFCYxXTxzPJITKX/IAbz8zZBvHUvvWS9j
ozHnk0SWIDlfpfjjX/oXNJLvixDnwpMNkEwsEcYBttYFHqyltVABLrVsG9sdk9TBVu2DzSBGr
AkfuAOFhReaqjwKV6/OFv0VmMUjlADJryW1CkrKupEPQNTfHzXlqzvdlQNYB/oQbNO+uCC8UI
8JoUKRI47POkg0KJ5//+XoHzeStESxU05o0p7L+74D5hdew2OGCrd52BwvOz28+RwRT/ANQo7
hVWCqrne7TY7U34tSim4nuXmH0NvL8xIzEZ5ZC5DCnQ2E50Zocm0EDrfF+mCHM5OUPrcUUTwe
2YZc0BMe67AzICOOfO+rh1/oNqKSD2/yQVGIgY3FKz997UoH8z+D4hnQa1hSkmVVDTgQ+lwez
emW7yPQU1CB+59esU5xMEwxLPIeqIW4l42gZpViLewgAjrEtW5K5ShVyn8eZc5BadNjmtynhu
VwTB6TH5XQIbryeLLvxx2SNg9BPCT1YBlpbvTwvCp/h5wc5UauZWS0WNPnhb9dnADn/Ezrc9m
5/HIRXHcN3D99DCbLhgdHT6HmmdGIa3VtbfrUrt/JzoOkwaTV1w7LfDALzuqffmg4URBCo3HA
FYu8wNOGzA8VhPGExOP1N3zU1X3Ul17GueBTw0FO9ESNmoPrYQazMT/ttSPiNHYzllNLO46SE
KhFSkj2UJqsX57puDO4/b0x9Y1KQwwbj2aVC5HamlD+N0wGyqp5OlQqlXEUU3ybG5xGknjpHQ
aHSVhLVHjP1VW2Yh84DM9rqVj/XJJOGwT7zTjuvYr7W9kcjNBlGNyJZ8MHZLaybNSHMk+Y7e0
bNG3xcdRhFpD8b150dmFasv7LW2GmuOKXU3gkr8TeDyW7CecDYLNVfyFxkmV4GjouGORc2R2+
9nCIcMiUwmrl/qPfMHft8AaEnBgKQPVBMP2Qb+vZYxF1WBcuo/9iVa850v4+9qVzuyBAS1mtj
6lSRua7zFyH03vfJVTq/rzcGCoWB7SM5JhvBGvHFjJX1v+bG7EN4qbVlbGfAs+tnUk3YjDGSI
yWV7/8PCXiqp1M=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 8f12559dde..f26732197e 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -299,3 +299,24 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:13 2022
Received: from localhost ([127.0.0.1]:53786 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qe-0008RD-Ug
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:13 -0500
Received: from mout.gmx.net ([212.227.17.21]:56625)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QU-0008NU-Bw
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195196;
bh=UyZLKXnSl3H/JZBo7Pu3i8tuXPtRKjonSjHWh59fzm8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=FUc6yGF41u+GH0r8ImgVWrpyifysR4WXKif8vwfOyj2cYUnbLUisV7+kskvgppphi
w9B2CQr7Rk06Q9TIhSagIt4v5aadaleWxPKnpr+3kJz3nRgaw+f186/zgXrwvHOiSe
1BifBKgiy+ilfWrsQBW09tWg8RbZLlgGNx3QdESI=
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
1N0G1n-1oEHZT267T-00xLPe; Fri, 18 Feb 2022 15:39:56 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 08/31] gnu: Add tree-sitter-bash.
Date: Fri, 18 Feb 2022 14:39:25 +0000
Message-Id: <20220218143948.28989-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:mrxxniW3giwxxHSn679avmaNDQvfW42vFXnLJFaAK0ovXcVtMuR
zlIYfWbcmJ3qVv8DZNcBQVDk0Izma8TSadlxeVt45XZcl3xbpZpuKpKggD1Vh82i49TIZIP
o5oOZQbgXSGiqGXCY0X6QDLlrETL9spvxlrXlCGvsVxh8XF8kISpBe+TlNyojK9EHbw9ofG
InwzEymco80Ansvpufdmw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:XmnZCQPO8s0=:gyWreAmzJQI3qGx7SSQIAY
A++7fC19RZDcs72jUG/HMtQJiDGxdtKU2W97tUT2CULxd+Ytrg/is6UVasbcFljUZ8nKv7x7o
LO5K9P13eFp3GEWLHon6Uc7dA4Gtw48hjMApDyLiBnAqYP/ouKCBToMT7uFd5m0Hp+t6BBGLh
eGh95IcuXZCIR1tV20D6KgLTKq+leBsIMbYGAuAWhbZ8Z6pHKrgQIzD/og9vpapDcPGkjoLWb
YRaXkmWyMTd/Bm6iwO927i0AtJW/wuqox9U7b+n3uE2ubxgEc7vidX1ccCGi8x5SLEwLi1nw+
//O2N7etpMZXSwD8NGTGgI0cTCquEOSCIHYc5YKDIEgfxM5ktbCpvAQDSWUN8mg0XBPHbVdhD
Bnf4ISsG3xNHHUsTq5F3STsqPwkWalRCF8gFOQk7EEnTZckKOQiLrtATrCpGBQI09smx5LJrR
F4eW97VYhb+lCijw/crPz+iQsc5Cd1U2L6rNf4cVxQ6zemVzEJo7ATPMk+0RoX7PYLhQDwFMw
0XRhyVUOJdvvlzX3WYApyu/pLnEQ0hrTyg4HIEsVSplqguD24I8w5x34zgznqMs5ffBqWlKdk
CeHIxTzzAqnAyLv2GkAgLnnapwIo+E8xeJhQRaG0lDawRkeIRmuynaEA+CTkrTO+Uwd/A9ilE
WlvmsV6EPiwkVoIS+EiY+qPWLryG3Qwf3WJ3hU/kwHpykVZ3/QhNbL48pXsh/CF1IH5mpxvRa
t7sYmfh8tbS6A7P4iyHEQqFVJ+npA3gCdPB2HZI2GKxKtfD/EC9qCoXHM+RgN6ALT59ntzZR5
tE0jPUvkr1Gt9rJH1CIhkwFKsZZdNWAy7t+BGCTxZONrztsSTuCMWwE1PeiuZWwg6SL89mz9a
eyfMoxYVo5HMzXnXEH4oiuYJnuod89YwKXs+nFUhjWCSlMM/SFia7XBrqqaKzYaEDd0ed8afJ
4xIIrg6pYT8wGfi7z2Jnpr25BUFKaWk8ssCFOwRh5t54DZTipd0KuZSF0kkwzaPFtySowX2co
8Y41JoLlPPX4uZXAZfBfxxvmkYcT8ZYkVWn7vIpgXQJFpUbYcS2al8HM1y/PxEu2loVcfNg6J
mL5unfacZpSF5Y=
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 | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e82c6e60a9..8f12559dde 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -267,3 +267,35 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "nan"
+ "node-gyp"
+ "prebuild"
+ "prebuild-install"))))))))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:13 2022
Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qe-0008R6-Fm
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500
Received: from mout.gmx.net ([212.227.17.20]:37753)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QU-0008NT-29
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195196;
bh=9b3JstqJKboLpC0xTBVeqLwgaF5qUcJyg1BzS7phgtE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=M3EC38LJP0DecGKn2ScARfUMEy0TJ1sBApQezkofMVbWpQ6VEDOWMm3hKUXlnu9Gl
jyh2LLlw/79n9MZoG8yjEfFA6rirLL/Du7LpE8yskkjF411fN1dZGta+jLKjvb/5TB
/XDYUiOsRfdSvCYVZlhQJH31ZXMC9QdXf8wj/sgE=
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
1Mk0JM-1o0gcu0sS8-00kNvJ; Fri, 18 Feb 2022 15:39:56 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 07/31] gnu: Add tree-sitter-cpp.
Date: Fri, 18 Feb 2022 14:39:24 +0000
Message-Id: <20220218143948.28989-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:FNcUoZyMTju0fbHF3fRO+RvY1GlPQ3u5WPBT4a1vwvva9MX39D4
LIZ7VO4wEiLq2T8ZhYPytZ74utVc64DYpQC7hg/xrqB98e/LszewzZy9rcjGCIckRQssUDk
re7HoGKv+3lP4MyErOiPBIJ3Ztnk6M/xlmFlUhXrFA44O4n0outCy4+mUEZ/70T9oDrrxA+
9AOU63soW7bXmRiOy9E6Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:HKSS18iNR/Q=:eTNclZ3lH8/Oku5oHh//l7
y9QLBXblQTvGQUMa/EdMaHSQ3TuBB3sbyDrxR0fcu6tM5aXCqiSOh8kTJ+iu8FNUWJB3iXryJ
1KKdKnB/YGiTTkhj9WbAmkFnySrjBYnq99yFGofupmjBg/Sm06CLGEWAYoV1fFbbcsh9Dv/Do
l5iGcmS/8rHIDq2/kyMiChkxScZ71ietMKvWi0FKyN/AuuXWq/GFyf5oWFYItvgzNmso1M7fM
xa7VBEm1KL6AcqxT5RGIvUE8Q032xE///oyljJrLDRSwv+k1xRdgA3XJknYrLRQ3E2tXqU7lz
PZIYXAtXJl4ZBsD3Jjxa27xa7YeUV4f2gtMmdAG52sYx08ilSIS3gEO+bON99R3oyMQysT8Kd
buhkNQE8SwL3NXCJYMnntXnLblHlB8BEMMvQJlnYJaASJVjcTG6uuETAjv8y/bwr/Sp2FyVNT
j0zsit8J8bzL9w8ITRAGej9Pc6eiYLoKYbe7GHiXi+IbcP9FxUCU6dztU3PoVbK4sC3LeQa31
/teobCcTIkL9441X0SYe4mc1yZKqrk6mCqTK3/gzfwfEuYBckumKkTG3vHfIAxEa8wlPeKsrm
08pHwc3uMul+k3JSNrZT6P1/qXjSCaAzzb/Wt8OTb8OBGri03ZcODmqCtpXNoI6B3ouTUiulZ
sOK2G+VAnCgClqb42vrgf/d82zIN1EfkwD/6rKg7eW8gW4WJE0asD5PyzSzBlltnpT06YoSy2
CTI6eV/J799OxAXj7jo0B+iBaVmpAk9R7XREljoC413j+Wr+kH5rNWXBtkV50qFZLEqGCB5cW
DQbTWPTWPFosMsgAcpoQIsO6A/TeWrfRTr9npPOl0SgFevEJQR7OJ7mt22cDSpmZa06u1x7uz
DqE7qca2gNL2+rhkLI8dKFz3UF7k/J9K/0tp4bt7kIPusMUl90IU1a2cpObd132+nZ5VJGIcu
HEurxvFN7LMxtuNCTYfPnip5PUWAB51ATHTx6SH8Ryh7sFup5ddZZ66UmPRdaeCBFGmPVMKS3
VgXiXxZenzJL7tTT3vTuxg0rwa89rgM9+c+Cg2U1YrrqaV/UIO5IvYVCngYcMYSV9CsJQbZJt
DwL/DSbOGTDE4Q=
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 | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 920c386fdf..e82c6e60a9 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -243,3 +243,27 @@ (define (source-file path)
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (package
+ (inherit tree-sitter-c)
+ (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)))
+ (inputs
+ (list `(,tree-sitter-c "js")))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:12 2022
Received: from localhost ([127.0.0.1]:53782 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qe-0008Qy-2y
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500
Received: from mout.gmx.net ([212.227.17.22]:53811)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QV-0008NW-22
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195197;
bh=t9q2xXaUdZOgm6EDTL8XREA/zj5Tfvkl3Jtunv/slmQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=DGeZSv/kTJ2vpDj5OatMuVsLaUepIah+Gx+dggy72bvgKr2tPJbSP0B1H0IWU6xVO
zqSMxCF91R1xwmJGQBg+AnKT0Ul3w4/owIL0Y+VWupVAVEpG1pi2yeYdp2cIvxrT84
TbrAm+LY2+OiqKoj150S0K6Mud6cOetsmZUFP/vI=
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
1MtfNf-1o7eni0DuB-00v8UE; Fri, 18 Feb 2022 15:39:57 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 10/31] gnu: Add tree-sitter-c-sharp.
Date: Fri, 18 Feb 2022 14:39:27 +0000
Message-Id: <20220218143948.28989-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:laIlKGYtDJr/ouO6QDT4OJG9uveKV9U3j6bnIFzDE5DLdkBIrKQ
Y33JmpdAuHM9vYS9EpoVp5lsws0AgOiA3yeQbXFDMd5KJAedCfAJWTiBMtH6EO3JNFC4gmy
BpW45ZEQodqgOGJ3KCM3OzsA7b+CMyGvCSj70wdalzRq2CIoTJRmPgCUcbm84vtltoQWE0Q
16q0FURcmTXlAQ8PFWWLA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:UWHbVWrVMPI=:mgT4CIkimAUxAEaFjjQSVr
OkG9DmbEMzT1dPH+r91s8x48hzXROugvuLuAVd/62Wh8Rp18UDybH04hPeyoAIsTTO+B85g5z
7Sp7kgQTKsaqq4HnGGIURcQiT0zIAhYnwcKUWT2wN0uU7K6d/ljU3qu7xNZpt0VctOYfipomY
KT6YqCTULs7rKN95wpoemO7ACXCnHougRgv2cmjYVAUZalsQ+MvbIfzjDoUmvaGowBibJJr/u
TbhHmCM6nqCdLZ73Yel2gTRLRz6IA+0SAVNbYne3vFoyITq6Nj1asbCURcat59BkoPuIQqsZs
sWsLZzZTSYMBk1JfATmwfm1L25L0qj2yXkv4PVrDnZMerO5M1sHkxkjHJKD/0gVbnsU/62pp4
2PQQfPAcUek7iBD69AdpmG4xhgpunB/k7RAmVWic6gyBIcecPPo7nO70hzCACiQQxNKtBsBwz
dMwA2hVUdNcwBvcJHhEfxJh3LMmWoso37Zn0Z2wiT2Em8suu5haJOS42lxvl+jRLFUSjk+v+P
fIFf9eq0X83mbui8tEcw7HvtpduAlfFT7laWtIT7EGay4Jv7t19OhY1rfhRjs0QBkXsH/kk/w
/Sh1fZH0ueBA7l+9NXKvzvH4eyOqurie1syJskwoM/f5ev3gdqI0ACTJj71vyfTwz/s/DGrxP
XnxizgKyEui1imRqIFO2FNTPUtj5GtfGzlGNllsN/U199EyV311SrLQX270k1hB127bIXWJUR
20+X5rbflxZ4n0BouCwNGPpA0eWr+Tn9bG23BV4XKJ9aN09h3leueAJVtaBFQGhK08n2wDDZW
dOsSvjwF0pi+ZF/31h23oUfsPNUxfiBxXgFimcXMB63E4Yhk4/oi0zqOIvWWzd2qSmtEvCy4Z
eRrT/IVEn+D39iLUnIqdlvseciINflNGVZHgKtjw2XhyFRgvq6jZsojvtvI0QISUUenPFNJ3G
KaSodkuEdk6Z9JqfbBK+MccXPgR1RzIkDQMKJ/e7Mcfg0XEHJ3sjz0GNw0HDAmlq5RplM0nGr
RO2YFSGx4C5pd0oxSTPhb0Bj3zJispt2PFr/oDwCQEZvFNpG+uv6vOWIPvKlRg7tACB+HzeW/
GFq4hEDljvqu/4=
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 | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f26732197e..5bb7e7549a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -268,6 +268,27 @@ (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 (inherit tree-sitter-c)
+ (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)))
+ (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 (inherit tree-sitter-c)
(name "tree-sitter-bash")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:12 2022
Received: from localhost ([127.0.0.1]:53780 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qd-0008Qr-EH
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500
Received: from mout.gmx.net ([212.227.17.22]:57453)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QT-0008NR-RV
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195195;
bh=2zNsGflsbIMeCw5Z/VXAGLuxeE6NQq36yK7lwf07oGM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZtUzl5JJjVDSv2FjVtMpCH+cdwWhtOAS5VmeUddqULtI3ezmgX5T2zvRkPrBybefZ
xkqGbrl5oaHxCeHc9RJAvjyb/V9IcmShtP1v9MAmaQursdTHRSTJD8a8+CKExXikWL
MZilXfOa/WMh3Wq7J4qV/Qtn49gHgxFjTH8hvUvo=
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
1Mw9QC-1oAh4h2fkC-00s6c5; Fri, 18 Feb 2022 15:39:55 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 05/31] gnu: Add tree-sitter-cli.
Date: Fri, 18 Feb 2022 14:39:22 +0000
Message-Id: <20220218143948.28989-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:g+q2+EGMD6PzKSnAVnvmJRETCXRQdlobPrR3Fou5pREa35lDJEX
oRFxcrt5Vzf9dQBjypA51PC/FMpULzX0NrvVQzkIVLI9IB/a9Dc0Mo5YooQP5aZiTSBWSXf
t0UZSVAj1RjLBl2qPspXMu4t8dEbxlu16LOgF8fWe8mQx3l55u2SEIAGDQtjLlBiPhURBIP
eHJ3PSBIYj6xqNtgXkvnQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:D4YhnqBy4eE=:xyXF/oGpI88uBV4K2E4ybi
E0nZHY7Q9niNqSyQJ2FhohEGHr38QsoI00CXzpShW/rC+lmbSMTAU2WrEmkMMD2QddvGKSJOo
A1TDF25phRWmV4Bcu+VItze3akndXeskt88yjyxQhN1v4s3/7OWkLIINcbyf8xJwh/nJoO0Mt
oQBGxGBEYyC9e9CbkIvveH4/LrYbRpUODjfIpm8Z4bxXVTNfNib1w0Ik+rFKM1WMHWfgFaqhA
xOLXU9ktzn3LAQ83pN7XwI0/Qm697uhZ1cG3Cp21Kdh96PqJAX579rabqXoKVDlUmSC86cEd+
mE49bxcsEVNSN2UyrlZocCzDTGCrBRc9MuXtKILkOoXGduLrb23S2C3ZCwB0SlsAE1urjvLr+
mOyKrC/+AIOs5I18YCIWEDiFT1kxvF42F92V+8F+pjC8SNtApT6NoNjJ1bH1zAvx5bITqtOu2
L1h9ykUSAITJn/y+P70OVVKUZR81hhLO1M16c+w9k4ERexh1bD8Scj8HcFkUcp3XJuE7jV1eJ
Vhn4hncWPiGUQ8cLFc4MpV/SuypJ8WRnr8wgwWaZvqEDv6+E/fEASUz7z076MzT6FUAfOi0v2
n9ZRspcNsaZFSwv8xfzE7jwuce9tM0wD7Cr9eean97SSJ1Q4zYGwpySNrtMNHsVLvXC6C0zNo
C4uoFTWFaxtUkwTMCvdt9nBHfLNQN8rwjGVoZQOgVXx6ziWdtnfiRjTAcDVaJGWvMFX5n/bi6
B7lFMV3003FPepqPGFrGaIxmUtm1AtM7VKA3Ok+Q0xzzlshhw7zk06BV9/+60z0z9YqtvoQKV
w9OkJc0BoCWZYVhb7Gdfyb9+JkIBFz8vguzE0FMAwThvgz84EtssZ2vRJWmW9X1OUJz62oVFw
iXAX/Y0fduXCFh1gAugIQ0BCV9GDrO/UawLRKmUk19nLMvew+uPMwQB1ZtIDTrYDyA3Rn2xfe
dsdp4SoWwnnhAAGygprE0NMq1W+Ekv+mGCQ9XiKXm0EgxYDnqpCyC2jSm5WZdxm2ot19ZFPTe
54ZYipRIAQwI9KN4j2zC8CPxmfkQzVoI9irWMx3BynfC7DMO0FcD+VE/5vWzTIXX82JO3rDZm
n/3ILToSk1rfcs=
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 | 66 ++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 10a3a6e57c..cbf8ecdc6c 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -19,10 +19,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
@@ -81,3 +84,66 @@ (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")
+ (build-system cargo-build-system)
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; FIXME: Installing the sources for the tree-sitter Rust bindings
+ ;; doesn't work out of the box due to tree-sitter having multiple
+ ;; Rust packages in the same repository (bindings and CLI).
+ #: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-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-spin" ,rust-spin-0.7)
+ ("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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:11 2022
Received: from localhost ([127.0.0.1]:53778 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qc-0008Qd-Bu
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:11 -0500
Received: from mout.gmx.net ([212.227.17.21]:41161)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QT-0008NP-8J
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195195;
bh=FUfcvCDVngJDtA0Uuce9Us8oVgDxmUluH8uD2Q1n8GM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Pf4TizqN+2MMebCVfw8xLKD4tLq4BI9o4L3xj/G1zCInXNm8siL8/MXVoo9mbO72b
RJS5o8FlnmH4GwzsLmgpQLgZdRADPE21zvqHkC0i0UtwDXay3HZ/8OHT1grNpPx8PN
WMuKlMZJU16/5P/7Atctt/e4VXCe5BwpxBStUiCs=
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
1MpUUm-1o400d1OQO-00pthh; Fri, 18 Feb 2022 15:39:55 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 04/31] gnu: Add tree-sitter.
Date: Fri, 18 Feb 2022 14:39:21 +0000
Message-Id: <20220218143948.28989-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:M7CP+iJbITCi78Trdem2z9Ao6I3U+A46ItFlsvl4KyyQipXyKAN
zvXoAFl4OVTcMqG8DK/aRwi4Sv7UyUKGAs+7P2NVqst467rUKd3QQYk8/9XWFruoDE1dv1+
CPyYwO/ItOOcAmmeJt4abjX7UQh8dbxwrCnS7u5dc/K7j1Pz3gYrTgP8zl1wxS+2MUZXbvY
moSOlN9gGShceTSOspGFA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:QDiYPcHpuEo=:OQGBFV44EwMfeEdIxmCdDJ
2ggn7WqSQtlhR/vDcSSvFbY/ryACPLBYhvru/GuNfAUfb8tp/OKaMYKPMDN4HPkW2KEZ5U1Pb
/VlNxAcLxdCa468YKPz1gdn8WKIdN+Mcqo6hY6xAUYtPbdcFndMmHKI+WbreH4Xexwin1YTTW
tPPu4XZdDIGMdowyEpxP6LcC3S8tjfY+v70EeTiaFx9TCxMC5Sa3p1WC/1oHIbcYdFwO15yp2
97tBCd+Lo9+WqvIimPwRHr2tm67OFF6N3zxvwtGlSsmAnnaa6HZfz88zzu15OENcGZWgJiRXs
Byr+pp75hRetDaiCGwvNwYBqLE9RAa1V3vxYD7yDgpmC48rmoEslKOyZtOpvmy91EX1Yu7Wus
qLnYtp3xrrYlH082tw689FnS87oaK2Skz9JLKQo+dYG1cEhmBzeNYb11q4y7KuJdo40jxPiw5
MaBNKUR9qpcqf7Q64c0iRempPUc9OLAqNpFZYPY+lPH6Bg2sTmd9QmBapy2Fnd3goCe0RXby1
lH8rG7tJDUVOzBZxgiTCXezPglkJ5Rh1wvK3kFKOz50xsIKw4M7C/2fMd/C0Ost8ftbVqbWWf
gb0q4bAeol840yC/p+8Q3tUZfASJVUGhgvTQKhe4+E1xbde5n8xn2JsS/7hlQvE4ajy2gL0H3
InBXL2mhlRL8WNNgYydipOpuoU8L0R/EuHb/kB53PrZBBqSYSoYSM/VAr60b2rj7WeyQ/nM8M
6G0wz38f9WPYAPUwyGzAvgq8wsW4gBJcs++su59Eaem9pv3LzKPA/XiEfBSvpVzf7AON7zvDV
WfMjRjIcF/3qfD67/HVeL40VLnDNgcqaXojUM44GILap+3G4AtJuKOaOqxblPUmMNsZx7VDoL
HXbFr+gcjyIOg10du76C4jx1R9A8PX5Y7vXCnPdehHQm1JAEgh3KiMGlw5671HFLFnjQo0nZR
k9AnMJunBw1wrcDrdfSwmJl/W0lX2tR6t36T622gkwXqbr8DKjnslf17S2SHNAbtvXDaJjI/m
ZkH42/Pcrb7LeFoaFMluf99X4n1dFF51BOpBqDoUSOerlPnZhbfF3sk9jLreafUxOxZDglwNv
8xaCmXPfxBcXEw=
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/package/tree-sitter.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register it.
=2D--
gnu/local.mk | 1 +
gnu/packages/tree-sitter.scm | 83 ++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 433467ee39..97ab160c3c 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -584,6 +584,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/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..10a3a6e57c
=2D-- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,83 @@
+;;; 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 (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.4")
+ (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
+ "1yldgdbf3l5l4ki52abdf81nwkcbvg219gwr3ydcjwfsg7hf7zhz"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "lib/src/unicode")))))
+ (inputs
+ (list icu4c))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;No check target.
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'set-cc
+ (lambda _
+ (setenv "CC"
+ #$(cc-for-target))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")) (lib (string-append
+ out "/lib")))
+ (setenv "PREFIX" out)
+ (invoke "make" "install")))))))
+ (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 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 @code{libtree-sitter} runtime library.")
+ (license license:expat)))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:10 2022
Received: from localhost ([127.0.0.1]:53776 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4Qb-0008QL-Dl
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:10 -0500
Received: from mout.gmx.net ([212.227.17.22]:40583)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QS-0008NN-Tw
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:01 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195195;
bh=nD2EIQeuJZRMOeTOyJcEFGg0xkzHQqi5uKDOcJU7kw8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=VIpXZAba4cgxI9rNOSzONyPyTEwVIrInHjqjvwvvwhzRpif5j9070epbgu75HqBaq
0wwgZ+f6UB3ElybtHhrNre6rKjpxM7N7Lt8XRQJWncUXpRsMtgM+6cq+tPA1gX1JX7
lWbvbqEBzdVuFh5XFDCzVTqstYubS83mwuejAarY=
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
1MgNh1-1nuPEi0Cxb-00hsxm; Fri, 18 Feb 2022 15:39:55 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 03/31] gnu: Add rust-spin@HIDDEN
Date: Fri, 18 Feb 2022 14:39:20 +0000
Message-Id: <20220218143948.28989-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:rrPGDiz/4H5Sr/I7kfO4ISSQNi8/G4xniDTU7d4Llr/5Vxnm6eG
CDVn+CxUEh4APD1T6mqFxvh8Px0zhuVGHpPqIt30R2WYzVi0wT8FRF5Ml1QuL5tyjTvZvlt
25TM3JJwTi/usbrvjtXbn3olDfZLH5JXblxSnl51TPTc41PXL/SAynLbGPdBQQijYhtqio9
vTwOUbpYAxCEa6lvcd0Xw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:7hXRquGYioY=:BDzs4XKsV0Czw3hz3sZCpt
Ka2ePHsx3rTZtnh90UDwcYdGUJLSiG7AD/ShJ0d6nHrpVNjnXegfh/pfpXlIRGIffnnpLkiaR
BzRw8g6c3t99qnTg7Wod5pMX/vHWARNk2/vAIEgoWKnMVLr/kavzXsppJWKSl0yhda8OpTXbA
1V5SmcgorwGKa2sZaVxMyqK8x/dZ8s59b0ewtqp/yNIWV4KtzxrYJ39NGT6tNcT78CrXlkCG6
v8bp/zXxk8qs+wu768M99yjQIRf11LWTvxhlS/ykP7RTgIW/usAwmzLSask+mRxLMXULV9QGI
zMIjfoQrhZ7IhDyxPjdElJV57xSW04w6s2EVc+TClhraI6/LXdPW/gnPmcUxGSJfCN+an1pql
kFDgK4Ph7FrHApFsB0HFJ1Yx7VVLCsAtYwwkXpb0pLmXQIWJoZBBu+TXKA4q1dd5vAt6HFAek
QPHwvPihJNODCodRM+YonugCBC7CzVkkXpsblcWKCq5esbuPowkLTF13tWAI5QcPgTfrVo8T0
9GYiJ1lw6xBEHeSG4NLCoSPxANZoYXDwxqWzOIMQCd1k2KWT0zFw2cGM+jhmyw58XrgSxDdP+
U0mc0WdJ7E9MablvfvtgVfK4it9fC6V8fp2dni6/pUhqWCecsFAkpzxWrDIoeMxX4RAx1EAMW
VK5BZbaYT3M9M1Wly/vE1/+2fqheqczwNQdJYxxkdEM2jSSnXuV/L1loYjW00rKh4l2Aq2v96
WJQTGmIHE1MvDkMomRj7iULZTyL66s46AIfP5CIrNO8LGehdSHkZD2kYZgU+mpBu6OLpTrziU
KjQKt02HJ5OG2pGxYSKKSpFJXpcqzpZdU4dX/1Zvf1YwpFpMK6VnxTqFk6v7ZVIbVVtOR7B7G
8E3vhCQ+ha45QUncfTnDtc6itPH/s8fu3hCc6P2nc//aSfeZTftKqWLrVKE05HuEOeC3LQ0q7
V6Bed/QnQ954F2UaHEPY+tVhdMPabGc5z3tUvW2cIAgsUIM30k5RTLdc9soGaOu3l8zTX3xoY
CibPBKOFqFK00jZsy/TJBcv0phIaoKs6DxYwM43wcVIig6m9313LJxYg9Ynx0M0cgvvUHx3ZT
cTNPrcq78bL8tw=
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-spin-0.7): New variable.
=2D--
gnu/packages/crates-io.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 986901740a..a4bd79607c 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56726,6 +56726,19 @@ (define-public rust-spin-0.9
initializers are available.")
(license license:expat)))
+(define-public rust-spin-0.7
+ (package
+ (inherit rust-spin-0.9)
+ (name "rust-spin")
+ (version "0.7.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "spin" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k")))=
)))
+
(define-public rust-spin-0.5
(package
(inherit rust-spin-0.9)
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:09 2022
Received: from localhost ([127.0.0.1]:53770 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4QY-0008PM-7h
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500
Received: from mout.gmx.net ([212.227.17.21]:47393)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QR-0008NL-C6
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:39:59 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195193;
bh=ztAS/Uq3oUcCLvcWVi3pyiK/pDt3DRLlgc0Iuz3thXI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=W77uDyJk5XTjeq/XzFGd3zTfPOq2HzpL5FOBh5loVWNOw0ZqMzqZrU9YoNGebs2yi
Tgnk43xCR3YTXuwRplip19nJoHm+K/S95Kv1DfhjeVndUwEgKB8TTNV0ttVM4dIRYv
r27AMzapWWFZYioS9+laOgpjtnzpEjvZXhjLiRo8=
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
1MacOQ-1nrMyB26V0-00c6CV; Fri, 18 Feb 2022 15:39:53 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 02/31] gnu: Add rust-html-escape.
Date: Fri, 18 Feb 2022 14:39:19 +0000
Message-Id: <20220218143948.28989-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220218143948.28989-1-pierre.langlois@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
<20220218143948.28989-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:yQNpBc4yYy8KezsQGRLhkq7eqGoQFCgpRqkCkgp4hSrD8CbZ81x
kl83zioFGpRT2L05TD3t0iN7T6WIcPzbyqVdfXsz/0Gw84krPQGpEKKQdvhQkU+nIPeBhyJ
a9pxCLa0duwsYrlL18fsSA9mDlZxwvsEsplPntyHTlCRqlDGJwSmTkOcSk4HvWaBy0/KJ/C
n3W07WJb4U+bv8NcK2TkA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:slG0PwYZoZo=:YjP2EJCFPsrtcM3L70sXHe
OYQ0eTknGJdj8ouxdaCVlugFPzPlLtGjDeBDvAMbt5VmDG8slFA5CfUZKhb1qcietAorOKyEQ
qVf6MFG8EWdZC5MbvfC+LlBBlG/xzXbrjLpkElL7CwjRG/2IWvAPm3LiFoe+wvtH7e2t3IfDB
vaRJbC0I5MXhWKfhjxNStoNCThJbwtjZQrFkY59ygPGo1nxRzD+/XJE+MTjgJjDUxOcplvJkR
jUIdIjN/CKWB7Pnqje9jzn7UYaGyuMbsrsJDSUEb1RYK1o2q7RRvSC7icT93iFnQcNjqamOvF
uGfmqismLqFyjcy/4CdYrXV0n3WWEM4EDFTgxunskbfzqvvkdhs82VKyrSa3T425uL4NHZloc
pFEaVfN3eRhgfgy6tspWPQoWosgrc3Nq+K7adxHwnc+BZnlm7v556tBsS5s1pDYMPwNTPChde
6C9qbSUccu41/iZtfiBBxgbAyqE8LeSs13r+s5yXaVJcVs2UxrFzYpaB9F3gY+GEnzNY2/uPA
FU6OCB7942dJpHVJg/z4ma1a96ZqrLd11XKzCsnfx/KbdIxwd3FxL6WVj1VZADJjvOuRZ5T7B
ZvyQH55zIAlLnOC5/IV1d1ghvBNsUGEEF5DfU0ZtwF0H4cODlwkTiCrd8yJVe7ATsQAC8mQQA
Hi7Q5VeEol59wj7kxDoljI3D8yJ2TMrmVDMArHEzcHTW8/LwW3DKDvsd+1cjxJ0QIWXe7TQcP
ZfZyefWkCk5TtgFSti7Go2Oy21pYJEVmjIvi8H3pZv8i2+VbQ3EFjxHbgHuhfTsi96A9mmZpF
sR/TopzpalUJ7bhZeVQz586Jq28kIfmhTqdQ0+fZyeZn6N2LK/UMe0C7YwZOvfgp7AqFfjDKX
LFzAlquvvOdjQqk0SZbeRP/osFUvU2R6tWDefbmx/SWWYB44LP8QM11rKBksRiQb4sHQZ/fKo
eJX54sbVxd60XtC/RQT8uEaga0DTKtRDYjm7t6LftHZidV4l6abx1vg7AT+GFyZfR5mO9CB8x
Fpdlia9ZtjiQFMP/YWUlySust5TGNmNvk4MnXXXZMLWFlhlxi1lxPX2v3Pf24rAPEmNQQRnPV
HYdEer7zALj/sk=
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-0.2): New variable.
=2D--
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 291c289b5a..986901740a 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26943,6 +26943,30 @@ (define-public rust-htmlescape-0.3
"This package provides a library for HTML entity encoding and decodi=
ng.")
(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.9")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "html-escape" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1dxw9lpckrqzzqgbkw64ckbajr4b7xxnjdn8adgzqf2mm40shvl1")))=
)
+ (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 HT=
ML")
+ (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-http-0.2
(package
(name "rust-http")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:40:00 2022
Received: from localhost ([127.0.0.1]:53749 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4QR-0008Nq-VJ
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:40:00 -0500
Received: from mout.gmx.net ([212.227.17.21]:59547)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4QQ-0008NJ-9a
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:39:58 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195192;
bh=kVGHjSsFJYxzxkYOQuHrKk2xHMc2pMxVI4f94yFrZLY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZkOEUdCZDnzHl1XETartI4LXx3/MvoUumJnS7Ok4HRZ+yZQfWi1QSEkuzGlWDyIwi
/55tmIDYikLcAKdVByqRDIbUWe7oacUn3vw3oMqwbgVsMQKUsngWFRuIC1Sy3RHrIo
+wUMT/7oBvBAZ14zL6iHIxoToc/hzHzTHplbWgbs=
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
1N1fii-1oIM2C0Z9k-0123Ib; Fri, 18 Feb 2022 15:39:52 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 01/31] gnu: Add rust-smallbitvec.
Date: Fri, 18 Feb 2022 14:39:18 +0000
Message-Id: <20220218143948.28989-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <877d9s2qa9.fsf@HIDDEN>
References: <877d9s2qa9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:4bCALqyxQMDtOmTF5Y3f2svle3u6kRGKkIeZK12A8hSg7985M2e
+4FermIToTCB/1nJZdHlJI7ALBvkTTngcuoXBZzAS3CC9rY+vPEZCeWG+6ROjjVoVwZZWq2
xvhpRBmirB0+KgfdXuo6jF649U8xKf7Pj0wxH+OAgTC7bBvDL3QWn4ISrJIpMBNaZm+G9Mc
K0HGFx/4QrgRtTix5CBGQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:QSQ6+FS5Hgw=:EGBtJ15bUIwbBP8IhGR4mV
FNARJeqLuUFVj7R2BMHLvY+GYRAzo1tCWCb2y4mcGeuiMZyH8RT4ILPl7JyNqFkH37wm/pCD0
IhZhbOvcw1HA2hxXtcqS51HVcL0pOxuA+6+sT1zrP/pGVsmUSfJ0+RKvnQ7PCRsekyS6mFPJ1
1y+wv5g+EY2x5+diQGZSvkueWoDRno/KRW6XPLH6cnRc1MEi/c+iCpiAIM0wqW/yYW033s2MF
do74DLQOZiIYjMAAwFDIjzeveTepdBkOY28S0sssGns3DED9NVEg824RSZiqtQMe4UpSUmQ0G
Ck4uS66clrkKqyLLuWpF3++0JIaDafszmd8ANSEoMqNAyoNmcbfNOlAwljBVOHakJ5YU5DoD4
Osk4LugpIN1YChe9fADDLyGGh3RRgSPMNZilxhg6ldF9DBeUd6PpeYRL5Aa6OLFXaAZLBRRN5
eI6HxKnuQZoeCkueiH1eEfCUEr3G8Oqh6thwcF3UVfPI5Z3vpBqRosH7kKLqfTkgY9lUN/jzB
TOS6ApZjtQp3KOr/mrV+gtzbhYMRj8+2ZKJINjW3z9OT025wKLDPIqNd/brnszvW4VY+dxM/1
M2ulXju65nGqM9jVWo1wQW85UL2ly3RSebgJbyBZm7hAwwY6etMa6sgCmQ/T7ml6O3PRUCqiR
xhbSsCsbXYyHAQ8V4A3pkRfBFyADvcEf0tJtvC4+GFL/yEeqQkGySp1hV9hY+El9oLFhGiwBS
VE1rjLlMi7BugJIXnyrxwR+eQZLTrylfvudFoVkzFsWPUavuhFbAhsBFby0DodiBMt8HK3Ajn
xDHPao1NDWcZ0ElcK9ABstFjFiZAfJa4pUWWU0ZU3VbYk/W9YG5aubWgLrnlfA1ivxnUE3Hke
GLx6w1OxTrmbHm2PJi6xNl7TQLTeEwsY2ZZuUwidQtY56bhfvlzdrVX/2uAbtuSEQntydCmSo
kuiCsOau78lKLMtxenLb6T/9N0TG82Wau03DA8QP2D/9hrHN8TBL2kSZa+b9uNN3PvidQGNb6
srEft/dL9/2f2i9Ng6FMzk7ufN6jVvsvaNtcyqnRpDGB2E0Nx6pHexJfKcHB1VW2/IOB84/KA
u/Njk8cRaLRBxQ=
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.
=2D--
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 6024c9c57a..291c289b5a 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56109,6 +56109,28 @@ (define-public rust-sluice-0.4
("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
("rust-futures-io-preview" ,rust-futures-io-preview-0.3))))))
+(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 "A bit vector optimized for size and inline storage")
+ (description "This package provides a bit vector optimized for size a=
nd
+inline storage")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:38:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 18 09:38:52 2022
Received: from localhost ([127.0.0.1]:53744 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nL4PM-0008Ll-Gp
for submit <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:38:52 -0500
Received: from mout.gmx.net ([212.227.17.20]:59887)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nL4PK-0008LW-Am
for 49946 <at> debbugs.gnu.org; Fri, 18 Feb 2022 09:38:51 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1645195123;
bh=rj7nVDeJtppciAWh1id64olepOSqifEG9UQCv6q8R94=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=JlD+BnUFqpont27cOu1c/eGcWxFXlyGjJ5FYele676xuUbTprHov67Mw0FFEjbCeF
/Sq37edGq15w3i9hsSIhJRqHqTOFi7FuRcPALteg+x0MOLp3OZCtQDYPLyn7PvWS/b
PBl3Cm6fO4t1TKK0uNIBjaO/AuGmmEDhX16Is+H4=
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 1N7zFj-1oO9TN4C3f-014yGM; Fri, 18
Feb 2022 15:38:43 +0100
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN>
<87leyinxly.fsf@HIDDEN>
User-agent: mu4e 1.6.10; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v4 00/31] gnu: Add tree-sitter for emacs.
Date: Fri, 18 Feb 2022 14:12:08 +0000
In-reply-to: <87leyinxly.fsf@HIDDEN>
Message-ID: <877d9s2qa9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:uUnUHVTf07CUrfuu4ahVDXwtSFw6gFEh76gm8mXqh5O1P5+Z358
SwKPKYuHwq6n5Lvc4q63MAIEWiDh9YFnAoDsVquIijWRbPB4G2yGMED6lyr+pTuLdTxTZz0
Xrr9EDv3IPKerEXB5aE2ELIoWMLYi1QNITyiKVr+Pwqv4wcT/e0yT7/vQV5eWEAUizz6WRs
O9PzDPiHNhE8WUZfRh6sA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:g9p6lUDsfzE=:ZpU1E4JM5uh0vhOrrpf8Va
Z5m1jO5Tom6PyqvvmjGKXSP1cb5g9wfRW73bIqhZfjTeqVJWaoAE2Cde96c+BOg/lnyvfEfKJ
wyHLev1tL87ER88h6qr4yB10Ej613cqJOIWj7C50Uw97wbUjwBZOex3hvWwDNPqoBH/Ko3S6t
wdmqWXW8p9e7iZkIiuE/tRmMBq2nbVfiNutbjygcvrsdmfpnJYMyuzx3GOLKzRpAa0mu0QbPp
iCb+dI/1LjenRBrA/eAXVk3X3xaaSP+mBg3tValL6emIqbDQNPCgfbb+uJzd1akY2ewWTM5Ov
VI8c4bLyrpL2NhwPNtO7Y6BEuTeIXlWOHuEPp5l87hfXSLCMgQoSpfdoKfScGbhDHt1W6LS53
UqmUgjFkP6laOySaS/15i21vdTrTcmOvZ1oCOWqFIQTLa1NOewJG+p4oMW9vyVUj8gbWVBTTk
ne54oEblNhn/6NZ9L4C9YggW9E69wG+TlDMF1faURBeYMfbuD2VITUU5ixkjid6+TGBez5SbY
XW46QMIkH4dP2ftwBpYScjoLvmDcLuO3MRf4im8msZ+6XeM+DaODtjSydO7Xum4BQYQ/FkJ78
89oFt2SM1gtZf1hQ2f043X0AAPhxqVHcwj9S7pBNmJR/jkLOdFnHitDJ1KFB2tT8ZYvuF7piw
kALBgaZMIwe6Ha1lv8qMjsY6Brh3Dvw1hRa4CHrm6rYoj1imSczVDLSuLdBlu0Q8CyfEkX0VZ
EptTDC2DNnwT12EY87iVhLYBXV4TG5eFuK/uIfGLjxZ5MZoKzS4YSoMubdLXqa0uIarjuTI57
17b9jWR+5Pvs7UuhNNiCm4XWA1OGwko4AW/+2gxhNhrt9H7qkpI419AXWX+2xe9IPz+8PBJbO
pfXc8w9wMvy1JKj//5hcTjv3KeRFV0ZCgoTfGKCRML0lVmxwiZrIdbuoaZuCR8rI6ID+ry5TG
Wd+tBuaxKn//UPoCyLrzfXxnI1ZtVO9jhzM8ktMPXz0nBzimAsZcLOu3m/n6/XppUUKQYZ9FJ
iNq6XC+RuYaAGZHVz+fSoP+DKvk1CkXXEJ4gj9F1NqYY4CqPlHXSwhVW9M/i9m8Ukgnpn2tqM
0l3gWN3SSoNEhY=
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>,
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; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi Guix!
Here's a v4 that's in a pretty good shape IMO. Here's a summary of the
changes compared to previous versions, there were lots actually! :-)
=2D Removed bundled icu4c headers from `tree-sitter', as pointed out on
https://issues.guix.gnu.org/53523.
=2D Added a snippet that removes all files generated by the
`tree-sitter generate' command, to be used in all grammar packages.
=2D For each grammar package, provide two outputs:
* "out": With just the compiled grammar.
=2D-8<---------------cut here---------------start------------->8---
/gnu/store/mb2hcaanm6ld8rx19p1ihk2fs1m7lcj8-tree-sitter-c-0.20.1
=E2=94=9C=E2=94=80=E2=94=80 lib
=E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 tree-sitter
=E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 c.so
=E2=94=94=E2=94=80=E2=94=80 share
=E2=94=94=E2=94=80=E2=94=80 doc
=E2=94=94=E2=94=80=E2=94=80 tree-sitter-c-0.20.1
=E2=94=94=E2=94=80=E2=94=80 LICENSE
=2D-8<---------------cut here---------------end--------------->8---
* "js": With the JS package output, so that it may be used as a
dependency. For example C++ imports the C grammar, and Typescript
imports JavaScript.
=2D Removed the dependency on node-gyp!
By default, the `npm' build system builds JavaScript bindings for each
grammar, so that node applications may use them as a library to parse
a given language. We don't need this yet in Guix, we just want to
generate C code from the JS grammar description and compile it.
So when invoking `tree-sitter generate', we disable bindings
generation and then we ignore all custom scripts when installing the
JS package. This simplifies grammar packages a *lot*, given those
custom script often try to download binaries and would have had to be
patched.
=2D Grammars are compiled manually.
Previous versions relied on doing `tree-sitter test' so that a grammar
would be loaded and compiled by `tree-sitter' into its own cache. We
would then install the library from that cache location, which can
change across versions.
This felt like a hack, looking at the source code, we're just
compiling a couple of files at most, we can do that ourselve.
=2D I added support for a few extra languages, like ruby, C#, elixir and
ocaml.
=2D Last but very much not least, tests for emacs-tree-sitter-langs are
enabled!
This is important because this package doesn't just bundle all the
grammars, it also provides custom highlighting rules, which depend on
the grammar and can easily be out-of-sync and break. Thanks to
enabling these tests, I realized the php grammar need updating and
didn't work for example.
Let me know if you have any feedback on this series! It's taking me
quite some time to follow it through, it's not the easiest thing to
package :-/.
I do wonder if I'm going about it the right way for Guix though, for
instance I'm wondering if I should rewrite the grammar packages using a
new custom build system, do people think it would be worth it? That
could be done as a follow-up of course.
Thanks,
Pierre
Pierre Langlois (31):
gnu: Add rust-smallbitvec.
gnu: Add rust-html-escape.
gnu: Add rust-spin@HIDDEN
gnu: Add tree-sitter.
gnu: Add tree-sitter-cli.
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-for-emacs.
gnu: rust-emacs-module: Update to 0.18.
gnu: rust-emacs-macros: Update to 0.17.
gnu: rust-emacs: Update to 0.18.
gnu: Add emacs-tree-sitter-core.
gnu: Add emacs-tree-sitter.
gnu: Add emacs-tree-sitter-langs.
gnu/local.mk | 2 +
gnu/packages/crates-io.scm | 154 ++-
.../rust-tree-sitter-text-provider-fix.patch | 98 ++
gnu/packages/tree-sitter.scm | 1088 +++++++++++++++++
4 files changed, 1324 insertions(+), 18 deletions(-)
create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix=
.patch
create mode 100644 gnu/packages/tree-sitter.scm
=2D-=20
2.34.0
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmIPr24YHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U3M0IAKDg2dimfgTh9aElA7Vx2Rpd
JvCCl4RpfcvCSoxSTwwd1x8pzuCYlvjrTCSrT+byqxFVg0kjexTSPymtPKZRSyT5
VB2tzPGkaFaud2WwHptE2s7fRC45zUfXupyuc7cDA6hWtCTBCCvlcSVrvPCr6vXa
NGxC6gCuFb3samZPV/tImMBA5+h0R/HoZ9j3I8FFj9KwV3l7bbT0CG3Przdyfjpd
rvUO41AH4WChFT4p8haTG+Mlp/Pl+0LvaZewUBDNHJOrjeni9814Jqzx9nKEcyMr
/D1m3j7oWWAf1qDIXV9o8u1fqRZOPeBEdOieuJ4vtJWl3Va+1so5BKBxK89ySlg=
=8jYk
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 18:00:48 2022
Received: from localhost ([127.0.0.1]:57589 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIQh-00019S-Fh
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500
Received: from mout.gmx.net ([212.227.17.22]:42233)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIIQf-00018t-2Q
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644534039;
bh=Y0ruqogCZF6AfqowFM97UmFau0VQvx63bes3SYbLPDE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=gjOXK+TNnlbloz3SoJ2xBPxtwDbxoTELoL5efJUg3W2IR95a8/krwC9grjrUz67YC
G1BGKNpAPko9zWFSunexhpdmbUn4m5UPQnuUrbqoPGCH1oRC/emicP84ZhxOFHMKYV
kUOFq+daq0E3G8z9cuGLvlOKnShsOqNv9gY0jAkM=
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
1N2mFY-1oIxZm3usG-0139fm; Thu, 10 Feb 2022 23:55:39 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 26/26] gnu: Add emacs-tree-sitter-langs.
Date: Thu, 10 Feb 2022 22:55:27 +0000
Message-Id: <20220210225527.25189-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:2GGimL3vfqRQuOlDeoUhkwvlof28ls/CZZzMu8HfOqo4KnoqMds
b2lWugzt45H71brnW9dqz3/GJQUMgSPKPU9rZ7kiyDeij+J+boqWvKUctjLkvg2Tb1762V/
B+Abi3wszLMnOclGf3VhOUplONpN7kBxawCJg9ECNVvkFu0ok4KwZm9Jc5TtTeM9NTqSxr6
vcWOTB5NOjmpY04HDElbQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:5HlD6LLeaqw=:tFaXn4B6uOJ6+fgbPRdJK3
/YAUnLOwAsNSwxyVB7aH9WpVepv1PVOBc1+lLTNS21iSufxRrQPL136RqjVX6oDfbrG7bmput
dQIHz8gws2nG+aZeEoVG4KdOybtJAXZNm3lLk0oeC4EZkFCcJ16j92sg+TDB8TNBV7mEk4HJJ
XRlrd+GJmkwakmq0Ai5bXdxlD50GNPTmyGM1nxzUxWEW/gyZBwuYj8evkbz+eTMcCLJcJdyuQ
QOhGJsG+De3JqYE8aQVgsOWJcazokDrMt5GXj/hJicfouaYjvi0HkOnN0NiNAb189ix1eLkIC
6Lca0+ra3i2ExWURazewpLuLjjj+LoNLrGl5IG17vzmE/H32grhPnuST620/q85wBdB5xjcaS
OnzFJ3k0NaXsa4WpUkQeecWZ9pakuGEWu/f5nZnArEcGAKHyvW63Qrc7LtR6pbmUff2yY4rW0
4+KCkNtgrDzKa15wwcyrdQolF65RYUeJBnHL4vIRfIQ3RBcV4HuXs0p+n3+ecdNAqDiZ6M/ew
mNCH+/i+Vb4ReJysy+E3pfV/6lhEHsDDSvF7BewJEAuTzUn0I/0SM6vtorQYnGUVl7/15oXyO
vPlaM9FLG979YLUey/Z9Ttq9t6yQT/am6AbuXKulROXXqY0EbT895viEW7EuQyEIR2ai7WRA0
xJcVIziDOptDw9vwsRiKE6MbprSoX2xHW42xEInrQ8pYH1wKR9RbIe4hxm3UQrLq3ts9DUQD2
+R0NHXPtGr9t67soH7ymzs4dTciziAZCFK+7WJPoJKao2KXvHDS9wzbp5HrIIqkYw9vWwmocw
uQ0QFtxbFhQ8N2GkhwouuA1pXbajxRTktLuupNSzc2FfE3k1hY8s7vzG62FYsRElc6Xf/zJ8F
FGM1Ia+tVVBR0kY6p3f1DOzZnS3x2vJuiuB92QR2CmB0mel4thv2wuGyiQNzAcObLinoVqpbQ
4rnuxxx2939dK/1zpLL1Qpxh8RQ8EF+iAWp4CqwRkZH4g6pMxEg/VqdKW5piJexCu6ZaEzMO0
+wG3AG2VSEpgYW7LGixvpOgm22sFA2iXBBLrhdNN3REo+goxT0uHA7QPllzGpWi2cy4dNKxO4
u0GVPWO295pplk=
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-langs): New variable.
=2D--
gnu/packages/tree-sitter.scm | 81 ++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index b412f3d031..00b91f5c91 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -725,3 +725,84 @@ (define-public emacs-tree-sitter
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.11.1")
+ (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
+ "0r3yw25czg1vcxk9015yd8p1n0z427z2l4hizfjy8w8jjjg7cxxf")))=
)
+ (build-system emacs-build-system)
+ ;; FIXME: Support for some languages, such as ruby, is still missing =
from
+ ;; the bundle.
+ (inputs
+ (list tree-sitter-bash
+ tree-sitter-c
+ tree-sitter-cpp
+ tree-sitter-css
+ tree-sitter-go
+ tree-sitter-html
+ tree-sitter-java
+ tree-sitter-javascript
+ tree-sitter-json
+ tree-sitter-julia
+ tree-sitter-php
+ tree-sitter-python
+ tree-sitter-rust
+ tree-sitter-typescript))
+ (propagated-inputs
+ (list emacs-tree-sitter))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fake-bundle
+ (lambda _
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file "bin/BUNDLE-VERSION"
+ (lambda (port) (display ,version port)))))
+ (add-after 'install 'install-libs
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (mkdir-p (string-append elpa "/bin"))
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file (string-append elpa "/bin/BUNDLE-VE=
RSION")
+ (lambda (port) (display ,version port)))
+
+ (define (install-lib lang)
+ (let ((input (assoc-ref inputs (string-append "tree-sitt=
er-" lang))))
+ (symlink (string-append input "/lib/tree-sitter/" lang=
".so")
+ (string-append elpa "/bin/" lang ".so"))))
+ (for-each (lambda (input)
+ (use-modules (ice-9 regex))
+ (cond
+ ((string-match "^tree-sitter-(.*)$" (car inpu=
t))
+ =3D> (lambda (m)
+ (install-lib (match:substring m 1))))))
+ inputs))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 18:00:47 2022
Received: from localhost ([127.0.0.1]:57587 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIQh-00019L-3O
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500
Received: from mout.gmx.net ([212.227.17.21]:58759)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIIQf-00018s-1x
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644534039;
bh=pOEkdS1klKp1pykFgDIXPH7wbzgmn6NVcUgLnSmChUI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=S2Xw1idfnuRMgoEv9bp1RThH1n2nlrHLEjLgiOCqwa6RhuxIjooyyQ5xm834i2/dK
Iai4KoXhudA4bb2qimQzVpl7+GjqFswqNWB+0NJ1GwW8IaEQftDXnuiTbjvj3dcNHm
O4fR2ZvAVcwGyqFOIcZJuDDKvLRRniF2t8nketf8=
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
1N5G9t-1oGTXT2iLl-011Evb; Thu, 10 Feb 2022 23:55:38 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 25/26] gnu: Add emacs-tree-sitter.
Date: Thu, 10 Feb 2022 22:55:26 +0000
Message-Id: <20220210225527.25189-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:6QaZOlZgzw0/oB1M7UkrswrYMlQXNm0GdpY8QcSNTpVaf02yODh
dP4EcAJA2IFNo9TNnnYPg44kNrD+06r38b2IrVYU3tpmQ+L9X3gaJ8airraVAsTpoZxFHzU
Zj+CJYs6ETE13Em1EXof4Tkhi3MaCHmXR+y10a8H9mcq7LuJKVHS76aSgbiNfcxs2JnHoz7
7O9FepsFK9bUgzEIOJyYQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NvHpifCUsWo=:L7be4Tce1nlifRi+yKad9h
YXKzpQVIoCkxw24pSoEI17lxWSwsINBn1vjJbqXX7R43BTrd4twcU6cCSIcPfHCc+COt0a2t0
tTnpVuYfdyykRc6vuwxjlcsMSEeAu11E6WS6XnLb+LZtpzRZTIhm4O/rUtajY1NFB+Xqy1so8
2JRQ0eC+4jtW0uhGd8pMNbp8dXj9SQc+S1P14BFbry3K1KRI16wBSe6PioC3Z4mTwmQGt2ry9
Y72JF98k6tX8OPTG+0CcsOOdUTfR3eTuab7DqLYh9fklu+aNHlSmFVS9RS2QjXohCQunlbONG
Z52FK/owJ+tpZFjzbfY7ko2RrKBzCouJzPbXO/5vJaqNzQwNrpy2cVnWtfk7KPU13Ma3WmML1
n/smxkRGxmulEUBEzMBWjltdnir+abQh7YE+JYyi5tDYTwbLww/HIphK0hzB9KFL3yfPO9HCV
R0K5TUsLiUqaD03z+60WEwCD1FeKH8OJCSg+1H3AjCECHUZc/7TsltkL9yDYbY554WL46rnj0
o4nC4iR4XpcGLTi2DbfsLKGCqe/gqkUQdlaFKVszmdzOnYNUAmgcTUA3kmyTkw4BgYi0KkJy5
xuwAwcWK8VkXgpOJtzjVuCPWKZSv4wN7xaQ5wKdHg2veq8gviqVVBAPqZbZQkDK5dslKX7HO3
BBzr+OPZds1PPc0ZLK+ZU5Q/GCNIzcJ7NGY73ZXQx5aaezly+ti2L3lK+S+gwhX3AOnRKCQep
s6NkOWVia+kLVjA7SpX1tNmrPmcIdUE3SASoOAmCWvMiO1Se/f8sPIMH3L/gNjHy4D/pSiVjk
OjpkiUypce2R3/Biy1wOtXSCFI/qUKNxOxAyEZf0eJSf1XZKqgApoZBw50iTANKWIwHV5C+HN
HcviZWMb7UCk5cQxeHpjSKxtuQTYoROir36F/JEIQ+WIk2/Nvu6K5tbIdGIqYI2ZsDe6nTzA+
qSkDZX6bZiuq47MCl1Tg7yiG6hfTfENESLhAL5donh+SjLc1zBf27jOEPi1nthRafJefTpOjA
I2KbxY+AWU2tv/81akbJlJTLF33IjuGVrmLRmIZLAD9y4HC0aY50+LZfMCAxHGP+H/l714zR+
W/Z1BoaejfEMsQ=
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 893c02824d..b412f3d031 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -698,3 +698,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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 18:00:47 2022
Received: from localhost ([127.0.0.1]:57585 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIQg-00019I-Pr
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500
Received: from mout.gmx.net ([212.227.17.22]:35901)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIIQe-00018r-SE
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644534039;
bh=gP7rmiTN5bKpXY20owYvSlJJUZhVlx/E58LldVdSg1c=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=iymd2u6L0alQ1D0zIEQuwe5URnYyGBcZi+g92t9BFH1wDsN+um0xeFAxCL8Arwm0g
NprUlag0XoX4VQqyTnahGdRhi2c1iweSt3ci8vr4buxP5SCR4Kv+SdSp1q7L2IfRvF
E/0RdQNg8OqhpRZjhiNm1e7qwaXoqaCkQNfrW+6I=
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
1Msq6C-1oBELi0HQu-00tE2Y; Thu, 10 Feb 2022 23:55:38 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 23/26] gnu: rust-emacs: Update to 0.18.
Date: Thu, 10 Feb 2022 22:55:24 +0000
Message-Id: <20220210225527.25189-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:43e6huHklZCjIDc/2aCJRkN7Gn9c31gcmCdOaMC01UUG3ZYWZTP
IewoNjh+Dz8wwJhEIlB+XPSMyca6X7JaHEcbqQQjMpp0yznNakwghQlEuAEKjpg0oTFInat
qfcXPiiHNBbCX9Akn6ET8jrLcEDF7oGn4XXMtAYSkrKeiPwNqaDDdaGL+3kafzpAMZXb7yA
7+TAtNBQS+Hee0zZXHzWA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:cRKLoFmNlaQ=:ISf7N5kPlHuNzem+ZehU/v
JmvEEfE2ruu11nt/fzCW1Mo+/TKf4g9hGA+o7DJzHM3ssfkCI/YAjL3oMmBmlua9kZSBnPSx7
Y8Fj+7Y0or11pXBkfF7PTgROqmDZgmJWJfsB5PhHjASGCcstWTRi/9jEYX/FpEbOtbbL/Y0hh
y7Ww+Uoy0BR+oB1cGk70HHwoFmckNUzWdVG/3ey/U9NTuPX8IZ0GjGcfJr0EoAI0QQ6Am3YTv
07cCpQkhIIW/J/nQctk5ExrJWu+AstRFr5L3cu90QYK+iNR5sQVwqREMZCpSETeoJ2N8MJJss
NZyLrE73vyfNlPZGWecvK1XTVTCYFJs2Jhl5B7wpqZBsgdPgOCpHAuLYH0gW/19dmjGIO5N5/
MgPU2ZTn5pdZxM5Xmh+uBaiRbPFP5F+bXuDToFECVo/Pgg+BTmsoO41eiW2Kz5QKaUGt71Yac
7qoWJ6bqso9cOVw8y2QuCVVriwe7AiZ6rah2RxTA5CI74zQuBKifGXRX2tYm8phhE2MDxfBZ1
snlUGSPzDmoze2RaOaB7TotjLDpnkQIo+3Xh9Xwo54S/1bR25zknQlsBDxK9vU51dIYPMzAyL
EF5p5JaNMPprNaiYYWjB7FIsUFJKJpBcugrq7HmrRraoC58rZekTLFg+x4aMwXMf9KqgWizdp
GxzjifSjqrthayjXfyyeefD2hmBSuBLShAxzFoo4s01ZVNSt43X1d8KFjH91u/j/fL7u8xc9h
27ecJgRwT8T9fJqiCMQfGekYak5lE66E3y4usB5yZ/MBKrq2A/bTjFE24kisr0FwyijfXa0QF
xHi+18c8QU0+Ek3JTE7hzgBb+ozYxTTU1KHtNdEptea999TPU+uYjyxmdv1bCvLbmv4YMTaXR
tQt+1IC3wo+qaDKy8mEk3/bUcyIN+PuPw+haiIrmPzyKmmBY8CfqMyelMzVLBdBhsTs5w1jNT
94WqfRrpl7LOLquv0YNT6NdkaeIUlgS2dQCqczimUdY5CUrl5dm2S4uKlEaZ66jy+SGWU0tiL
TrH0nhkhBqybI9YhpwdJONT4LcwAo3hsFv7YebZYREJ1xULviMkhAwJBD57BPEOG+v3EiY5/c
SZD7u5HwBdeH4s=
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-emacs-0.18): New variable.
(rust-emacs-0.11): Inherit from rust-emacs-0.18.
=2D--
gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea2e9c9328..f9ea194438 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19035,10 +19035,10 @@ (define-public rust-elf-0.0.10
"This package provides a pure-Rust library for parsing ELF files.")
(license (list license:expat license:asl2.0))))
-(define-public rust-emacs-0.11
+(define-public rust-emacs-0.18
(package
(name "rust-emacs")
- (version "0.11.0")
+ (version "0.18.0")
(source
(origin
(method url-fetch)
@@ -19047,16 +19047,18 @@ (define-public rust-emacs-0.11
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ "0r860i73b2680i2fhdl2l1wwvvmf2zksncpckgkksdcx310ak5v7"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-ctor" ,rust-ctor-0.1)
- ("rust-emacs-macros" ,rust-emacs-macros-0.11)
- ("rust-emacs-module" ,rust-emacs-module-0.10)
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.17)
+ ("rust-emacs-module" ,rust-emacs-module-0.18)
("rust-failure" ,rust-failure-0.1)
("rust-failure-derive" ,rust-failure-derive-0.1)
- ("rust-lazy-static" ,rust-lazy-static-1))))
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-thiserror" ,rust-thiserror-1))))
(inputs
(list clang))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -19066,6 +19068,28 @@ (define-public rust-emacs-0.11
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-0.11
+ (package (inherit rust-emacs-0.18)
+ (name "rust-emacs")
+ (version "0.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.11)
+ ("rust-emacs-module" ,rust-emacs-module-0.10)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-failure-derive" ,rust-failure-derive-0.1)
+ ("rust-lazy-static" ,rust-lazy-static-1))))))
+
(define-public rust-emacs-macros-0.17
(package
(name "rust-emacs-macros")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:10 2022
Received: from localhost ([127.0.0.1]:57569 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMD-0000z4-Bj
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:09 -0500
Received: from mout.gmx.net ([212.227.17.20]:36391)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILo-0000sm-9d
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533738;
bh=xJrPTZj+G8//0+zgeJuM7aKOhRsT8ZW8FTEXRvSsEd4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Ruqwq5rQ6c5eCg28GwOr731f4zVPCo35UeYADTJGfAbiM+sufELGWEuMJibvYizL/
JUI7hpAC3lT1vMs8SfsGE1ZiLRpe9BXtm5a+BB/r6otTWdqJABYw986CAHvmQ0YF98
jbZlQj2Z76gMlJQX3Iq209V+GaKPDki/++EigfSo=
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
1MwQTF-1o7dqp1Uov-00sPDv; Thu, 10 Feb 2022 23:55:38 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 24/26] gnu: Add emacs-tree-sitter-core.
Date: Thu, 10 Feb 2022 22:55:25 +0000
Message-Id: <20220210225527.25189-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:qbPZ3B03tvR7p7wUEooFBc4FMg7enTfkIyzKnepMtwEYfNOPLzj
Zb6c3WiFr3U3WupS8KKo7UUV2Jbr0qD3RQnIQhuSu9eXgoxR7zcMKlXQcOQ9olr3TB8Va+r
DGctNN7gp0VVftsj+Wdalu2N0TAipIk6NM+YVRf5WNENoO5peKmGNDkpPiZ502XN6/qpSva
jteTZ21hWFlkmtjOLeoow==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:YCgDpXohdrU=:bAfxUYkDY+iGjFyG2aCfRC
EGGSOEWnzm7YvP/dEQVB//u9tbmcM1WRLk69vuysVfAh3gCtsh/Yaqs1gOU3FiI9qS4PUUGD0
eX8WidPctw26xpBrqEPfY1/wJZIixrcpV3cSReAgIzF1OOzXsYYlqczQ3H+w16fxUtUwJk7qe
mLkR2UIauXkPiD6XctgLOc28vhDZ+QW9G0Yjsjd5YQrAmqUtrqJQDwiQoeu/rytqEaTRyOBak
OgOV9T6DNkqLALlvHGdkMnAbH7f0O6QcZvQTvV2HAu6gc2VWeumdF5pZuQK8aoEn1rPa5j9fp
FU5U3zpkYzZBxnTV8nBPJwomw6KpGjczqDOSFhI8UuJqrL3zw+M0zvf7SL1S8Nsco584zI+Bz
bgc9bBFS+WZSGHwma9uCjylpnu88gEwHe5ofsnK8HF2VjSA0uTiN39++itv8Wi3l7LFquzTWx
/N4xsASdozzXID7YybZ7eo/0wWZwLs9a4bD5pQBm7O53dJF7ZrVtCVVxw+wf9I3O114OajjXw
RbQC7YGv3gBmrHb6l4dnsqfYNINprfBjAYu91JclhFaAQKHfrVDL8hBpyOlAI4XA06AhYSLpE
F6haqS30TNNrCeTJf43GWrw7+5JcS4fC16yfU2li0ZmzB4jjwJMCQ5oKMFUGVzQt0b89Qo8MJ
rTGD7NCcyz/D1fz2IGi/ust9xtn2leXgXvLxTLDSqJDFJ+PpGvobvj8i945tQVZ6NRIyC/I/R
MzrVRU9aPIny+43o8rGz8SaDbCy47nV4/nxCMhNAIGl6TzaPnFYCAGC5sGb9O6tmnlPho4Ylw
L23n4XzbOEC6xdqYCoviwevV6cbsJSiiZw9MUmwJWLaRF/+SsgaGP/6NRivBB7DaR4mJw5JCL
djaJbNkZ0Xue3JB9HxzymNDXg6UmHYHhY5jSWQjA6Q4UyIj45xzsNqdKKSYwCsmHjvHXJDkD4
CHDgXPaOaRo02A0aKOiEP4PiegTA3p9CyxslddRD0CYaydVtQF7J1NmZEaRygcZDKhjeg94YJ
UJeoV45V8MGnpJWZq60M0YoHm+IeubrTbn8Wy6rgWQvBH/VWReNXyq/snDoI9Aj6gShKth7y5
xLKgGKwJ+wFMl8=
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 c86244a300..893c02824d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,6 +20,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 node)
#:use-module (guix gexp)
@@ -620,3 +621,80 @@ (define (source-file? basename)
"This package provides Typescript and TSX grammars for the Tree-s=
itter
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.17.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
+ "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66")))=
)
+ (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 "LOCAL" 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 "LOCAL" 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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:09 2022
Received: from localhost ([127.0.0.1]:57567 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMC-0000yt-VY
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:09 -0500
Received: from mout.gmx.net ([212.227.17.21]:43937)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILn-0000sa-KS
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533738;
bh=LOwpl7vDBlvLWPDFpwEIbtmk4lzQ9U1cQD1VI0h7q6A=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=XsBCRqb7mHeQPQAaW1EN14o9ViSlninkx1SQ3zxlwYOT6OIoO9j63Z4vqktTtdGcH
tFHSf9EGr45UBAwLZdvWwm5NPKqqMZQdHlHZb5HDEha0WwL0oWriEePepN5XQgfBmO
KEBaxWuXEpJp/kuefMIkgiNDFqk8qwAbEfomi53s=
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
1McH9Y-1nsSVp3GYe-00ceao; Thu, 10 Feb 2022 23:55:37 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 22/26] gnu: rust-emacs-macros: Update to 0.17.
Date: Thu, 10 Feb 2022 22:55:23 +0000
Message-Id: <20220210225527.25189-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:CQp4/gwWIG68nOEDRd5wYUsHEV90yh5AwDJh5OG5ER1mv1fHVKN
Ey8urparc848yP/quiOJ4gZ6STOjdtbnkgd3NoZGmpZYew3ghuY44pErUqp07SlBQurpBp3
w9Y07+LLomxXlyeo5jV+9SCX3il6p5QFchgpImqbAlfnrmHp3zVMS57d+ft8rasPnGhm65X
+hc5iDNN6OZED/c5IJ3oA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:lvMx1YRV3dQ=:Vufl1C6sd+z50D0jc6Q9E+
XwGZS7epzp1kxE4yaMwZUiCnbYsvVgV0g/69Lrqf8Pg/Rz5d/NvUW4iQLK37uyZtV4fieONOW
Jeb8nzltQsnyZvZzrwnS/VQd9qGRQAdI8XEvDMXSm52zn9AEGZHl7eLxPIeVCOD5DBY+sNZFw
r8asOWbHi7k+HeddgZxSg/mUdPpUE7uUH0TDhHwhMstaNqKp6pUDKwmnhIUdwPrq5rY3GlmSQ
3lxSkXMAi224AKiynBpvECEVPMZLO2Qrg4oriRvTmlTpx7dEAZP28bbTI10BjZIll6jPouiYM
XWrT+eJLfbHgrfxrnk3BUTK1AFPtIz8wsJivohBrWIWJbUl5AEE724eYw3pdSFw9IjDavh9Fm
hWmcVxGeFSOXQvVpP4NbrBPJizObCojDOr06y0kc00+vU8u/nRZpMMr4do13JPoacPVBLhRUR
80FobsnyVp46idOEaNVU8OuCGhwYVAuOZGgZ0EcVRQpwDZpEivOlrRFYWffMjorUqyVys7OHz
JUt/Dbx9lXqWuQx4eZznRDVBVaCooAuK1YPOmEjqm99v7toRo4f6QANE+xyjz5NMs3gvDEP2m
XJMbQyhQlEUEBT0QB4qi3RNJ3lTzCXXAJMkO7C1X+CiXXP/2MI37fTyYrJyskkXdPkA5VEZsv
ERk6zLHd5nK+a8ugnk6wE8kZQdgorS90GtPqkY+GLo87NI/QAeJeTBz2M/fFXtpnLnn0k4KJU
m7TwRqghA95JpS1nFeuGOQFo+yxFzSWkXLrozflREsDcDCPei5eVYNxS+m5+Sfdczqb1X3OzD
xlTAyvQZX4nqrm8X51jBgqf/nliW9B+8wgHbg17SWKoS5VecS44HsdRjM/1jj74lsANWaX+Rm
l61FLZpjPa3jzzRxjmKEuyfIOnMru4yQ3e4zItQ91vj73Saz2tEDY5I2XyH4+iLq9l4W4wh+t
eKovM/S7ZnFVq+j6LDmJAXh/i44OFRUV8zTLCtTe4htu3/H7W43k3fg538NAdlMf4kh/IfbDL
D3eGg4ZTPXmk6PYnbyqXG/2YmMlPFwkMRflxPkBCjtHjHUd/ll8gfXpWrQvvkgrbqb9rCFddi
nHw2fSpHtRp198=
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-emacs-macros-0.17): New variable.
(rust-emacs-macros-0.11): Inherit from rust-emacs-macros-0.17.
=2D--
gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c039591c56..ea2e9c9328 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19066,8 +19066,31 @@ (define-public rust-emacs-0.11
Emacs' support for dynamic modules.")
(license license:bsd-3)))
-(define-public rust-emacs-macros-0.11
+(define-public rust-emacs-macros-0.17
(package
+ (name "rust-emacs-macros")
+ (version "0.17.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qg1dcn5acbirq617qq2fgg9adswif2dnr292s3qnq62wzgnyrb9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-darling" ,rust-darling-0.10)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/ubolonton/emacs-module-rs")
+ (synopsis "Proc macros for Emacs modules")
+ (description "This package provides proc macros for Emacs modules.")
+ (license license:bsd-3)))
+
+(define-public rust-emacs-macros-0.11
+ (package (inherit rust-emacs-macros-0.17)
(name "rust-emacs-macros")
(version "0.11.0")
(source
@@ -19079,16 +19102,11 @@ (define-public rust-emacs-macros-0.11
(sha256
(base32
"0390y8vafxdi334hhgrzvcqjq3n5ckcmvilqcfp8vajjq8irrly6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-darling" ,rust-darling-0.9)
("rust-quote" ,rust-quote-0.6)
- ("rust-syn" ,rust-syn-0.15))))
- (home-page "https://github.com/ubolonton/emacs-module-rs")
- (synopsis "Proc macros for Emacs modules")
- (description "This package provides proc macros for Emacs modules.")
- (license license:bsd-3)))
+ ("rust-syn" ,rust-syn-0.15))))))
(define-public rust-emacs-module-0.18
(package
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:09 2022
Received: from localhost ([127.0.0.1]:57563 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMC-0000yZ-2e
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:08 -0500
Received: from mout.gmx.net ([212.227.17.20]:55089)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILm-0000sG-Hj
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533736;
bh=V2yBM0BuNrEVzKpJYz/VmalXddCqD74QybapS1w5/hg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Bp8d1tElh2cfDlkfuNjNvINMPZASd9gyZpMbvqtJ0xjnZO30dJEZXb1Oovt1yBq50
x+1aW/c+S3xdb4wAOd3w/6CgMuvDZ5SaZ+1lg3j+UNCDvJ6zBkF+CG+wcjwAA4Jl2J
g6JuYdKZ/NMTNccTh6c04qxRuJgCoAgdpDlLeMTM=
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
1MK3Vu-1nbc9O2huY-00LX8z; Thu, 10 Feb 2022 23:55:36 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 20/26] gnu: Add rust-tree-sitter-for-emacs.
Date: Thu, 10 Feb 2022 22:55:21 +0000
Message-Id: <20220210225527.25189-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:oWu6wrLwLRhpQMWtO+x4MDl9ApJAq7k+mfP1ooOXyhouQa4cCob
Np3NWR28BgiHgfg5dnHYZjhd2/J2p7i/J5uoQMg274P2fSV6xovmWop3FUq0qMYCe1BKnfY
fwSYK/STJL/v5xFztx6E50NUmELwFdCAf8oVfF05aNv8y1iO/TFr7+Uhv0lEVNqUd2U19Nn
scHdH4u1OjULl80Ctxmfg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:TUrukI0IOvs=:fKovlJb5MiZ36RYlAJEKFs
axYNafc7FL8MwG+TyDPRR38s3ighIF9NVp/XdJ6j5GCK9tJ3ioK8EV7WQ46qEjJ451PiH8+Ny
gApZEG8C3wE8s7AUCsVrIuSwgGd5SlFv/VmBuLv/COOKhKKKkHOpWRYiDSSZ/s1gnqiDa2Gto
of2xQt7Fy73jdBgxbn3LBSynm4uWRgknqO3/grGaQgw0MJYuOLMLEg18cE6UQjlIW3f+ZaTp1
gkfxXONAzgIjYL45vxUN1/I+jH7V8OfYWf+2Vq6kJQ2WmUN+Atki4lVYomLBUebeDKFAAXnTE
lX4GVFLmmPoXNP7nyvQvnePsPYaIpwK5zSWpx9T6OHQLUG06yl3nIh/i0ZWcTpw2DGyswQhF7
a9gfmIg3cd5XJcILS0b0n8IWViUcygN5CUUbQKYnaqsEzIw0/q9vXoCiU4uAM2hk3ItZViLy6
BL0O5vgJip+qltpRA449cWlVTe+hC/tKG8jYydo+KO3yMRycvqcGTof9NreRyTC9SDtMEX55e
w4aFptDSmY6TlIk66vypq4badpbstyuKNA4eToyvvzVXchcce78Rxw8CtnFie4ro05nfd9VfP
eeDun/wTH3OYTm+rFi+eFRGbBBRJmkbvWdtCz9vDDZLNT6SbxqxEMDBIdu0vnZ2GTGlOCUwLk
aMR9bRsHj+XKTjvt3CMsYkahX/oN3fgteIIWr0Pt7kkC1sVpvtgLtAPqYSZRk5dvfaD2xlyOp
rusj69TI+uUBV0yX9bcSGt0x1j4eTKPpKHBQj+K+bnW90PwBFqCeXvXbvVBdlD6fES6KQ3gEH
LRBUtENqyTMc2U5peQXcBIH1Nq/BWm+V2I/D9LAKM8aTpElFkdL6HPLTog7rxl9Yy4Gpk24Hl
YEw4iqYMn2FUXydCrtukHzO5+QsnkNJxXKcPeUqtrwhJwDVRGDBuDX8di5KK25WtispRJuTaP
Y2998I+ySwfIkIznqSbCsHubbYwS8gScF9ZOcg5Oq7Ea1BJRsL4Ll7psC/DfTCmP/Mfr1VeuQ
isQxCCrOYf46nJsTxuFmBrWibwWMFXNHTDfU9W5TLyBwv2Tb+DGRBHtC9r6s7IQaeR+vee2fd
vEZL6iWClpXPc0=
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 | 45 +++++++++
3 files changed, 144 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 273d80a9c2..f2b6f0afdd 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1811,6 +1811,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..beda2d8391
=2D-- /dev/null
+++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch
@@ -0,0 +1,98 @@
+From 475b822f47bdc58d832533448b6f6d9818554f37 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 068a60285..79c3991ed 100644
+--- a/binding_rust/lib.rs
++++ b/binding_rust/lib.rs
+@@ -8,6 +8,7 @@ pub mod allocations;
+ use std::os::unix::io::AsRawFd;
+
+ use std::{
++ borrow::Cow,
+ char, error,
+ ffi::CStr,
+ fmt, hash, iter,
+@@ -162,7 +163,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;
+ }
+
+@@ -1799,19 +1801,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
+ }
+@@ -1835,7 +1837,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> {
+ TextPredicate::CaptureMatchString(i, r, is_positive) =3D=
> {
+ let node =3D self.nodes_for_capture_index(*i).next()=
.unwrap();
+ let text =3D get_text(buffer1, text_provider.text(no=
de));
+- r.is_match(text) =3D=3D *is_positive
++ r.is_match(&text) =3D=3D *is_positive
+ }
+ })
+ }
+@@ -1946,23 +1948,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 2dcf4dae87..c86244a300 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -23,9 +23,11 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix build-system gnu)
#:use-module (guix build-system node)
#:use-module (guix gexp)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
@@ -146,6 +148,49 @@ (define-public tree-sitter-cli
This package includes the @command{tree-sitter} command-line tool.")
(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
+ (name "rust-tree-sitter")
+ (version "0.20.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1yg4p54hsfsxxknjq492i8b4rvibzpl2zdvr2bwvwakqgah05v33"))
+ (patches (search-patches "rust-tree-sitter-text-provider-fix.patc=
h"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Force
+ (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-sitter\");=
~@
+ }~%")))
+ #f))))
+ (build-system cargo-build-system)
+ (inputs (list tree-sitter))
+ (arguments
+ `(#:tests? #f ;; Running tests misinterprets comments as doc-tests.
+ #: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-origin name version hash)
(origin
(method git-fetch)
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:08 2022
Received: from localhost ([127.0.0.1]:57560 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMB-0000yP-KL
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:08 -0500
Received: from mout.gmx.net ([212.227.17.22]:54113)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILn-0000sU-EJ
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533737;
bh=9RsBaX10QP7j4RcEexHfg85O/0QkLwU6CDiB3uuwJeE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=idIe4wecf39c57J8l3H6W1iWGnDV6rAsW6s4UXQRDOYhytjOaT7Sz4AUTK5y/ddL1
31WyemoIEWYRS6ihB17QernHL4K0J+8KMjb2My0+hhXpF8ky6iLv3/fWBoSHxnu+3M
J6ueiaMixywc/6KttrJpQi2Nq9KjysbbbpmW6B3Q=
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
1MOzSu-1nfRuH231Y-00PMvi; Thu, 10 Feb 2022 23:55:37 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 21/26] gnu: rust-emacs-module: Update to 0.18.
Date: Thu, 10 Feb 2022 22:55:22 +0000
Message-Id: <20220210225527.25189-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:1ThXsMJUnxcjaRFy2ZYcM2lkE70cV7Y3+7MpM8BCDeqm5786F7v
7Jy08FKzvE7NWPlkMPM3exQCrWO15pSIVaDs46ycH2qnncCL5L9Mfw36vZNlH50Io1UHfu2
1rOsd2b6Rgn7/y0Ily/2DnQlnEdZub2d5gE3eQRFeEDqnvACG1ngMsW42JLWhUUTFez9KSO
Vy4thv4FiUKyaWxJJ4U5w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:CepGr+KOxzE=:zTL6bwNqTvWXEv06/wmW6x
aBzZFYDtv3FBCHdmF0H1GN1VTDLWzXBvj0xz0JB/LorLpzAKLj3XymNR/JzF6dDXEIOnPUOhc
RkpZZn2zkeWQKUethVt9oG0wt5/PojeuMAW/w48LHb9yKWEeKpR8jHSo2dYUu3jc4edihNCSw
RU8lxihu0EIosuuacRCEp7h1lj1gqUivZevjxu2WwANWhqyUMd9sYCNo8octyupS13T8Z1nmf
M5jA59X5UE8vmeX9awc7QcGKdSYB8LwYkRtJuWgYKv4+i2HeSvzJWzpuCPb9A2szYIUpmXZ/r
xuIBY75ASxqRviT2ZUSEqBAsqTMDL/rCUrtHsyeK6i5xGuxuGUtB6Uv8SMcrFM9LGTy1lqysR
EWfdwpr4Shz6c0H7Mcdv94WUnbBzZKOEVHH8L3A1mhwQdmFnxLGKRKfWbnDfKDFKGzCk+ERxX
j/T4FdzOmKwW1FxUkIEdRK2vY1hOcQNCBExGxuXjW0AYc2ZHizGg+AWlz5VUrk5dsWNPxZ91y
84iwFWQ/R2hHlly820Ogxrot5wChqfUMjudnDBEIgCfpXg4V2QoqwXDW8ycA9W95HxKD/584k
iRIuAuHOSiVTWEgsmCKTsE7M98N8XLUJaRW8OOdXHeyMI2K3tLSia4SNX677gXZ66E+rGIXWw
5K1/gU801l1yK9Q4f5q5nXdF0Q8et/s05KgG54MNYS7IlSybMsh0+WWDUClmth1p+VsQ7YOKI
hP0vmKYnpwEiormvaxT1u/n58jJKA58fU3QfZM644PsDaJuZe2A2GUbdiGkKxa8MNHlL4/8Yy
mlVOYKRhU7I7lx4aY6u2TH3qItUrcgJuoxcsZYu6ITsyWykYT2pUrgmkyVjo/r14PnZYb45gy
iYOAVLqx7OjJU+yo0nt4KgxLKjT7/EQ65zMLjjEKnGfnyx62ScSI5VT1CdBXznXbFslxpOo7j
02J2FgqQ1guRw7ZISG389ccshoQDAwyf/cI0cYVqrjHRzIvzLszQkdpc6ohTJT2VpWLiVOVbk
wVHi1aPyLEwY02blkUNJd3/x9iU+040gTzjOQ+2+P2DMYs50CWUPg7OGe2KcgIx5Qy3G7CVj8
/mPgKNQYT/NPGc=
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-emacs-module-0.18): New variable.
(rust-emacs-module-0.10): Inherit from rust-emacs-module-0.18.
=2D--
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ad27298404..c039591c56 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19090,10 +19090,10 @@ (define-public rust-emacs-macros-0.11
(description "This package provides proc macros for Emacs modules.")
(license license:bsd-3)))
-(define-public rust-emacs-module-0.10
+(define-public rust-emacs-module-0.18
(package
(name "rust-emacs-module")
- (version "0.10.0")
+ (version "0.18.0")
(source
(origin
(method url-fetch)
@@ -19102,11 +19102,11 @@ (define-public rust-emacs-module-0.10
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ "1ypjyyv2ca3vza4sia91ckxamgfk63yd8frkvg3d4ph4fk4pn1mk"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bindgen" ,rust-bindgen-0.48))))
+ (("rust-bindgen" ,rust-bindgen-0.59))))
(inputs
(list clang))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -19115,6 +19115,23 @@ (define-public rust-emacs-module-0.10
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-module-0.10
+ (package (inherit rust-emacs-module-0.18)
+ (name "rust-emacs-module")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs_module" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.48))))))
+
(define-public rust-email-0.0.20
(package
(name "rust-email")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:07 2022
Received: from localhost ([127.0.0.1]:57558 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMB-0000yB-5E
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:07 -0500
Received: from mout.gmx.net ([212.227.17.22]:36375)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILn-0000sO-7R
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533736;
bh=P2Vye6K3erYyoGW0OdWqqJ89HOPlecdQ8UmhHE1dNiE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=aJtb1tlkLQpgjKxjZz1iRjxLMfEcKWZEBIctTmfbFzxixLAP0k07zzQO+koi00gM0
xukb5tFTMYou6rC+U43OxGeMrQ6op8O1R1Hdyde73LjvdsCsyElNyj78ObMps/j1zM
dLDXH16DT0upoJWi2GsvcGMZYuF7gJseTazKIgEY=
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
1N8GQy-1oMEps0KNE-014FdP; Thu, 10 Feb 2022 23:55:36 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 18/26] gnu: Add tree-sitter-rust.
Date: Thu, 10 Feb 2022 22:55:19 +0000
Message-Id: <20220210225527.25189-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:B8BLb03HqbTekIeIYEWNTw84XAAvD/CXetD2iqjIgQlfAdOrQnF
eCJp1Cbt1XzMlX//npdjjkQOzJ1uw7vV8raGQUFkQ66gu64os9lXew6q17XAFLi3ak31m77
/9oe0wEXdpkQRAiRxorT7puYrpWmXMuu1bzWyY3hY4gVtELTs7My5q0L9ICKpr40lSVO9hv
igMfz76WrSQduF5xhApQg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:REGd5smI0Ig=:hXVWPTdEGal9PekG234/Tb
LrvFoPrLkGc8+RFjlCGFdZWiBNu93a6l2mrWM89aszDCG5vvUoO6+3pA8Jg0WpHP4jH43SeGJ
V9ViMYtRipfdPR3fWaTTusC5lFAxNUAaQM0r3rQ2ibszbFEx1AkAzFS0QLq3jIIB8Z6SkJ7I7
x2+w2/LBMs4Zh4rnluyvs61n2Wr6QKCqtz4HjOA7Ky/1+XWDM7Ps9Oo038M/PwNAXbMq8QI4D
+zqQBlmaFCrLR+2vMkJDWCmNsuFkMdBMN7A1MrfqMzUC5x1/oW/LA8FiyqRaOWvNq1nOhBJC+
jxy5KtfYzNfulC98BmMTFphLvdO4BHkqQ/7H02jQJgT+abHc7s6+LpdLM5n4vEhkqhqqwE4hU
SJ2esbkg4BQrwJe+d/oYNxFbRHQDpT86EDdQKM+xlzS5J2IzxV1efHP87wrFDEOb8ffuCr02D
ufF9zdXn5MxRb7CtL0vwJ27b4H/12dndW6Z6V9YUl6eopMUKc1Vz0npkEmKs7wdwy3O68KGPu
ksisHTu28CyQPa2QiO8GVaCJFllIwhDZltoYguOIRzOiLzNt2e1dBgFOQmY+2+856W66DH55h
c4Qa77qG1W60Vck9nI/3rgn5yEu5zUlCMsFqmEmCjcrrmPe50XEfNJ8gT8yFSqxxO9OY0oIJb
Y04cehbCersFwYIJnJMnBxByyJgvIugBlCoCTxLKjAkU5rKs+EMF3n5clEKgIXuWBVkodtUvI
m2lNrl+2wHys5lCM9rsGuZctJg4BCEUry5k5b8WDwkj3t8vYXqMh9cbvFsyzz/bMdO+7FUDCX
PyTbACp7ritTsxGz1YgCbFo2M+hVeP5ENYvVpv7hxTvlRG7ui62MUf1/rH1ZIXjlxAzgNpm37
VrRNGijn5w/HbAX66kSaB/8R5EvbB5nJ2G7cuUh+P4cQdtOKNmuQcX5ghkNrjClp5mawwz2Re
UAnJJxhfX++f8DEM60QL7ykMN0vg8zHU9dVpD+0inkt+VsvGKsrVNyKn0PlE3ZOTdF7u1JwcB
JtJhH3AjklVIhhA1pcqc9xRGHw7QEzKuEtEn0WJGVMPtUaPOK7U/WIkXJav31pZmlCFGS+1Is
sDr8xnSnTHWvYE=
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 | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 05d6ade77d..63e558f50f 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -26,6 +26,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages node-xyz)
@@ -470,3 +471,20 @@ (define-public tree-sitter-python
(description
"This package provides a Python grammar for the Tree-sitter library=
.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-rust")
+ (version "0.20.1")
+ (source (tree-sitter-origin
+ name
+ version
+ "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg"))
+ (native-inputs
+ (modify-inputs (package-native-inputs tree-sitter-c)
+ (prepend bc)))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:07 2022
Received: from localhost ([127.0.0.1]:57555 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMA-0000xx-M9
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:07 -0500
Received: from mout.gmx.net ([212.227.17.22]:42671)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILm-0000sF-85
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533736;
bh=g25eRCWSkZIbsY50HnVa75JdR9uIEUXO4W4z3wNRbSw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=IIMRHM2lJD4BgMzf8OAZfW61t3IoVJyvx2coqEqxaoxQfV5E01PspM7AAKj4R4aSb
AwfdL/tNcpQiQDs7zE039GcZeRHKHnMWOnooyMbl78kZkj6lhWGp7sTEel6+0LNQ98
imxB837FKCrfQZu1nkHbo/BhrJcGjZnZoGqG5aWk=
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-1nYa9F1X3F-00J4R0; Thu, 10 Feb 2022 23:55:36 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 19/26] gnu: Add tree-sitter-typescript.
Date: Thu, 10 Feb 2022 22:55:20 +0000
Message-Id: <20220210225527.25189-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:mBss4GrX76xSO2luVyo5H3Bhl7sKLBEZm5HwLSbltJkyjv7zBcr
oFqM1l4FMgKGvEhSPLQbysqIavTEmkkAuG2j+7PSz75s0JfTFRRLSr9x29Jzww7Vot6+WYR
GdiuZVNSAwfkgxemERojIeKA0CpCGVs2VZvHPAC5IfX4B35APQYaN1/yn6i6NF5Lwo0d6u1
RwdjNMfp9zStZk9D+pcSA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ieK+/+uQtEM=:d9nyDqaG287C+XKeVm3G4g
YR7hr8czRckMTaLm2xE2ZNWdYPpcukSw1SbadQJQHRdcVxZWpR4A+fBKoQxmGduMnHOzZOgJW
kugpSsBEKamzOnXSc3oSIVoZ7y78xqMl9xT16Uk4ALYTSs3/n1Br+hesZVkTYYKi7kd+bnDHC
cofdthL2D38Y3OwX8Z1U+QeaEhtkw2nRVQ3ashNudKXVqIdST/9Y3p855CTQna+a/rQIiHwrT
yf6qSFLeigO3hVilt6x8BIMfJ2xJyKv0uIpkdQT83y9/plpjndSWUzd/t0zZia3HbB2WN1QP4
DmxFU+cDSg0PTUAj/mg2k1mLTzFyWZbN66u2q/cvR3YEYMIErJ9u1IOSQY3FKdxR2qaOfGzEq
r1ccYrQ6KN509LMxU4IwZi664bCpP3KtukxjUKBtZvW0tdJA6Yd4NrbPS+lIk6TCcQuk27ebG
Ft0/UEOj+0MCY0c5fy+8JPWdHDXbDDnWpYAui5A3e6663NakY279bFVdGrfiJUO3rCXSB/0FE
vUXk45KRuwc53IHrvJvfNpLvdWRVIdSKJXB8UDgU1RX2YjXDsh5fLErD+eXRmRhjXZAQJcbha
KibstpPt0ywrrkCbpdFZ68lRpNn+v8fXNZ2cicKdwgkRRxCYlZwl7wi2FxLBzWVfgdy+ic4X/
ytS2FhwMbzXM/IZm/E/cv1jrxoYhGJ1Pw1M9YYSqpMZEgnP2oTNjVZUJYwdw3N5KumOv5yAkl
gge0yALJamEg3MccwReZ51GlAJl8AsBUM8YUu4+iwqii4A7+TRV5/JYvd3cjYjbgzLSVqhNLg
oA6G9a08bx9snygpWWfgCYrHGRh0iPdbOUPTnSx2kWVTjdHpTXF8mQGljDjLypzcgwN8oDo6U
1dIOO7rpaQZESvKnYi1+Pg2GMZwnK//uRxxZ26okV4Qz+7WvRjqnnpvqD3jswoDy2BrBNjLW+
1Jx+9YhGMI3WRZ3TuZfSdwzZhs0mHO/hjYUDXj69nMG1o66kQvB0jpujm3/K7tLxt0XgLgsMH
raM55knIscBxPyrnt9a1p34Ji6UDvxdONWmJmVqgDq4STQrTe3MrOkLWf5lctcgZGonNet3HT
Nb05WECsIUafCI=
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 | 87 ++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 63e558f50f..2dcf4dae87 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -488,3 +488,90 @@ (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 (inherit tree-sitter-c)
+ (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
+ (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))))
+ (inputs
+ (list node-nan
+ `(,tree-sitter-javascript "js")))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))
+ (add-after 'build 'build-gyp
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke
+ (search-input-file
+ inputs
+ "/lib/node_modules/npm/bin/node-gyp-bin/node-gyp")
+ "build")))
+ (replace 'tree-sitter-generate
+ (lambda _
+ (for-each (lambda (dir)
+ (with-directory-excursion dir
+ (invoke "tree-sitter" "generate")))
+ '("typescript" "tsx"))))
+ (replace 'build-and-install-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (use-modules (guix build json))
+ (let ((name (assoc-ref
+ (call-with-input-file "package.json" read-j=
son)
+ "name"))
+ (lib (string-append #$output "/lib/tree-sitter/"))=
)
+ (mkdir-p lib)
+ (define (source-file? basename)
+ "document me"
+ (let ((path (string-append src "/" basename)))
+ (if (file-exists? path)
+ path
+ #f)))
+ (for-each
+ (lambda (lang)
+ (let ((src (string-append #$output:js
+ "/lib/node_modules/"
+ name "/" lang "/src")))
+ (invoke #$(cc-for-target)
+ "-shared"
+ "-fPIC"
+ "-fno-exceptions"
+ "-O2"
+ "-g"
+ "-o" (string-append lib "/" lang ".so")
+ (string-append src "/scanner.c")
+ (string-append src "/parser.c"))))
+ '("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-s=
itter
+library.")
+ (license license:expat))))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:06 2022
Received: from localhost ([127.0.0.1]:57552 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMA-0000xn-9l
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:06 -0500
Received: from mout.gmx.net ([212.227.17.21]:48351)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILl-0000sD-M0
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:43 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533736;
bh=+PfeOdmN0L5Hnrbd1wNUsKu1Lq/ppR3rRSofZYsD4JE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=JNbkrM11tTiVbveSgudwqV1V0/zJoUgGNqKJIDgoQuKvB7UzcDqnWZIVVjeA/bWuJ
hA6P7GDwmHGp1kCxLx4Hxkd1GpCvnkIyrz2th4+q28RCB0mNEOG/GW3p4bFI1RD7GT
+dU/uqIGsY7td0pt4agKaaLvIsKsOCKJSNlNggyw=
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
1MCsUC-1nR82J3LSS-008rih; Thu, 10 Feb 2022 23:55:35 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 17/26] gnu: Add tree-sitter-python.
Date: Thu, 10 Feb 2022 22:55:18 +0000
Message-Id: <20220210225527.25189-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:xUsSDTlVUPfXKIqimLoe22M55MAA5rCnNriJKc+jfJQCs2tsRCe
lEcy+f2yHpmpPd5Sux5U5qe2CjBdgBaAsH2eM3NIKuiw1NYTMujB0xnLXxlJrSZgI769ATG
N0aO0PLkeHXmByK7xrn9NthVSCNxkygT5tzLPqHYbJnUj5H4BtNicCQKeghgJNGS01U4zt/
0IhqLDf5XNdj6vYq2gjnA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:q9Hs+zL8xbc=:ZaNndLC639ILVCtElawyT4
V+ZXzprto7c+tIcVzlexzo7Y/vXITf8oSnCVocgpieFD6St6d6l4PPqr1/PmNX/uNDBKVl1rD
jbjk8fAMrJf/8Sw5sfVFy23dsCI3hLqRxvneuZTk2/yf5Yt5IA2PJS6W8fZUVruc8+lqIyxKp
+w29bXNca6Ro37gptfR+ARoIzEbqBPpD57rLHkC26mmhR5UvZ12vPoDEhJ33aBvnOD094YpoR
PgEexZXKL+BSGfZy1zUGlN4ujPLL0kMWiYELGCslOD0IeC8XXsC0RUipi8O2YUayewQiwc132
0Jr964Z03M7s5R4oby+v/vN1hGYxOlbykxFsxec3vtAQ96CfD0jKcwma2X08WsZFzDwHv8dpD
Z3B77F6FmyOyvmDMbZxS1V1diOShxihqGVHo3mdNBvBhJt4LHr61XXY1qH7cgoJ3i2CinnTTH
5d6aQZWHZHJhRd9Q8onEMYxo1hIgKEGAGOmPZkcQvuo2ONHyNDIJBHDiuohm/FdDEsEU9eSqr
LG/GQZgM+d4R0lgeswWqpJCvC0hAzrVxcPQtZIdGqiPLPWq+0bAfiTosCv14D2Jv7WM4PR5Tp
jKABIOQrx7MyEllT/Wl8cpV2SDQVjMd1n2TFQ/kC/0dVQykcRyCFqgKyzjEwstBheB9A/Az4B
Mg358/mbloYMa+Nv1+K04qQiWdVK5Yf+t63yMjefnDWCQIM7kkFcMQDt89LOIY+S4nYTFIt1r
pk07Of80rkwD5j2X8tS5TDIqtUMGUAi5bcgBbHENVZRR1xrjctGX+JpU70kDwcBXHyCeU3eXk
HTTjn3RXSa66AvBIEkU1AvJy9pRdtqcbmx/MTF7Z/jnDENQzEgtnc8iIyUiRi90FQdyMuK7YO
K5RJOy0/WwEvI/MPl4EE3UlGWR/5aDVsrrtHIZrslGbRduuI/niVagiLcs01NM/Ujc/NlBfsF
JBfgqX5ncx9XC3vZ5Lm3rYX3NVleZPi2s8rZWu3RMJjEkBfxPRZWoYDTPnF4SQojDjMTC07SK
Z5wF7tH6kOHeV2Ey6DpugZYl4OnK/tsrjFEFXkyUfLov3oIiTxrn0cDQSAQJK8KjTqjPU/LdD
7MIp2Jw6rN/wuk=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 072d2bf588..05d6ade77d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -447,3 +447,26 @@ (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
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-python")
+ (version "0.19.1")
+ (source (tree-sitter-origin
+ name
+ version
+ "16i5mcpz4ld0rybffb0nxim4crb9fhnnq20b4bkjs7jjr3zcx7vq"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:56:06 2022
Received: from localhost ([127.0.0.1]:57550 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIIMA-0000xg-1F
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:56:06 -0500
Received: from mout.gmx.net ([212.227.17.20]:48119)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILl-0000sB-FQ
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533735;
bh=Hhy3g256jZi53Ro0BkwJFm9eejZRrT1bHcC3+V+fuRQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=a7XJmy7KP8zlQuwIHqmtNCP9e390tIl+2qOUD9WekLBuLt1sHKiZrIkFfDzR6/bYv
aVV5gWsAvrJQPYCkCHVSmUQQz0yNSNXv3VJOUcJmVe4yDoWhCgqbl5pOrWa1YhXEpN
TQid9aSKgjPKXXAr380i5KgUS2ii8OdURCyd783s=
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
1Ml6qC-1o1ICZ2BVE-00lUKJ; Thu, 10 Feb 2022 23:55:35 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 16/26] gnu: Add tree-sitter-php.
Date: Thu, 10 Feb 2022 22:55:17 +0000
Message-Id: <20220210225527.25189-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Y3jxTKtqOxlcZ3rwjk/4vzfSdIty66pxbPm6pH+bpYdyBF5aUx6
ZNDend2z5mznmGwRSPfieq0j2IqyM+jygU84VcXKizj+4bLTdAEGEXx5Ha5HOnlwuG+Syya
tnIvx1bIIzQy0NL9v1b76ZeE2yuajrlWD0B7ttjaPYp1Kte+PcNwMwFahwjKtDNPiwyRTkE
beDpvVI253Zf27YqZVzfw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:XM41TOozwXQ=:vjFzv6sA4RjJM/En9TrNJF
nHST6XndOMRuJEZFKnnntj+alOldt3uOzucUCwuTkqdtTN/KTomMxjqhWe4Dpt4kxjMRZS+ks
5d5RK86vht3y6VIzMv/bz53Opc/Fu3cVyRDXqp6NeBb3muaS5e/jXXRHqjdL2lMS4/CQgrp2K
DYpY0evi9Fr9h0tmm+tw4cnuoxWArG8BUK8ae/SfIti+D7vD2cbZBqP/KTTEZtQVSv5PpEvit
av2OMZuP34Dlx53IKdQGN/l6vpNx5qjXWgYiRd63FLPcVeVjy0Vnn89T7u2nQFAtBzR6+VAad
R4aI68oouEprm2lgYpg+CHbblqsSVMWKb/dJExoiXdy9MROwkoi5M/3ymNCxT4Z77kpw2SbP0
bz6Q/vRJXi1oEqYp0R+dTQ8pKBvemMUxOJwy+fXC67jlzwXLU1CxrATHqyZeaKgqWI1vpKdf3
UuqxWi4NM4AHlgtvzWjuntHXcVlDZ5DzHYy/qL99pE+fLMHh0a+3BT4X32FuZP95n7ltZ6ieZ
5xH287Y0hwRkEpyvzsCdtLkk4FzJm1GbHyW3JrAJTO5L7R+IPJZxaoSGJydbjLfRIWclWpnoa
BSsIDveewvCdsNtl1kNJPCGIwDGdYsZ6ObXXJt0EQqFkMkuzGfJiXgLOU0bR6wAEcinVEvvbf
kResWtfdBL5SNgE1GckLzp2h9oUdWd6qJxNOUUoC/5y0GmpgBt5McRth4I5crj/mUnC1VzDwV
U+gY9TokUnfR2bsVorajthE1rgMYSDiYDrRGcEmpKGuJSlwxwzr+2J8KP77kHaZ3ycMbkOBC9
kQxsGnzeosyptqjZPug/Vxy4M93+yOk+/MZF9g6i1Z0QSKSaeZ532K4jfaaYLUkfyR22FHGDU
Q4kIxSrouV60Wo3E9Qj/9r9LgwHOwERk4KGq454XyoeTm5gT3i5ReqUn4A43s3a5gQbAj/gU7
HiuBDITjuOPvLWPB3V3j0plKEp039NH3914Iex/GEqlqfbHrCXSkfHuUXkgIfBySJV4IW4o//
/hsQmjMVPBFyBE+FGCpHwvBh84kT5NI4nP75ztUKtEQd4W9oeDxl0hKNmnbQo7Q1UpLsOO0Z3
OCaKuRINY2H4Ec=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index aeb541224a..072d2bf588 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -424,3 +424,26 @@ (define-public tree-sitter-julia
(description
"This package provides a Julia grammar for the Tree-sitter library.=
")
(license license:expat)))
+
+(define-public tree-sitter-php
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-php")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "17cmybgpprw7w9d2v7lmc6zmr90d70g0jqq279gzg0mpwfzla53s"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:54 2022
Received: from localhost ([127.0.0.1]:57538 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILx-0000w0-MK
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500
Received: from mout.gmx.net ([212.227.17.22]:57893)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILl-0000sA-35
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533735;
bh=ZHAhW5W0cMRDguPVjvdeALj2kEkjHBCbdapWNxUY420=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=h7FYIKOtjGodKZ3JmKTSj2KZ72wJxjtwRN89Pfsu0Pv4caMRjp48wDfiJ5RcpcLVx
bnjVx9kEib5n1f84cOF2DyFKnKsAuNVHOJOjdx40aYBjWVK0TObTM+PLmKDrmqhnWM
BR9M7EXtbt91kS2l/D3rOI4Q9xr7RfgyqXvozhxc=
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
1MvbG2-1o8SvZ0y3S-00sg6L; Thu, 10 Feb 2022 23:55:35 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 15/26] gnu: Add tree-sitter-julia.
Date: Thu, 10 Feb 2022 22:55:16 +0000
Message-Id: <20220210225527.25189-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:8znVq3vxoGoj3AARi5A1jwsBFlA29mX8h7tTU1/FwXwF2NcSOOa
ObtOuTFU3LsU0XZ3dQTir4AMZIulwmAZsY/KoB2ZA/0p9/F0BRxBqUTQEVp91cfFoEQU2gm
zuGrzbHAMtyd9BbV+2icIeJYMATWFxCGN/1XhAM8mrcVr9449Db6SDnd/yNdHMHbBDl4oA2
hILNEwfcKTAgqZQswjmzg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:MIK39cJUZ2c=:4hXUBkbhCCZ5QTOXmNM/z8
H15FGOJb+4yN21cAUPkVSZNrmUM21HWkj3ktDqsjaHJ9CUNunhvT61+1Ad4WgRHF3xtnCnVv3
EhCuoXimskRLxKkKDsqJ7ue6Gtw+3bnpNZTeiRkpXEiPNBQgiDNJlCSAHGWHhRoGuBR3JXM6O
eTlcJd1/m4i+XqzWSPHN0dKPTGOe1f8AxF7YXV9DN/VtPhreMJjn3HuSeJqifGl8fDvspDPvD
7ybL0g4Wrg8Tvgv/XpSTsdnp+c5JUfUbWSdEqxiQ28O6nw8IQBKd8h8wviVPSvtEvBx+Rr0yk
Yo8gqvbSKRK4fO7iGTcQjJNehl/X3de69AsoRT150HWCA6FQsjx880KRXM2O1KRRxR2XYKSoi
EOk8xwE5Z0S/D5WV7lg77flYUV3Gy1rWq7Joxp0qVicHiTEbC1F+E7fSWB7hWCM5V5r5wqv6E
h8eoPAmUJPBrqR2WOmc6oSg7jgBsnK9LDxH2AovrldO0mTJ6CvqStt9E0ze2Z5eEfWxgaD1lK
96auJOBFZqqqEw+kQbL+uPZ05W0fOmtTgLeDWwSrefMWwXvfNaAgIeQtjOshpCQ1E4MVVsoKI
oOcCIPJMZLsMVh5qR78T8aN2w549sYw0gLjvt9gb8SbdQf4PXN24k7R3xZHsr6czS74Zs1kjr
woBNrLg6v5RXHPNix3R7rze3QVbE+xwNaRnkUMSq7juWU4UC1IZX+yiCLvXW7yIwVg0CjqZ9s
QZ4Q3s/kLsdF1SPHw1s2YfTX83H086u/it6WdxxuR33AQwSJ/+3tzwY5fKxMype3W8WGxXHG8
TM11Z8H87WrAa/66bi5/nXTQlv8WL8GH8NUktQF5p59j4jwQ45pEt0aCxpKWJWKfWVB9jk5xm
Tb/s6Yxyg9wUdwDUm1OI82Qfh6ZYWO4B6YTQmGfiWvSnGZgJ8D0iQ5tmLjXX2Mjo9KlA1+zHK
oFqViJcpGPKMiTv/v6iiRpR6Fihyw4jFZLaT4pQAPOD51ZGV24cCIVPJ2j26vstLtUfPwAKvV
sEMULrIdlbA+3rh7IgFoEgQb+l+EQW9iLteTYIDWt+GVm4uEQu7OvYZNtGNCyf1T0/SCitj2X
J8U1D5jBIiy3Mc=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d35edc533d..aeb541224a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -401,3 +401,26 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-julia")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:53 2022
Received: from localhost ([127.0.0.1]:57536 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILx-0000vt-9d
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500
Received: from mout.gmx.net ([212.227.17.20]:35647)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILk-0000s9-Rf
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533735;
bh=1Cbsue0xqYJHpRoPi3I4HYTFLA2oZXH9cCBEw0O4HGU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=jTB5YGIdapPh+xxSh1MFyMEuC08ls4U61F/R/uLLDHcgGrJZw5XPiBW/PANwlX53F
pa2KQvE0j0x+YftW6ysob2WDCcVSc+sDhLf8mco3Du+3rtiWelLjNNzP7nSyPhpc7N
/nhavaKleG1k5Wf4dGouHNsssIY8UutBW0ZC9kdM=
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-1o7KLk40K2-00pK5F; Thu, 10 Feb 2022 23:55:35 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 14/26] gnu: Add tree-sitter-json.
Date: Thu, 10 Feb 2022 22:55:15 +0000
Message-Id: <20220210225527.25189-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:fp7Cqi9VJap/vvwK1B0dyF1577u5wUU9FEWYNhmmHUKe/ZYDaD5
whY7kkjRCBJ34PzX+9kwTS5R/dJcwxUJ6GppPhW0Zwh+T35Y1F3Z3kWIe4T0bRiSACHsJu1
8AP+LMZcVVb6nGVxjdXT2ib+vsiUx2buVlC2Xl5uHyYUMqG8kwxbcz94fZEU5Rd5METKj8d
v7cU6UWqgxFQJQ0dKUNQg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jxds1AF/zSk=:569ayeca/VDEw/wsk53Kld
fIlxbYDII4MfJQSUknKp4/qQe1agd8ebJCpQCnZYRNd9d22QhFkJ5K+jvDeYAS90SZNi7Rag2
y1oNxnUZ/9sqClkdSmL1GSnUq9vvBUcB8ey9aTeNj1uHF9FmTsxwdbYGdnivKfgrQtGn3PGTm
wVGC8ZLcAJTSxJTUEdGciXpVlV9nA7DTOnCvfPNKJl4NGHcjRb2vXVkKKyp7e2RtDUY3mYzRo
Hxw8isHswYPJn29gEDBBPcK3DZcBq++I7JF5d8nTQyU4Z5Lnz3HAkNQ+jS3hA8z1GR8M0ct6A
Gk9vNOnlnKEBG6h8ERJhzkmNBqRq2SgV6AcHfpquYz6zfnL/QD8Mw5XU79Bl1p3KA7VqL3X2f
+k4RKL0QyI6ornrCHM/evlp5TXndRbq3ErIbtByKIQgMm/eGQP8AWFwGRVAKYWzMts2qXI0E1
ENmEg58hsxGxNoNjvSLjB0TBUzNNIIJOb5X+3i4pweFnkpGi5v/X+tt+/30enYo1sLHzYGUyp
2EU6Bt0OR4JnvpehK4gyPbDtPWI2PgSD8FSGg7QXIjc9RhHu44JZI4KPGuKD2CFeDQpt/CkPN
44mhDlLA2bvh07KIx+noiPEJAqbmwMPbERO+fwogRcrOWaPLEZPnUKgZYb1seLT7d3UVUb+p/
cyrLyZnTPnBUBGbnG4fRzU6YSU1LhMNqzDA24bRtMkV8EmJggIZI7eRzN5wgfPdWF1fuPHZQo
pLgKxK8Wqchhw7myzD5P5ZY5ZFwrgmPT6gk97rFB46Aa2CgTql0Zhj1iWe/izT0HUwtBjHBBU
3Rb6xXnWY43CFLJh6qBKFJgnWdDs3N0DpeQKu+ikLGBEnDJbZV8TRMk5LJIs9U3Ql1SsTnglb
l1efJ1VjVNoS4Qxc/CiTYGPwO5CB98KFX9wnaQXbNQhOPY8s/o3GTuZlSAVtmN0JjTEooQVw3
Yu6B5Y4J9o/CDpmTW4/nBFlQ5akw48AFTpRSgfc3am2xz5AHxbs0lFhvFW5g/TvwDD70c4h1C
XO4WvoYWz+Rfan6ZaxX3BtPsKcFmAEd3Ve1iH+K7Hm/QyWHlNbIgD4DBlpAdz3NIXxkGizn36
3edRcWP2/EMQvs=
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 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index b728e6511b..d35edc533d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -387,3 +387,17 @@ (define-public tree-sitter-javascript
"This package provides a Javascript grammar for the Tree-sitter
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-json")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff"))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:53 2022
Received: from localhost ([127.0.0.1]:57534 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILw-0000vm-Vx
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500
Received: from mout.gmx.net ([212.227.17.20]:46481)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILk-0000s8-IN
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533734;
bh=dMQVsYvC+RYaIZIxSO5oHy+RkrkiOIDCqbUzJPXIchM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=iJL5BhCNEeiRFK1mwXKDOcHsO72YD2UMj6tDQdNJYFCHJ2XLc3fHxcjZyJi9SVbq/
kwFGWptQwE43k9SuB0v3ORw6l6cSTCfqIs4lxUeKRUs+/7lVA7fz/AS6impRBtDOke
JkkhQmlnBE+JsHveM0QV+XXhuNK7FRT7gtvNa7KE=
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
1MuUnK-1o9ZOG2mTC-00raAn; Thu, 10 Feb 2022 23:55:34 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 13/26] gnu: Add tree-sitter-javascript.
Date: Thu, 10 Feb 2022 22:55:14 +0000
Message-Id: <20220210225527.25189-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:bRpd+kC0YixT8UaeVNYxyAkDj1J4+i9tFyIj6XTTXK8cKlh0zVa
/PAE32fJpnSVBXJBoYWiq1zcnse9w3bYXP/W2vyFiR/hZ6d3Y6eaNZfm+BjQMyISqK/snSz
4j8q/gI3CTEMQrc8POQLHrT48wlPppzRVQk2sLO9fJsTc0XThTrdRQykYI17fu42wCK/ncS
t3aBIQzLiSu4DLLSycZyw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:SSpGYJm2vu0=:aS/GqI79PeHWVy4jmD2paA
zm5YGWenlorDnPBpVbgzDFhfMsULZQ3QUvJZlnBkub0UY3VdMnCKVVAWOaIrrHr3H9VXr5L85
ucvqXEh1bSaJ6O4r/UPajdgeztLT/O3e2miQ9HmtSoyJETAOdGBuEw40IEjpABCuDf5F17vkq
iCEMQihc00cE5R5V/4sSIxvolqSrXnSp52hHfTFjS+lGTkxdUlQO3scH+G7mboW55P4AZV537
QoxTkWgYyxZzS7chXpqxNjd5K+aXeBc127LxTfFsPHFZicdrPmldffT/Oj7UQlePN1qPqZXnI
Mv86NVacIJZSzEzbtPx8WcSR+J/8bwXvZ/TX8Zw4jKTMcOGgIxUQqAehQmJ0anTyUb6xAzQNX
CNvABu7xfc28J6QAorZfIhZq/ikntCQsWadWnwIjNgrjAZI/QK+mrjBsdjwLsmq0/PzsPKlKj
fg7O5OiTAzsIytnSXJ7L3103/6kePMTJawQsuV+bH/MOeDcbL/2DAL68cXNY2Fgc/2Hx5EIup
r3R6+ylcUSYAIGC1hnUkr79K4lkP9xgF5n9Z8W4xgfQyjdPvFacwjP5cxtULSpCIQkaSt/3dQ
fnWnPFI4ChFEx1XH5tyfAU8nagWJN2AyOAEuP0YPKgq1GTUA8/AMygrIBemPwRdjYcD8cCq8b
uAUz20wArFI1g2/W2Gn6wRkwaO4+QHX9u62I1bT1pyRVEOhM0msa0zgr7DFn0MYJoZk14K87b
/wSTLzf7xsDBkV2XnNuE2BTH0v4VK4VTkb6K8Id8IJGAn/waktG3mYzZ9IdLDk7yTXaY76m/Y
tTWquSR6TjrFeSUuWffz5XpuXfF8I2+ZiqqNb6TwSV3sKnxAi3wfzAl0oT67c717lRnax6uTK
MM7GsG3utPf+c0P78Tb3F+3T4n2GLD0wYYZz5E14QciFRh8WdlaoMJaKCBlcqYVSMxfMzNFlj
s9zXw7KTeWi6WtCb72Eui5bKE3TL67vUMwi+HrQRJuna6xMOsJmALxMvAZvK5gBgNV4641uPR
B5MQzlTGOVxQWndGQkiWmuVfWZiXAapmbdpJAO/wtxVqaTNwwyfVkd+t0h2f87eo4Mf/7WECx
63C9vhim76/98k=
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 | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 760a7871df..b728e6511b 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -363,3 +363,27 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-javascript")
+ (version "0.20.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides a Javascript grammar for the Tree-sitter
+library.")
+ (license license:expat)))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:53 2022
Received: from localhost ([127.0.0.1]:57532 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILw-0000ve-M8
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500
Received: from mout.gmx.net ([212.227.17.20]:51865)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILj-0000s4-Lw
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533734;
bh=enJxBVHODwxH4qeNuA2MpvZoLdFzzMS9kOiEDllojl8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=OGjo2zLE9g2TGHzKBNdMJDzxCnvecDWWD3ry7LREnlmKQmX0Em8apmgOJ6iZEmdDK
/Mv918SS4ws3umwIB6yHQO9QkwU+P/3UOA46VGUrdpVWCXPs/8XdDjpERSScazhD6X
0YezoSdKEZjTmqjce7yxwBZCOEV3f/CYe55ZcZhs=
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
1Mn2WF-1nzM7m3KEB-00k7Xs; Thu, 10 Feb 2022 23:55:33 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 10/26] gnu: Add tree-sitter-go.
Date: Thu, 10 Feb 2022 22:55:11 +0000
Message-Id: <20220210225527.25189-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:VKDjwP9BMyso8lZZ5Ro0KYZe6h2INquANnVlM7GbhkYURmJCw2c
T9WPvH4cPcLuggLXmNtU2SNfBsak/DRB+d1TYipZ+9LPE6oloiXeC7wZkh1pHEIOc8MyznP
3UnVV1hPWE0fPsSyAuss6yCKxwb1iv50VMMrYNtRtP6C2u5WO21WLNUV6VLckmuaNQ48zxK
BC0QhPPwFlXCt23GLa9Xw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:gu69trzz13c=:xpyR6j7D6PGoS2TyBi0FMa
aBg4p8tSKGs4MqVRD+k1EF7hKtEglUoB6kjwnscv5WaDprUDekj6G1n0W6lELlSTRc8qt9EUU
s2bH2giq1gPJ7Oy2XcIS/gQey1mw4v9jqR10RIH53FyKGr4IzwqvdLbfGcI9A+46xsyLBVHhS
6ZsqmEGMsGP/LX9N2BesUQC1LDlIarQOn8/u5xCwYJZOZbKzpRWM4o2Y640HxCCcxecdIGdJY
msTLSKL1guLOMsHla2mpHUyd9vbW9VQfEMdnWZQD+rtvMUNTcbCbSIU4TILihqCZXtALAZhSf
zjnRXhVHblC0YAQ9Dx7yrfZjvkZLvZoOu7A4WxvFhDDIdsDdb2HjheROmy3qGGuCXifPg8Pw/
1ddoDbGEVOxIlWwUEElO3fsF+L6mXJg/7SDQtIM9yMNbFJCgszzMEPeYGqviesJCAnMqm/1n+
/H3nwyGwX+80MIdg+afaa/d+ZsinQzUxaTQ72KRD2lDXmfWAxtvj3yiBmIDzotL14RbGBa/Km
rWBsVCAtUC4TJTN3KcNh/VMZRzk759y7M1P3yPYAGgjmuw/w5Q1CzNjVaT95B01Bb9Sk5nZ92
Id4gyEcQ4qnp43CIoXkctcVcj/GHZ/88NcQlEsDlyAB/oa4xakaRql7L8zHeIqia5PJeljRMF
gl2YjA0wyuWvv/odgf2+GHvsJagDylWR1Y0WCnGAw3vprlgte4NLay9LakasrbLu4UklcoXrd
Y4ikmVhYEXIrMH3n017DI7JvCFXa53/M3CGqNyCfNmiQIX++9//murA5M1ntemUafDOy0D11N
z7R0KpODejOgOA7hq7Sa8InInJH42QpAcMcJ8G+BHmPybTS62WcWYH7HwedZ5qa6FYrVCWBCx
f5w58G0VuxfBQgV1IUdUyBUc192ZJdT3fDM+KJ9rDrW++LUr6Vqw7Cv72QpJ4fQdZJDHJWH4z
qyiR3JM1pB0qxyfH1Tz/t7TSKJ3Hc99LZUUTJ2l6/bcG/F7/FE+aFRS2ifhTcBVYeBX6dbmqt
vDg5gNLkQXqAJdnXVfikjk6rY0VPQzRsXpcgLV7tCkAw2zvTcD1IhUCwd2WQsNufgS38bsl+0
MQzQWHC0odQvhE=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 36b712c189..47f102b0b3 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -303,3 +303,26 @@ (define-public tree-sitter-css
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-go")
+ (version "0.19.1")
+ (source (tree-sitter-origin
+ name
+ version
+ "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:52 2022
Received: from localhost ([127.0.0.1]:57530 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILw-0000vX-Aa
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500
Received: from mout.gmx.net ([212.227.17.20]:49121)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILk-0000s6-8Q
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533734;
bh=8YqDy8iNKGhS9Enh6cJhqfIXUK9v3lEgzKS9trlB+r0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ehwvzo/lad+gWfticU9VovEbbOyMaiqwoBYrGijBFMT4+sG2YXjnOXtJQJW7+Z40j
NW1deTY4iQy11dFYJVnrZKlq7ZFK4REluFQ+XMCGzvMxtLly4OWdcFuyziW94DUq9U
JVOvp/wdG3Q4ji+5XYcbqRBbGa2LMfYe4YObfco0=
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
1MI5QF-1nUg8v1Y75-00FARs; Thu, 10 Feb 2022 23:55:34 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 12/26] gnu: Add tree-sitter-java.
Date: Thu, 10 Feb 2022 22:55:13 +0000
Message-Id: <20220210225527.25189-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:5jHasRJ/7D9cg/tGBt1X+8xrB2Nd1vzKmV+TjoLeWpBYE+BLKFm
DSds/Hd08Nvf5OU8Tlesw73OxdmRt2o7R1L9RHgCteoLhQRqaStIMEUdEGuTu8ICM8Kv8HD
qE/otOqpPAbMyNoBbs75OTezXPtPh2Ofilki+KT7rYzz9Eic10BWfuwZGmMvcTghEdTkeLF
Ud837CyUFruVnQoDA1ymQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:aCxGb+wSozg=:TjY8bw+qu9X5rOj90VI/Iw
4V4ielfCCw0J90P6e+Kgu1pXPljm0Cl1ny0gNdSF1J0CodjCEGeFf4Ze1+KAPy49S2QRvORhI
ImDmfvsEt6ftSggeXKsbEBTLGJA1Q+eszgrpaDwU/Jhgq9DCeNDoXsjjjnZ2MjEVIxYzStPkF
j9eFP6F++VeGOqFHjfOVF7sz6V++acyMSMekcwF1NZ2A54sbkB6BX+y0TZXfK8YnD7i6PxWvU
2kcP1GutfmuA1ZRs12T54hLvR9Jp8RfURBPrZ92bIIi6RMnsVhyMHI+Kn7kb7xtejxNoAcTIG
7GiZoRivXhGI1INP4eHqsx3AyZvuFn4dKARkjwXWMWK8vJJezofvlOVmorXf0KDVy2Alj4OsM
zPbhJL0vUBXoeL0nRTFgYbKu6vsUCXIBaqKqLnpv71FESpWvFe3WnEDvXRl3jzMvkvXjJ2GyQ
/IhiImtumzY1E5h2Ld7LmkRyBZk1/eGZo9OYn45jcs+TycAnB8ilVH/AjhAYmeEy32yjdS5Ia
1ofFDGCN1g/ahW0Phay6DgW0It1V4ysoEBtFxl5I+TtymH2TbTPYlIPbwa6icd+FHrNrdZVkA
hsHRhXcQoIW/YI+3pprYs38//XuQySdZ73Ka1dhSEL0+kU65borFun8extFA/Xfojl3APt7Uz
ebk7+o9vImF6T4zxhsTtD09qds2P2oadmOpNYpD0qG5Rl5LLjGZJP6xZ+q1R6wBkBVaQ+42LB
Nl0gpnzn4P/V9+HDtD1PUjSwDaYtsyqJ2T31m8I0Hx0WeZbQpvQ/qSiLfyoUglrzHWQqLk0wm
Cb3ycVcrwHU9G79qyqffyvXxB5eQ+rUCeGfEDrmfwGdRebrZAQu+wdFdePE8d6RBy9TdjBY4G
1c9fZzXE0bhCkZ+EMTrCOG4wn4/J8wxN6RjhCjxMiIYVfhHo687dF33KwPT806fis67noROla
fDx6WLDtOI1ZaAQD3JqKd4qy99PWvpilNkAPeK/WuTymmYbodDeTwfxRwFa8jVEZFG7F96f7M
wBwIJpfEloxTREa6Rc/EK0Cdqt/BtHuB859XaNiTUL/ByCmsQl0jNQXl/ypX5ocMvnqNg8Q+B
PTooFh5d27BIl4=
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 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e4679dc8ab..760a7871df 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -340,3 +340,26 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-java")
+ (version "0.19.1")
+ (source (tree-sitter-origin
+ name
+ version
+ "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:52 2022
Received: from localhost ([127.0.0.1]:57528 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILw-0000vQ-04
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500
Received: from mout.gmx.net ([212.227.17.21]:48883)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILk-0000s5-1L
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533734;
bh=SQX0M90MoGatCom4hGPOpL3o2l+TL0s15aZHZmfseCQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eaGdUIJD446oKEJG2raowJXLfu8f9OF8usYEmlKI4L2O1XU9G/pi2Gbsvn6y4Az/p
BXUOr5Rg5Ata/JabXlo0kIsmpEX90mu8mHUkq+J/7lmZwVgxgT6BpfzjzxzM9nY6Up
wHcG3mmWvdXELRHmIua/93/VXTr1ENCVoKmuO8VI=
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
1MdebB-1nr4w30JPd-00Zdws; Thu, 10 Feb 2022 23:55:34 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 11/26] gnu: Add tree-sitter-html.
Date: Thu, 10 Feb 2022 22:55:12 +0000
Message-Id: <20220210225527.25189-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ambuxgNEWOdvE2zslPW95UI+4GdysPY6/n2TXxug0VdA1BMqaDB
4jsWW38nYORrQV4L805PdKZik6p/9IGJNutx4dKhpzFSDo8czfRy/UrorXg+LQVmN4m3N51
sWqOCvh9LW/UlaieiheizKruRJL3BKzZ5GDwXCtIZefAtgAOZEe3713BXP62lbreLglQ2Gr
qPMJVhnaDVqhYF1mPD35A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Q8vfcPJ91v0=:8+pWlMFj4MP52UyNpVQFu4
Q4GyFc73eyPuwcqpzKhcuH3bcHoCX8vzD89lN5Yg6haMXZXC4iX+yrJGCl7qEsUEzQaNssVI7
delrUnb630dIBYBLI4tsGpVKMqzoKdCpetU9pJKik861KJz43pkBaH6C5OsfIk5gB/ESMbj1M
aRb2vtx/o/9q2blx1RrmZ/+hGbe6izucLdJbCw+KMdIlQPG/UT7FIRty8zumOMQxUubQu43mG
Ejws2FzlVleeawKvhaADhSNRQ4DUYwQ5Pq5Dfi4jOi7QlCqPk8xiCzLXNxFEEPXS+FX+o8jPK
ldpEdGrlLPgCgKmtHiR9S3spt7jUT4MBcPHOgTjXAbXiupZnGwpHwJYpz4QdJKfWRAZiFnd7b
T8n73AfVsS9QNjiGPjGoXiisLLg/nCFCEDnOmySLlId3Tcgrdy5FfQO9oHC5rTi78npWTVc8r
Ws7NNSjoyWaIseuPTp+GIf5g1m1H+xOkCM0xWJCdsRk+Eb/Wjlq8fCkX9Maa9Olc7QqPkWX5H
X47HuM03DjIvrmMsZ/5OlHeXOvT6QZZrq63Ord2NF+QHT0GbiHAu/YGsyxEeByo+2aqfc3gqz
M6qgvF1WlXIMp7VjkB8z3aocwrdFkPF+d4ECEtxLgQJsE+wINZrwthpeIDpACztt+11YLBzcg
7SfmImEw2fLsIK4jCXcNFo+Hw+vTRevesTT9NhiSyb6MfntLTEQexLWk1s6aPNyaD4LVj2glq
j99e4p5NKmTDH5ykasSS3teeLcVx8IKxlftUW4GOAQl8Fkbyoz5OEz7+MlbMTwwpFDCVxyNzd
c5r+zKECOVpi68g9IgZ++DfnPGAA44RFWddQIpfysNt+bIFsLoBFikPG2/B21JzKVLtzilNE3
BQoJS//yS8/thxk3/wP23bZhAfobicwmhGfItDPkETLen7W2ZsqkYDrzMMjQZFPzhlvQYsXzj
86mbU+FfqUQISVV5U3qAIDko1IqZaWpc/cq162/ILNY8Emvu0Ngr+5DrWOf/+lGMTWi/iw8Zk
RJZ02c2quyWBjuQwlnxjb8WmDjpjfZvGG5FeZEq4sLocIXDJUnQev5QPt6qR7XDUgFH0ZNZEH
K7d/Op5ehYZsvQ=
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 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 47f102b0b3..e4679dc8ab 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -326,3 +326,17 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-html")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy"))
+ (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
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:52 2022
Received: from localhost ([127.0.0.1]:57526 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILv-0000vI-Kx
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500
Received: from mout.gmx.net ([212.227.17.22]:44997)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILj-0000s3-DL
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:40 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533733;
bh=Asn5SQhUrKmk0UsEsUWYw9ktVQLhbSuZte/u9oQb4p0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EUvc9HILU5shSSGcynDR2lSqAABACoi/awiVIsHNyosqSMrNoMhnUZiufpIPbGdwW
LoxyanHG6xIqdFZY9sFwkQl1E5myWbb60gqXS7cDdh7SRUtVqGEY5ZRIYdpOWxfOLw
8WdPNDzyX0x0+GCrttKc0xT9vKOVQI8Ml1cXtUYw=
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
1M3lYB-1nIZCI2BON-000r5w; Thu, 10 Feb 2022 23:55:33 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 09/26] gnu: Add tree-sitter-css.
Date: Thu, 10 Feb 2022 22:55:10 +0000
Message-Id: <20220210225527.25189-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:P/bx6KWJ3jonq5bbR+6Ak2gLHq3COuUVhiRffeI8WuYvtX+zh/I
gWXJQOHWJiCLR9zmXemDZJYDJoAmt9CSGRcrv8W36rYXWSh96GwvY9iuuXTFytQQT3d3/Wc
5Y82ODZDGLGwFOqc8x10AXbiZDlz6Z7HbY9EAR7M6Li3pPGNS0esmjXdiid0Tdtu2/MN2qB
Dd62YXpUYVqIBNx6uCArw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:EuHnxOBusMI=:ue4IeAfQJCS7Wz8tSe9yCQ
S8fIo36BOmd90+M8TWtddxJtxcB7YJBaytZkESBAz7vuP2sUUftfahustDQYRBPNIokFjZKm5
2Ke7RHauH2QUb+B55RgNfipOFPxqzNRmaTS782nBJ5a86BSWAtdo5imfL7g1aFILgSGgqOnlX
8mTKA/N1SOaUCBhBEkIfjpzTonHrcBIgFoAKnFkN/QZOmQ7+cUkNNAM6u7k6k/DoREypFd93s
fNjKEv2BxsYQ1E3Jws5aoJmMGb9rI0k59G44DBUh+CYZFgyO0lLUfcsaiTuL0rf60a4x7ULLv
o4b7rffPhyP6YWKXXc0s54JrNBf9QB/t9dwWiwoZ0ozJNTxT7jV4iWrXWq+uNgkyNugjMa+uv
tfqe614cTeP/j/tfutHw049E478gDsAkG+f6bu6pkmHXE0eWL73UybVRear/XazScAlvKEq9t
m5LV6Gog0absX/aTOeEI9mJ+O8uMdy6IOZQpOysUohte6Tj1/7VBpfn9a4Nfah5x9EHWLSMpG
i3yDuhzwmIJFPgzCEBbmVlhZ/TnwmUBTv+gGqnuR0iCGKfZs1Ful1AfX34c4fRoDm+nGtgV3X
rsbrmu8MaqppzFRhOIpYeECwlBCxHpIRW/IQsi6iykkiJlW1WA2xfCVAQqQ1Ym/+g1/Vhyz7h
hgWFVvfjTV08kfPQBdVqN4KRU1nQsBtzojxSp/bU1lzCH7RfBvl1DK8xpAIMddmu4WhQK2Vf5
/1hKJG6Qymvl33aPEGSyssLivMquijPIftVuf3MPKZnt/EBKDMgGV8dNkAX5zKQvOZx1iMp2l
bkt2U1zD7c0YK3X+YXkwag5tkEQH9GxKOOeCN1WPdfhkoa9T9Jb1NDpQ4SN8d1LNKrUV21PIK
qPMP45X3A5BJfUAbnzUYUWy017sg0HzglNq/vMwnPB1NtwoOmu79lr8xPENEbSX6rJEfWRRTD
4IgxxGXRozkGcheScOkf+5Zjdr1PYyjDMyDINanBTi00qZq1zIWlvyo8sXTXQw+VX0QvJcvhz
CYxF6YFOo81cFet8uHokbx95kjEm9QSkXbaelO13gd/54SQ4+3KrM7gsuxTGbuXU9aNs5XzbD
QxG1Dumyjk0plw=
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 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 827e1cdc4d..36b712c189 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -289,3 +289,17 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-css")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2"))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:51 2022
Received: from localhost ([127.0.0.1]:57524 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILv-0000vA-CP
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500
Received: from mout.gmx.net ([212.227.17.20]:48171)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILj-0000s0-3O
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:39 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533733;
bh=0jdkL0rGf+woMVGkS9xJK9xeOejnQWGCXlwCLoJyOwQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=NQ73XmIHNxGjJJUfTe/FlSBMiEiryXm3ohRGhEyRgeksNbb4asc62GcezuJliqLvd
DBy+cJ+Tu7mon97jXm/4fYh7Kx+AxK95DHOqdLHSn4ekjR4lZk5oU+QTsIRIE+EHi7
qmzBzToKUv6P+zAzw3/x+n0LVYZqlhbc1VaG5/1w=
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
1MnakX-1nyo9w0xBF-00jZa6; Thu, 10 Feb 2022 23:55:33 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 08/26] gnu: Add tree-sitter-bash.
Date: Thu, 10 Feb 2022 22:55:09 +0000
Message-Id: <20220210225527.25189-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:FJ+JV8rp2PgnTFYLkfS/vd8UHBuf+1JqDvqLYfbdjYZ+2Si8udb
+ZDL0Wh329niVoU1rOtgAqIxT4dvtHrOmRhk4+5dZJkjudL01JPMEvKqjU6jfmGFBaLpoJy
ShSgm6/G1fUU2tGbqR2t1MesSRcBbpCl4NZaIzA7tyzV2luaUxe8To5sus+4T7uECh+tNeG
kjhkjruodM1zusgW1YdEw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:+A0CzSwcrSk=:AdulMcSJqJbIkggbSM6V4h
FWpMflumg54hd4FQk1w9b2iREAnvye7eCMVlm4KtAIWmGSU17673N6orKtQtgQ6L6Vwns07d8
hUJC9qnnUfvYJ/ol4c19B9NahiK2YYzERHMf5vd9RRDsxXJRCd0Y+1Zfyk9dR76hlJboRdarv
a/ESsVSreqSVzviKBkRvGTPZ2F64GxzFn/7/01ClbXX1CA1rRgLeVe/+4zbuQqzF4Tu55xC35
DbgVJgIKefItspPiHmv15irybALee3Z2hLREs4LwXWpsxeslsocgpF0OytwnCc0ytpzYVjTtc
oxbxAh1f2HjW5qUBFPVDZnYslYEQXhHhbY6WPme8lrwY6PoCgJuPWeeeHDnoeb+bMpGIKtNLx
Mqx1/ZMYR3rQ04k5bxsCgXWszdwpVkb42aUKiXZzVnqKu8L1wUmX8V2ESOAmXRPkMgeK8hLfv
PP8WfUXczyf3ZTm8S/Qmghu5k/KkqXzHye4zYHgxtS5ktNC/C/9PwpWlXEfNB6cGWUDNvTRQy
dyO9xJ8RMlweg50ivsOIGjWOM7wlSRlgTOaKF4Sw01vL4h4339ARxAQdbziKIrTkJV8t/w/NM
90pYVPIl+VxI7XrSDRNU2Se7/Xiwu+qxlcb9qflkEC4guJ48IKLlgT8qlKKKFOFsSY4LL/iiD
olY9/MlmzjvShB2Mr4uWbQ+wG5iiCGsaHlEVbH6o8qMgURFlSIUCOPN+vsswvNXXk5SFjyDfA
jBh2bJSTOcdIeOA6ptKHNZ0Q8MPytA/1mqGtSw9zlifsRK5FjZ8BVga91BbFCGj+3fWQacb3U
CiY6LodCdIV+0h+l3KATGeOIsA88FiB/BM+8GbrtInYZxxnMKwdo6QHzsvYBWh0iECCcTPVnZ
7mDMFXpGjxnFSEERNZGqRZq7UlckjZzACHRpx4akoYJGiW3u+REL690gNmXw7ldP/anEFx9do
XiunH6o76mU4lGTrhid8x4i3v4K5o4H/qEi7t39KRgDXNs7ha3mPG0giSCfVx/JSjr6nbj3vv
IuV2v9o9t2XShpY1j/Bii9uUQpnNuhy/6En0wtsqk8JO2pcif/BCgUHrAdN/YIL7PyYSM7e7Z
H8EMWGYkl+PPZw=
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 | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index cc3bb2cec0..827e1cdc4d 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -265,3 +265,27 @@ (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 (inherit tree-sitter-c)
+ (name "tree-sitter-bash")
+ (version "0.19.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'delete-dependencies
+ (lambda _
+ (delete-dependencies '("tree-sitter-cli"
+ "node-gyp"
+ "prebuild"
+ "prebuild-install"))))))))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:51 2022
Received: from localhost ([127.0.0.1]:57522 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILv-0000v3-52
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500
Received: from mout.gmx.net ([212.227.17.22]:35075)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILi-0000rz-Q7
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:39 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533733;
bh=IJ+YkAMKcH7Id0Oxt/rIbidCQfLZL/zslSctDXljg2o=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=QwPdtcKxU5saNMQ9SAyPK5lof3Yh8FWW3Ppp0ou219cGHE/1RFU9GG3rmboOUVlXD
u2BwIAhpipLFtSw8rieI6vRz6BfE/BOxHir9UoRPDTvGAr+gNstMYY0UgCJHF70jPS
C7wlbQ+JLPbt4G2L3cGhXDubJ+wfb6uH3l0S12SE=
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-1ninPY3vAe-00QX5z; Thu, 10 Feb 2022 23:55:33 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 07/26] gnu: Add tree-sitter-cpp.
Date: Thu, 10 Feb 2022 22:55:08 +0000
Message-Id: <20220210225527.25189-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:3Ld6UHlyAK6vFfXMc9ucCEAahqTA28LEe37awBrhu3Ix/M+ic4k
i4qa5NrMGd7qLgs5uWmQQVU+vJiZI6foqg33CVZtJRIeSNFHOxW1TH63q4hRBlFbxmtrRje
MJt08RmqiB3Cf2EK+kzV9bHCvYqWQa/XeChXe8S/yoTubSzsLIj1tqHQlqr5SiD8c4RfWGG
Aiv5k9SUwLn964EMRxitg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:lfOHdSkyz0I=:7qK4Y0tEeswPTiklYjHLes
mir0M+Oncp078X5ATOYDZTUWwmb3MFVfTbIMzdtSxBKvA8NOxYUDnOcdARWAJRr+eGG6Bqk6d
kFJ9/JRAneZTzQzmlwLlpE4DA3uySWeAaKvk1dwzrBfAWObNI38U6ydliDFkCK6lTBQNcqZOs
eqhn/L7td2850lVP2WzDv5Wv3z53PhuBXvYqKe38z1e8uwWY+zgn7d2hfOwI1Bqg4ECaN5uKb
MiBGRqAoiJ5ATp4mBG5H3ecUzweW0F+vQ9K3jLbpAnKabDeV6JUJeeEIj+GcZvYH059Or9+ui
Ct4cZ2T8RAeZYg+K7DYEnmjCqPJGImqVVSJSn60lyVi9n6FIA+LsIFf3DS8Du5EXMcKfFQIqk
KZcydsFB5c+qDih21qaozrs2s0QZXdR9WvsZxP7N9gS3Q579wz4f7XelNa4wz/S0qhkOIj/Kg
zuzEoqDtGkWN6p3AC4jkBgipnimwVJH4XzbuvQmz7X14v6C7XWBCXhZhwkzT3ZNS0p+vRBr9C
gpaPrQW4CofeJDn/mhOf7j7IK8NFYxTRkzfCyYNjRewpsF6cHrllMqSqqfcHbHRpGlP5JscGb
cAHmKfi6fhMJ3cFfUM1U7QwvzQqJ8oPtj+UrDIYc6IfcM1P0boG/6zj+DwVQrxyTznR6wFSUE
pQFNkveAExx1tfs7slVfkFYHhhrvylZwckkW+pw+Bhk3h7LkDu+MtvVQnE+/zN1nH3kLvI+mP
YzZGqzlK2DJBv8G2EhgJdMUdvWTG33Pblqs+a77/61GoN0H02YcMdT2wYYIztjRRlf1OR1LCE
x6NtWv6aC1iBceZ8YM9M9bUJoNGzQ08RsPLkbhhex9fMMAQSVQNIznkYRAVzI+H3Z3HtOdOq/
l6P9egwK26dSh9UL9usATv8nowR+eHO6pbot30HaBqsV2FEJvzCNSo21/9DYSYrAKYtiV07ya
ED0AUX6Zh0HWoNvHyvwUcvRayi7QnyjOnX4ykv27Jz9app6uXvQKFFKqNGOnSuRy9wWftK8xr
tF9n4/WtwK3eprEQ2PrJ2UhMyKpRwRoKHu58KEdI8ABWDpWtyA+z7jn/rdcMgg5zKnzmw5kQ/
+tH7i26lWaIex8=
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 | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index b62cb483c9..cc3bb2cec0 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -247,3 +247,21 @@ (define (source-file? basename)
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (package
+ (inherit tree-sitter-c)
+ (name "tree-sitter-cpp")
+ (version "0.20.0")
+ (source (tree-sitter-origin
+ name
+ version
+ "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr"))
+ (inputs
+ (list node-nan
+ `(,tree-sitter-c "js")))
+ (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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:51 2022
Received: from localhost ([127.0.0.1]:57520 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILu-0000v0-GS
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500
Received: from mout.gmx.net ([212.227.17.22]:38107)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILh-0000rv-Vz
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533732;
bh=bEW4VxjCy2q9YzVq85N2wAtsCantmvSwlDdF/UdQWPg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=bThhCvl+MLWNf2DFnAH+V6nVvnRzW8SXEGGpFCvrfNA6rJ0uorlzVtMDze+cmoKWg
bPK9VfBh4dE0bT1QQcv/1Q1PvXpBdW/9FX2QC181+zdNZO4Iad66ijKO8p9roXfS3E
/ZokyTrwY00nGYL5EaNUTfzJRMxA0s3LlfFQ13YE=
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-1nUxG60FKY-00EtKj; Thu, 10 Feb 2022 23:55:32 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 04/26] gnu: Add tree-sitter.
Date: Thu, 10 Feb 2022 22:55:05 +0000
Message-Id: <20220210225527.25189-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:oG2glCxYIr3gAB0ZktQkvjI4GpMm6kG9+wRy43lnio7MPqMZ9DU
4rLCa1nEYPkTCc4w0E0vz4SGIim0YY6t+6RPJsGnMdcIpk5DCM8JG2T4z+v1XjH70L+N1hg
qoUFJHdK4hjzYjW+K86R7OUjT1uT8Z7CsDSpPWBSL/cewnlHyjV8IHL1y4mXOxTb0GhwQoM
ORJo9s5ZLH4IdSHFtDQ6A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:h+vv0Pjf1Bs=:xLa1Geg2cMc/JFD1iY/HY3
ggcgWfifTC+3FQrkqnFdxAJsed7cVmsN4dUmL7vflSFIC8Z7kYWoKB6Iaz086GmgYc3baAXua
cGDeGyyD4IfDyl36dMKTp4A+u6zGRYPzgCSdfbCg/HqKUFHmS1N/9HuUv7EiOvewZMRSQ2nyw
18Ae6aNvRHCfe/bpznDc+4yzZSSLynISLWWu4Xt5O2N7zvD2NriyjWiYi1NWrT1Fo5KvXV3Qm
Lys2KT2liK8Kx6sNQcge0ZAcoKCBu2in1FgnNLWru/qqcznQcIhxnymQD94ozih5GyGDfhW4u
nixi3szdUB8pZ3m7Ey7HpnXE1YOacVcfkxPESy6uq0rqKBeDjaEdphv+yenms5E1/iWrc1TTK
wXqRiUnL8jOcvxUPgHjpOm5osX/MCK6JZZlKZd2PQBR8MBMnkvT1bUUUeuXMJhjI+qdUxYOLQ
IV4oS1q4KfNzZN1SzTUdEPFug+zzrK2IMX4tGEOrDhD+/qYKO/G491V7b9U9R7UPleRZ/uqPb
l4C21eFbyMxoxfKpKbrvn8Vnx7EqI3YF5tXH/qK9mUR8GT7MKHqWhqXNHOFqULhM0955KxdKf
lTzCI6SHZSuZiss0iSmGKdEf6BBBpetOlQUCH8dryTzWxZbAXNGSgdXgLCzs2w1OBoHaF2Qw/
ldA7uKac/Xke5ZQUfBMCRvGdd8+iI3+Ji7FcROUk2NI6F4NkrFKTm7qGD+p3S3XVKt4F7XPiL
Ol0CU7Inf7V53pTSeARMu+39VHRCC42R99bFAGNeRFOGUBaM9/aasBQ0R3A6buafqKLMVa7CG
Du+nu0tNdxq01+3rS+BiEGwRZ0x3aFNG6Ct7Njju2foY5u7Q7qXar60YgDSsprq5lrqf774Wb
P6LYgDMVwRzO3er33EvT2KX8PgonvgrN/CFmWE7X8PHsr3KSNdCu4hrjRS/sXvltm2YxRKYO1
zEmLwomZaGq81rfrdVjjPKRvTQgZQl/CzV13vBSJ18wnzelQXv4pEHxSPiF33oolU/GXzdEnC
1tXjCr2FyRJ4TYppqlzlxWLZWyVWOrxE3YY/Ug8WgUW16fC/2H7nChL8oiOaVDXcVgvJBSwsI
yJkmzj6Ui5zA0w=
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/package/tree-sitter.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register it.
=2D--
gnu/local.mk | 1 +
gnu/packages/tree-sitter.scm | 76 ++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 198c8f64a6..273d80a9c2 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -584,6 +584,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/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..e7d2ce113d
=2D-- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,76 @@
+;;; 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 (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))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.4")
+ (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
+ "1yldgdbf3l5l4ki52abdf81nwkcbvg219gwr3ydcjwfsg7hf7zhz")))=
)
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;No check target.
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'set-cc
+ (lambda _
+ (setenv "CC"
+ #$(cc-for-target))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")) (lib (string-append
+ out "/lib")))
+ (setenv "PREFIX" out)
+ (invoke "make" "install")))))))
+ (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 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 @code{libtree-sitter} runtime library.")
+ (license license:expat)))
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:44 2022
Received: from localhost ([127.0.0.1]:57514 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILn-0000u4-8p
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500
Received: from mout.gmx.net ([212.227.17.22]:51965)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILi-0000rx-8G
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533732;
bh=nK+Iy+tq5s20cNQVc+wvmkuOaJHEMoNfBDAnxqtpde4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=S3rUIrxp4At9v+HpjOz0pvIAsvWGbOqMEEnDg6dlILZ4Ium0xhMQ2RjGQQGAY3oso
YgA9PUm2Twezqz8Pwi/vaN9cPiel18JXH2f5m9HbxweRuyZ2gDws8BhPK/a3xQakRv
jZLFUtHXIg3kDnpf0BR1Chxp28ohIbTUBbvzGdbQ=
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
1M7b2T-1nNVPt1VZl-007ydm; Thu, 10 Feb 2022 23:55:32 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 05/26] gnu: Add tree-sitter-cli.
Date: Thu, 10 Feb 2022 22:55:06 +0000
Message-Id: <20220210225527.25189-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:5zk0mTCX2rPav7RhVfT9jgPTrLqUa5TjuhuWnaW2sHEj8c/xZdQ
/mqH8Fwm/5Nr39XW3KEQF/MUhYsC8JTL1JEzOUQXfJlo5iFb2HjsSw7rFjJWzkQGox3V+36
p5YMh0NXNeEaOPrxjXBiuE3BifX/3DhmrT5O9jZIQUw1S5paMrIv+hgom3vEimC1w37msor
rKTD8Z4+kk+dQk8uqqZtQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:JbA/LCthomQ=:nfTwbWpFk5d0MRDmvSAnp/
LMadGJoH/jXPsD8nvWXBCXVOwYq3xRe2MZOjkYFsVjyxtYg/CAkJSwXKXOEjnZNbmFUYgehWx
87XB6RMTXyYxuhZNfEDhyBOJpSZbMBI9oE3osQcnwXKo+/YBs0uicCeE7LZVckhS8zZOVrrDg
Wi5b2V2A2fD8R+oFLHl3qLFIgpM4DXcujOkyifgV1avmLE3eDikpdcEiocY3BEBoe98YselOC
tyupEJV/A9v8OythVLxMrgvakJxvSM6okXpvrLGuoziDoCBVJDK8YEqOduK6fTXsK3A/s3+ji
4cd00Rp23e+ODq9372EtczdE+4dj/azPHsNCyU8m+OxHXuZHiY7qoTRzP1Xpbp1cmN68emSOn
T+uuRq6fUrQzHsNXwux0eP9j1Tc2MD56WeGm0L7yo+TjmyIlhxRvxk4CGTM9vgz2P9HQglaBx
eZszkvxjuziAfamU/mfF1/h6JG9utTJziP8tc4j70SSUinWRVsak2gO4UhpEfIrF9Hnyvk44u
1UtU3xBBR3GscCCpYC1320D1hlyOwiY3NcyFtgFzwDTGDT2wF96H8KSBQI2L/srgFtAa0rmQ4
cApbEy+gsxupDI8DxRWjWxV2D03yx81+STE8F7igQwKw9SN/aJAuRKF6hCT8YaG0lFtaIrw4m
uPSfp+FFTlCSdQXg4JA/RPauARzV0fUMpN3rsQmx8OcHbaymxRg25gcLS92G3D9XuO5fJTxz+
q3AbJqGqDm16VLjVn0Osde5HptzQ6bRFCds0a1bRE2xx40NjrU29hin+k6xUMRljo1+Edmwxn
SAf9K0GH3O4+LGh5Ai7BtAPuL/KO1vYWsEAcyyc+Cl59arfnCfvYqNAgaYReGGS4Ep8GgvvnM
NbKEYpx+xLdeZjn9wADAbl5Ewrk9oOouwip/VICQALPeUBd2eDfL9g18ZKVsfARUHHsXi06zc
T4zC/F1WurtvhSITw6buIaOn4HaVFbtjdij/w1szFgLkTL9kg7tYtwMxS2PozchvS6Tj7dozv
hrAVZPCEsaEAa7HWjHZAX/7Bf5rR9FH8U5db7L6PempBwTgc5FKcMBA6m36XTe0WYP7eKlQ+o
fNsz7neCMg3Fvo=
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 | 68 +++++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e7d2ce113d..c2919e76b2 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -19,10 +19,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 (guix utils)
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-io))
(define-public tree-sitter
(package
@@ -74,3 +77,66 @@ (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")
+ (build-system cargo-build-system)
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; FIXME: Installing the sources for the tree-sitter Rust bindings
+ ;; doesn't work out of the box due to tree-sitter having multiple
+ ;; Rust packages in the same repository (bindings and CLI).
+ #: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-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-spin" ,rust-spin-0.7)
+ ("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.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:43 2022
Received: from localhost ([127.0.0.1]:57509 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILl-0000tb-Sj
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:43 -0500
Received: from mout.gmx.net ([212.227.17.20]:40921)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILh-0000ru-Mu
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533732;
bh=b3FGtt/biT4+X9iwMvrzWoa3BXlG+z95xB8ZJrS0D4s=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=UyHJMTAvjoh6QUL2GjhGWDDfeArMa/m/vSJE6AM1wYMab9vXgMNIdvga7ss4+84LT
HCG9DUqyvsa/UQGRgsSGLU7JMRL+yWZ8s7AD6yfft5gWwtWIVVBBAQSxnuf3sRUiKz
nUtHZawieBv/jh6OV4Qp3y71DRfS91g0eXt5F7h4=
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-1niEuj3Hwk-00SAzJ; Thu, 10 Feb 2022 23:55:31 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 03/26] gnu: Add rust-spin@HIDDEN
Date: Thu, 10 Feb 2022 22:55:04 +0000
Message-Id: <20220210225527.25189-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:lDiyNcHP40b1VJGRUOaaJ8bRtE49J7KKl787cCOAt9Hw3DFQDDB
smHjuV7X5YsY8Iq0mbP0FtocqFCATYvctBnmKPdnoax1H3XAXLK9o69z42hhoi2XyTC+TKF
osfn+RaQD27aG6nPlH6bzTDMYoHKIHr6sRevJC/Hpyw6HXKaPmrStGZ+diEFjmrwzM+Dwlz
0XCLcIPwmC1m/3xiiVjpw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:yMO3dN+oWi4=:69H86eBf59iCOsGJqJDZOo
JqwLz4LhpChDyHsfi/VrVH9Z7xziC0IWug0k15RuP8i9TZn7nHwgA9uOB+MDgmNRoNcu4+ys9
PfH6KjLb0egFInfBTMPEH/NUoRnnAW1qteIXx8uJyRIr1fCC20Z8+/4YRfDNkBA2cNxpAkk+v
9Zc6kFYCsJolTRvq8qKJDWFAsc21TcrePTMdcwyQZaHJgC6Kb4/CwGNAZmHrLJtfDYxwtd+/n
sYvDQ7342CEU7HPd9BqcCVaD0wLp0Q6Tm6Up9w1t3iJtX3NPKpxwBGUOL+ITBJ6PwqnY8INCK
mBszEh8VsPTs0LiTyT80AYYFAsKdcYgipklygKIGSXycXdP2Nm4Zi7BO6OE7dsSJw4ge3jN8q
ICyaCucciWgpvmlTAsUs3eWdjR9fkOp3zq0qCGaPI6WPPennKZX1rB8OitxKNK3aTAg2761/9
zu563WeRVYDUlDe7LKYeGl7omI04zn69bPbzvaU/7iLqtAgpgtEpsXhtNj8azIqEAmmNkPj9I
vdiN+JMURxyDENsYojyfVIimRPExSWumAG9Q5SZfZX0ueFfXAbV2rofjGz2z/n7zz3PjDJbGc
o0xsuYg3LcEccBFiUs3CnJAeRRdje4exi0rLnRrrl8Le0xuQcJMuRRZv4K0l9D8yCHA30fWAu
9386bnqm0vAw6WNoWW/l47iGfUo5y5vmUzmWSO/DWtKqzcBuSKGY5e0YRu5ZjDdm82kcbNSYA
6GsHoDelPVPFfIuE0aTJWdhfZEXh2TCOVq1xrs93AefAR9oN7YR5c8DDgBbUMABJp+Y46h6GT
SrzLfAfGWBHj5+OplqsbnlVxihBc65vlXIuepLQxQEdiQdm2KrjCUuP/N48jx/lCCVFdtEOE+
HPX454Y967x+MMTaUWbHSDYjadEsezWGsGudzNFpphp834KyJMz8ZrzrsXgs3nsofe0dvNa/c
erb96ZQisjmkemgxSBb66ACd/7RiCOG/B6pUtP54x7/FR7Bc5ZtAlPZr9X6SAnlSGy2Ec9KmG
jcAbsCDvoUt0MsX85VkM5fWJxO+g3n+WkhL3g+WU/PkFRSU6jOaoU/y031jcjbznzyyo4ZofG
h9Rh4BI5a+081o=
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-spin-0.7): New variable.
=2D--
gnu/packages/crates-io.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cff703c427..ad27298404 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56716,6 +56716,19 @@ (define-public rust-spin-0.9
initializers are available.")
(license license:expat)))
+(define-public rust-spin-0.7
+ (package
+ (inherit rust-spin-0.9)
+ (name "rust-spin")
+ (version "0.7.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "spin" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k")))=
)))
+
(define-public rust-spin-0.5
(package
(inherit rust-spin-0.9)
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:42 2022
Received: from localhost ([127.0.0.1]:57501 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILk-0000t3-69
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500
Received: from mout.gmx.net ([212.227.17.21]:52599)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILh-0000rt-Dl
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:37 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533731;
bh=fqdrr9yKNhkydJG3v4XflbAw09qnVXxvR/qaoJosDTo=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=DZe4fhdo/xi9hEfUP/CzDhRK18dMssKe5hAXB6CRMfuLqQB2PbyWCo/FAuvz9B87S
YDNV+k8EOtDhR0w+0+uyeXWlWr1XYUnSrIiB3eE/XjiVn1mmRmn/gzbZVsg0t51eY9
IgLRaz0A82xC2HsDky8Kd1o/jSBuqG0QSlfYqDJs=
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
1N4hvb-1oH1V6233n-011mvA; Thu, 10 Feb 2022 23:55:31 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 02/26] gnu: Add rust-html-escape.
Date: Thu, 10 Feb 2022 22:55:03 +0000
Message-Id: <20220210225527.25189-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20220210225527.25189-1-pierre.langlois@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
<20220210225527.25189-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Tve1QeaaY1nLKWj7uZhIuTWA8osnJh1+2eaTI5Bm1XaKCu/kZmx
sf514ADj8DxeesrvSjyNFTJXbHw3YyVDeXzZ1xtWWXF8a8Exwksz0c1Wg3VoaTNGp6raADn
/SpmC/hdl8vk/i4M9RvRQ6t6heiXqaLJLPru+ewcNCIywOOM2b/ck49itlxiUsdWfcBV6nJ
uzaauOJFPpspz7f23ckQw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:FMnG4WYwY4o=:5G8d5qNC8fYASNbCWyAG1l
UxG/BKpCHCF1ct43M36cNYjpvY7h/ROdKeuilZ2qFZ1HHidNLWXg5AhkdpEGDYciEK5HIV/AJ
HXfOaj85ZLtlgcz12HzzGr7AcopzKKIp7g9uhn5JDbkKTjOSol0Nlv48QS7ehxQ3fzNKSE5eO
0JmW0YASDm1eYfvhQFtK9oE4u6XZgzLSWMixStmlfywmecINBIsYItgTSRbed0U6PntjIu0e/
pUXvI2nhYkWMghYeBd4w9Kt5TB5rVfwL7H04PUt52Ig8MewFM/TrqeQt7IAV6vofBVDVcUUsN
qFbQLA+elbwiKbdT/IEfZZwijEX//jWhdIzdr6y1KhLDREG7UO84y7gZbyskt1OKJq4Y9H2cm
GoOAaPyReOiprTWDepFyflFybbAG4rUGrpUztuj6/GKgaWSqxguWqKVaglP4mVWL9AbrWCzmk
I0Yp0E/t5iqH0/5OYiP417PJDQ5cH2AZNOG8aKB2OeUI1YOKGhXlK/AapFhr3ycZx+0KTirwE
+onrnAsK9r4uSphxEVADj7LdOMEqG/ksQUIGJpNY6yuY6K9TVQxdjcLU9gdkj+8fGNkhp0W/4
UBAi1lCbcTpuKZhc6NxgFlTZ/yFjAq13aQoOBfK0oQ3A+rbHe8ZgLuR/rIuBhUAnopJdDLXIZ
pOx/wWgy6xiL3+wVPlkZ9bYipgYhCWceB+ZENCaokU9DWFuZ0bp/une3WkwtkO5VnVmgRksNo
91cX36/WIqpfGB+FWlf9BfWPj6UVPM4gEbPXNuT3swwpOcNlCVEaTHv6YHcOETFMu4jdnoJL9
XMAYc42hMCeNu4MFWIKnorewltvvyAb+ShhCFrXp7h0OY2AwKKl6lgNeMcF+ksJCV9g0SXx23
mq7Yt1MayNAXZB2OccTYM5IZ8VMzBVzQjLa1kOzesgFJ99GHblzsTXyHYyN2R5uctnP0Umk88
JRvySz6SLqUwVwXsur4sihlFWHcBVkNgFAEBtgI4kd3RDZwFjS1VwJ7PBiejyem95HijYFVLP
nevjyt8cpayLWN5meAzLOz89qJP+WfQqN7DOyoiuW9tCkaXnuhR2vbCQvchSgJoFEhHX5crJp
jTlqicP98/m8kA=
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-0.2): New variable.
=2D--
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 d001e723ec..cff703c427 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26933,6 +26933,30 @@ (define-public rust-htmlescape-0.3
"This package provides a library for HTML entity encoding and decodi=
ng.")
(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.9")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "html-escape" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1dxw9lpckrqzzqgbkw64ckbajr4b7xxnjdn8adgzqf2mm40shvl1")))=
)
+ (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 HT=
ML")
+ (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-http-0.2
(package
(name "rust-http")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:55:40 2022
Received: from localhost ([127.0.0.1]:57497 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1nIILj-0000ss-H0
for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:40 -0500
Received: from mout.gmx.net ([212.227.17.21]:41269)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1nIILh-0000rs-Df
for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:55:37 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1644533731;
bh=tS32UXeP+j1oUdMEwSJMUq+53ivSqtMAdIHOyEbndNs=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=L/DB9yTAZ79Fd8PY/Olb45iknmtU9UOrG95iqqODzYc+fiqtOZ+VJth/aPC6hxqy9
jQ4uwyuWcMN0l6Ej5gAz/7whZ3ZQhEtllTgeNKxsxIJ+1Tlpg+8V2Fy3VLSAuCWAI7
AR0fMu3dcOJujzcibonwnmjWOYdCUFRQWK8R9C1U=
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
1MLzBp-1nZgbi0pEH-00HyVS; Thu, 10 Feb 2022 23:55:31 +0100
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [WIP PATCH v3 01/26] gnu: Add rust-smallbitvec.
Date: Thu, 10 Feb 2022 22:55:02 +0000
Message-Id: <20220210225527.25189-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <87leyinxly.fsf@HIDDEN>
References: <87leyinxly.fsf@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:OZytRGjydapIbrEzML7OFS1eFteSNZnBSGTTjwrAhUJ3hOU8N2G
043Qy6OZKxJ71q8mGSz5gyLMExHKCjFjrtChNuO+1QYtmkjkP18oGB4al94yzNw4SHA6G83
88Qn1szddF4n1iU/yjEsxOJF/nFQzIyUZxF4QZ6XCAk46A4OniPR6WrdJgb/QvLM/sPwC+r
2Vi0nC6JOr82IXmsGdzjw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:dFkQXFRu23g=:UxPO8npIOD3wChDwXPPjnt
mPppaFujHwY2bxhM93G86SKvStjgs4pasa9ihOBMUKbbk2fZUEq3quUBflbnAGfaFATHmijVz
Mm7tCspesBO4clXrKPAuLk/ekjTkK6QBT1JHlxMcVPBb7tPwkV+2I2dbfl09ii2KH50Rzdux5
+j3G6COaz8EPSqOhYClpwOOGlXBE55raYqdmC4mIiNmshOL1cJGiI9RHt+kELfiUZNf+ltZ8s
4PHqD5BrrtTJRVj4vrbtznNBQbUcBhTuvCbLu744hnH5qDdDmC2M2Xo7OowPmywHn5nz3I2Fp
AQoLXEW/69vPe9So6czvWeN1DVvntyFWBB6ZWpxPfiT3UYszgNoX3H0W3DuRIEAogBamAPh1n
CBRHi1az/EvqOOMGpt7LFfadenMREZNg1WJF9etHsHl0I3crZreQgr72E5UsYRK9/FmaiDybb
/J07iGDLOZfybwCOSuwSCtISZapriRFLdHWFi3rkxn88kdbOGX+jf3+iIbhaOoFm/mHS6hEzc
vKJxIT9sTepLGGzGCzU/zrTPrbbdv7oIuvDQ7nXbR4vRw4+ruOe9Ce7xbWrJu/TaWKPoDzRhV
/fOTnvimQQygzFMZqezpDmwn6fbGqD9ZfzhUBgU+djVNjTOLJMt6pjTtBztbvEFeYBC1LLeOW
UuvevFSaaAXrSro4GKamyDJAZpLgX4s/s+OUkKt+ymJiOcFCue/ew9yR0OtUG7Cw67gwwz0Ny
/jr5VK2/+WnwHMgIYdPBpBGMqeYQL7U/fh1Ktvc3PLBCJzjLSjnfl0hiECH/Tf87CCOiWnojM
8JnvZ77G+2vqmMe+LpHquKsrJKu6qc+Li7y4OffdNto8AxGhDuSoRrhEFaPPsDeQLN9cox7c6
bvJZdpWukGewgqoRGcTi+0GS3mqSI8ILMU5OveNTFmGLtU2BkicttR3+VxQzBOjNkFSzjPb+9
aRjNN6kPF7AcEtOOLY7pJaI/2FiZ6KeFWes45b8gBJIepKMlyai7z9apUGFWas+6vKiKhwVZu
vMnTiEfuesB9ZoQBgVvYJZuv+mnAYrYhi2PXajucSlRuzZmCIFdlIuNcJfnsgfHIT0wc87SaA
tPd5LO914q/o5k=
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.
=2D--
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 fa9a7d9ab5..d001e723ec 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56099,6 +56099,28 @@ (define-public rust-sluice-0.4
("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
("rust-futures-io-preview" ,rust-futures-io-preview-0.3))))))
+(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 "A bit vector optimized for size and inline storage")
+ (description "This package provides a bit vector optimized for size a=
nd
+inline storage")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
=2D-
2.34.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:52:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 10 17:52:23 2022 Received: from localhost ([127.0.0.1]:57486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nIIIY-0000mj-Uu for submit <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:52:23 -0500 Received: from mout.gmx.net ([212.227.17.22]:35759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pierre.langlois@HIDDEN>) id 1nIIIX-0000mR-5g for 49946 <at> debbugs.gnu.org; Thu, 10 Feb 2022 17:52:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533534; bh=uO5uAWE25WBxBMjZ1Tu8i/ep+I0ZJ3UYZKat38QHHsU=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=exe9PUScsNcIn/1Dcy3RZa2UN71yclKQaxVFekw+F2/ES7fQHxLBKw0e3mu1Errwu NklRt/deQvU+KEW+5sEHROuQ7Y1aattO1par9alI+TUZXTrGgFPR8l/oKaqSgVkJcf 7buytVsYBYTG0DfR3H0qOijKofvepfz33kdwh3bk= 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 1MWici-1npO2o0V44-00X0NN; Thu, 10 Feb 2022 23:52:14 +0100 References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-7-pierre.langlois@HIDDEN> <87czpwzg9e.fsf@HIDDEN> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois <pierre.langlois@HIDDEN> To: 49946 <at> debbugs.gnu.org Subject: [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs (and neovim as well?). Date: Thu, 10 Feb 2022 22:39:36 +0000 In-reply-to: <87czpwzg9e.fsf@HIDDEN> Message-ID: <87leyinxly.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:/D52zmkKJrBRiY45tufqgC9MtfHdTOvEhqrLpKfpEFXwmrHM/0W GZZSmGOBbIzNY+lIdTh19Lj8Ibjtn2Uee30cJE+2wrGrvD8uyxyC3nwVIctI0K2bKfnjhh0 HFwxIoXhsoQ4HW/1PYy+CqEm28OpI8Zz2hlPb5+hBmlAwyfqb6L5p66B2SUrv5TVxM3SVSH 0mledHOy9btWPb6GZ9ASw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:O0TgFzpvjPw=:qdTGu18SCa1bqOFzn0JyAt D/CDMlxQx0zKvXN9LkR/BYOH6lG9xR3s9dEcCEWlRBSdwiQlXvIIoTpvAKUGUWTZ2SAIDdPc8 4hyk7juAlSpCk365+RjLd8UjYWBZrUVTZ4D0RYkGeXTaiXKl8UJBDzz+3XDVDoiYFbZcxKfbA cMZMZkX/wesllOzRhXjH7xFeM3srRQuswrtn0rei96gVzd7dvD31MROCWKZfVHNu0hBIOs7IU W/Mtx+yY4mzUX1PACSbW5DCT7Ob6JaZrZtGpQ7JMUJRo41U330j7lNAWBgxIlfQouNUymxIG1 H7sia0s0fNw12aOUw7P9bBgRSkC9KpasAdxKRKZo4kFXOOjWeA5tSJmxaXakIbx7fKcd+Ye+c DPXJzNbMYL9O7NHYq38MxlrBPpaLTJeP4ai3kAwtZd2lqU8qrpxeFI1slNCX7omJwCNQwN79U xHWv4Bv0hQ55moTpRSS5O22p1UE/rPhemZVrcDKWudxC2S7LZIBhkeBN8KwgB+W573JndJRjF 3qqj4qzrF6vlGWgbQ8CXb6QqdHW/Z2m01RXYWnR/lA3m5VjEc2kyzjDRCT0fFEZM/Gt3Epeph rcc7oKJWf0d8ugJPFRhJHCo8T6UZpmJbi74b3MwSJIqeRSkgZc/eO8K+QGJIDDc8l10kGrU4h BwvqleWzZbu+FVNbGMweFGyeWT7rsS9i5JI5FOoWwx2WuhNntuMZx4pQlyv5moo83kS/6b2TB Soge9C9ZnqUlSK7H26K18vo2hMmREgz2pI70Diw6ybW8VYdDCCXnfuZC/l0JintOAeADCL4/J gRybR6CpN8PpywiLZ94Aown3dwxfnt/HvQzQHd1cayEGPJv5iRHdESiBVoeZFFIg0ATA3fWNK EjGWGGIZaS6ZZLVvRP7Zq7xJYmY0KfFgyXxd/3eI69aak1+1ixroMIbhJRnJLk146J6t13f8F vwjPrTPJELZBojc45ni6o+Op58DfFuqefTx3sf8HbvbuQG7HSeUD02eAWzlaEevUeWaAOzATr N/qix2j4TG/xs3yH0Mn6YKn5Q7OJf6YDFxqbeA4R9vnz4AnD7JKluUvW2IJxPeMREJs2AVaMu 4JBgoXnh30cb+4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 49946 Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 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 Hi Guix, hi Luis, Here's a WIP V3 of my series for tree-sitter. I'm almost done with it, I need to to another couple of passes to see if there's anything left to cleanup. I'm sharing it early as a WIP first, as I just noticed the other day that Luis also contributed a patches for tree-sitter for neovim[0]. The series I have here is quite a lot bigger though so I'm happy to rebase it on top of yours, Luis :-). The package I had for tree-sitter looks basically the same, I would then move it to a new file with all tree-sitter related packages, if you're happy with that. The other reason I'm posting this is this series, which while it only supports emacs, actually builds grammars for some of the supported languages, I picked a set that I think are popular, there are probably more to add but I thought it was a good starting point. While the grammars are originally in JSON, they are distributed as binaries it seems so it'll be better if we can build them as part of Guix. So I'm wondering, are these tree-sitter grammar packages also useful for the neovim package for tree-sitter? Anyways, see patches incoming in just a minute! Thanks, Pierre [0]: https://issues.guix.gnu.org/53523 Pierre Langlois (26): gnu: Add rust-smallbitvec. gnu: Add rust-html-escape. gnu: Add rust-spin@HIDDEN gnu: Add tree-sitter. gnu: Add tree-sitter-cli. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-bash. gnu: Add tree-sitter-css. 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-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. gnu: Add rust-tree-sitter-for-emacs. gnu: rust-emacs-module: Update to 0.18. gnu: rust-emacs-macros: Update to 0.17. gnu: rust-emacs: Update to 0.18. gnu: Add emacs-tree-sitter-core. gnu: Add emacs-tree-sitter. gnu: Add emacs-tree-sitter-langs. gnu/local.mk | 2 + gnu/packages/crates-io.scm | 154 +++- .../rust-tree-sitter-text-provider-fix.patch | 98 +++ gnu/packages/tree-sitter.scm | 808 ++++++++++++++++++ 4 files changed, 1044 insertions(+), 18 deletions(-) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix= .patch create mode 100644 gnu/packages/tree-sitter.scm =2D-=20 2.34.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmIFlxkYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UMf8IAK06VuxmHQYuMO49zLApSwso ONhTcSfLy8VNGjirKEjJHaErjMbJv4kN9PUyw9YvwzGVz1aCfIBQy5p6mItzNBE0 wxY2D5GT5YummMLzXPOMfrS+eA9Og7RSp0PKGC4pg6vI+z/9CdNACpwhWQIdMV/J lI/f2nISCzVAKusx9PiCG1zPFrUuZtCu+wyOgK53z6Pah1/hYQvEUFMx+LoNHFri eiZHIPswLMPAbzJAghTG7v5PQ8dluUQ1C6iD1uRT2xsbDuuc7TrmKwOCLYIIXcam bu7TQmxSFsxibNObXKEilFX7Cmadp4pNEt4Z6Na8ekT6qZcWxUVPEcFtGfVxa2I= =nW3K -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 2 Oct 2021 12:04:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Oct 02 08:04:37 2021
Received: from localhost ([127.0.0.1]:58138 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mWdko-00008t-2o
for submit <at> debbugs.gnu.org; Sat, 02 Oct 2021 08:04:37 -0400
Received: from mout.gmx.net ([212.227.17.21]:54101)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mWdkk-00008X-Fu
for 49946 <at> debbugs.gnu.org; Sat, 02 Oct 2021 08:04:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1633176260;
bh=OcSuNLVM72fX25kvZ1+7oeoalAWe5WjD7StfiN7HVvs=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=PGZSofT2kjgn1ffCgYuLCRe+Rn7Gu/+/YbcoU6RffRKJicJ8iphFmti5koXsBX7fu
5QilC7o2jQ2wjRsTEvYz889b765FNf2cMSN5yGiWwzKc8DriBf+7f+ceWA0q5yq9ek
A5NL4Y0ODoPc9m1ZGBiF9oQsmloeyLhZuhEGFTv8=
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 1M8ykg-1mTuSo2Vdu-0069wM; Sat, 02
Oct 2021 14:04:20 +0200
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
<20210930225611.2143194-4-philip@HIDDEN>
User-agent: mu4e 1.6.6; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Philip McGrath <philip@HIDDEN>
Subject: Re: [PATCH 3/3] guix: node-build-system: Support compiling addons
with node-gyp.
Date: Sat, 02 Oct 2021 12:49:48 +0100
In-reply-to: <20210930225611.2143194-4-philip@HIDDEN>
Message-ID: <878rzbtyyn.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:v3jtw7jU3Iwa0+4ogZ5xTC13Qlh/+2DI1Qxd29bFNTPDav6XLmp
XBTbkUPdV/twqiFzDdPIvcvIUhwwIUR3ipn8dp0tX2TJD9jZ9yXjhJeaVDhSMjg2D3DQBtq
EeKJWez3x0w9vI7YBIvbc+S6gqYOu1QV6RjU/8OF81oD+HMQaVYSJl1kWXcAN6mbrlrJIYo
tr4Mt7PPOTlWtSqVi20fg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NMvJHMQYJ/c=:6jvWTScM5NR+RVkulNq8mS
EhhXTVwc5/+IP0f3CRQvWfk+gReFPIJo3c41swRWpA7stOGrge/dIsumPAspc6GRrA6OlmVP2
ff4mGniJkieGHTmFxwG7Q2tK1rnWV2XtvH54t7z9eBRqNBU87Mvc0UcEjamYVnTiNu5SwoDXg
C8WsQNEK7mquhB+HZmupI6+zKQp//2F3ICEydt0Y0FGa7HRrcq7xJzJ09xhklsj1wjbEp7dan
aX1dl3hP9+IGyy2cESXxXOepzIn4l7xD6FurAHQBiHMLymfeBGdkyLM1hA6IyP/1C7HJx52s/
Cd3mCUuiWRIXN5sdM3dZasdiLFraJo/Qsy+I49eeLqPDpR/kfDgmRbKJJSEkLpglhvqnBFXUW
zYSKOAJmezXJrg0n5A9iZpppeq9uWf+Wc7wViEMG0C3jFrBLLOrIzNKnBjn+Y82tRAo/HemhO
CjFJMU8GgzWKQ1oJsi2L5klRUSwairYmwxHq99/mZ6yq793PVohpDZrpkdCtiJB8uxs69Akwi
JdxqiykRKazdzlJB4fqkKcrYAcoZe3H+eaDz8QmQpzuhl3pLFXhHzL48X6YSH7oyzrfTl7g+M
wNTJwVeMkwOpCM1RcT/YCOLFRlM1G/jlaYYpKwaR6CC37DJ5MQm9XUelT3Hf/7gUtXAMlDAWl
ft94bHsFCIaFS221VEHEG/DSLOcJmwnY1Oo4i6hGOQLQ5XoLfOeOhpJ0pV3nvdkDMeLwrYd6L
+vYIG9jKm7AwhT+pK6vYMDngY+1tCOIMZlh0U/HMmzPvp7lvUsXzccJHeyuSvusJdjIEYitz1
0d4OZnlDrv/1KGtOKp4GsvxBZbT+CzE38sqMjtup/xDS3rM5GnS4p9Kf3MRJuqzanOnX3Whh3
00tu6XbaqvFnRI+nCH3cyKYl7rGSq0wsJlwnhOnIOqeEsgn6DWonmbPWku9IaZb5zh9r3V/k2
+vG3kqc/xZLQCGKD6SnqRGWVmtbXdGHuzmTMEW35Kc9+aioqVn4VZpzZRgrP3lOWyVMltBrXL
t+/59BsC0d9296dn7udWP56bTvw9+L3UKThoRt0jyebhQOpHPbiKB6t0Bwe2mjOncVFv22qUX
XmVoVk+LWnEKjY=
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Maxime Devos <maximedevos@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 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Philip McGrath <philip@HIDDEN> writes:
> * gnu/packages/node.scm (node)[arguments]: Replace 'patch-npm-shebang
> and 'patch-node-shebang with a new 'patch-nested-shebangs that also
> handles node-gyp and other shebangs under "/lib/node_modules".
> [inputs]: Add Python for node-gyp as "python-for-target".
> (node-lts)[inputs]: Likewise.
> * guix/build-system/node.scm (lower): Add optional #:python argument.
> * guix/build/node-build-system.scm (set-node-gyp-paths): New
> function. Sets the "npm_config_nodedir" and "npm_config_python"
> environment variables.
> (%standard-phases): Add 'set-node-gyp-paths after 'set-paths.
Nice! I'll test this with the tree-sitter series. I just had one comment
inline, otherwise it looks good to me.
Do you want me to integrate it into the tree-sitter series or submit it
separately? It might make its way upstream quicker separately, in which
case I'd suggest to send it again in a new bug for more visibility.
>
> Co-authored-by: Pierre Langlois <pierre.langlois@HIDDEN>
> ---
> gnu/packages/node.scm | 33 +++++++++++++++++---------------
> guix/build-system/node.scm | 7 ++++++-
> guix/build/node-build-system.scm | 9 +++++++++
> 3 files changed, 33 insertions(+), 16 deletions(-)
>
> diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
> index 6d9c3ccc71..805a4f18fc 100644
> --- a/gnu/packages/node.scm
> +++ b/gnu/packages/node.scm
> @@ -244,21 +244,22 @@
> python
> (string-append python "3")))
> "configure" flags))))
> - (add-after 'patch-shebangs 'patch-npm-shebang
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((bindir (string-append (assoc-ref outputs "out")
> - "/bin"))
> - (npm (string-append bindir "/npm"))
> - (target (readlink npm)))
> - (with-directory-excursion bindir
> - (patch-shebang target (list bindir))))))
> - (add-after 'install 'patch-node-shebang
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((bindir (string-append (assoc-ref outputs "out")
> - "/bin"))
> - (npx (readlink (string-append bindir "/npx"))))
> - (with-directory-excursion bindir
> - (patch-shebang npx (list bindir)))))))))
> + (add-after 'patch-shebangs 'patch-nested-shebangs
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let* ((prefix (assoc-ref outputs "out"))
> + (path (map (lambda (dir)
> + (string-append dir "/bin"))
> + (list prefix
> + (assoc-ref inputs "python-for-targe=
t")))))
> + (with-directory-excursion (string-append prefix "/lib/nod=
e_modules")
> + (for-each
> + (lambda (file)
> + (patch-shebang file path))
> + (find-files "."
> + (lambda (file stat)
> + (and (eq? 'regular (stat:type stat))
> + (not (zero? (logand (stat:mode stat=
) #o100)))))
> + #:stat lstat)))))))))
Here you don't necessarily need with-directory-excursion. I see we also
have a executable-file? predicate function in (guix build utils), could
we use that? i.e:
(for-each
(lambda (file)
(patch-shebang file path))
(find-files (string-append prefix "/lib/node_modules") executable-file?=
))
> (native-inputs
> `(;; Runtime dependencies for binaries used as a bootstrap.
> ("c-ares" ,c-ares)
> @@ -281,6 +282,7 @@
> (inputs
> `(("bash" ,bash-minimal)
> ("coreutils" ,coreutils)
> + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports p=
ython3)
> ("c-ares" ,c-ares)
> ("http-parser" ,http-parser)
> ("icu4c" ,icu4c)
> @@ -764,6 +766,7 @@ source files.")
> (inputs
> `(("bash" ,bash-minimal)
> ("coreutils" ,coreutils)
> + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports p=
ython3)
> ("c-ares" ,c-ares)
> ("icu4c" ,icu4c-67)
> ("libuv" ,libuv-for-node)
> diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
> index 98f63f87ef..3e49e67ff6 100644
> --- a/guix/build-system/node.scm
> +++ b/guix/build-system/node.scm
> @@ -1,6 +1,8 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright =C2=A9 2016 Jelle Licht <jlicht@HIDDEN>
> ;;; Copyright =C2=A9 2019 Timothy Sample <samplet@HIDDEN>
> +;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
> +;;; Copyright =C2=A9 2021 Philip McGrath <philip@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -24,6 +26,7 @@
> #:use-module (guix search-paths)
> #:use-module (guix build-system)
> #:use-module (guix build-system gnu)
> + #:use-module (guix build-system python)
> #:use-module (ice-9 match)
> #:export (%node-build-system-modules
> node-build
> @@ -44,11 +47,12 @@
> (define* (lower name
> #:key source inputs native-inputs outputs system target
> (node (default-node))
> + (python (default-python)) ;; for node-gyp
> #:allow-other-keys
> #:rest arguments)
> "Return a bag for NAME."
> (define private-keywords
> - '(#:source #:target #:node #:inputs #:native-inputs))
> + '(#:source #:target #:node #:python #:inputs #:native-inputs))
>=20=20
> (and (not target) ;XXX: no cross-compilation
> (bag
> @@ -62,6 +66,7 @@
> ;; Keep the standard inputs of 'gnu-build-system=
'.
> ,@(standard-packages)))
> (build-inputs `(("node" ,node)
> + ("python" ,python)
> ,@native-inputs))
> (outputs outputs)
> (build node-build)
> diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-sys=
tem.scm
> index 70a367618e..5e62eb4784 100644
> --- a/guix/build/node-build-system.scm
> +++ b/guix/build/node-build-system.scm
> @@ -2,6 +2,8 @@
> ;;; Copyright =C2=A9 2015 David Thompson <davet@HIDDEN>
> ;;; Copyright =C2=A9 2016, 2020 Jelle Licht <jlicht@HIDDEN>
> ;;; Copyright =C2=A9 2019, 2021 Timothy Sample <samplet@HIDDEN>
> +;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
> +;;; Copyright =C2=A9 2021 Philip McGrath <philip@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -46,6 +48,12 @@
> (format #t "set HOME to ~s~%" (getenv "HOME")))))))
> #t)
>=20=20
> +(define* (set-node-gyp-paths #:key inputs #:allow-other-keys)
> + "Initialize environment variables needed for building native addons."
> + (setenv "npm_config_nodedir" (assoc-ref inputs "node"))
> + (setenv "npm_config_python" (assoc-ref inputs "python"))
> + #t)
> +
> (define (module-name module)
> (let* ((package.json (string-append module "/package.json"))
> (package-meta (call-with-input-file package.json read-json)))
> @@ -144,6 +152,7 @@
>=20=20
> (define %standard-phases
> (modify-phases gnu:%standard-phases
> + (add-after 'set-paths 'set-node-gyp-paths set-node-gyp-paths)
> (add-after 'unpack 'set-home set-home)
> (add-before 'configure 'patch-dependencies patch-dependencies)
> (replace 'configure configure)
The build system changes are now so nice and simple :-). I guess we
don't really need to set npm_config_python, it should be able to find
python in the PATH, but it doesn't hurt.
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmFYSsAYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UbGwIAIkzKPG7t2Zzpwiq6OpznueP
jnWlHc9SSX470xck1bwv7Gf06J84rIh523jkmiMGCiPN0vz2/KXj1FZIB6ykcJfr
lXUfBu7gEWclAa8ilV2CwJHv1Xrn5oDXUPFdLxnmnUQtPaGKC7rwqWeNeHA6/oX3
rGLCN/5PiL3sM86Fym6sealM8t8wAIRU1SwyBr2JFthoAH5O5Dvol2Mtsv1Tckzh
LvQWIg0KR+l0/sogj2YHSnhqvXemnK1icBR4hxD/5quBqpiCvH1j5Qh+1ogcKq4A
WVvabJYzc3GQoLLuJTWtNEvIRDZMite9Og75DWaopRbWQBR0Pual/aY1x5YIdRk=
=R3ZV
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 2 Oct 2021 11:42:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Oct 02 07:42:56 2021
Received: from localhost ([127.0.0.1]:58103 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mWdPr-0007wV-Oh
for submit <at> debbugs.gnu.org; Sat, 02 Oct 2021 07:42:56 -0400
Received: from mout.gmx.net ([212.227.17.20]:60267)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mWdPp-0007wH-SI
for 49946 <at> debbugs.gnu.org; Sat, 02 Oct 2021 07:42:54 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1633174967;
bh=AdY6OF+zAhM3Pi3ldPTsX+mXGtdLEKEj6WvKZPg51ik=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=KCZu4IpVE1LLuOVxS3rtpy04VE7Sc6mKP2dBCgX8OwH4BStaSQzD3iiEewFo/+bzB
Zq2aR10w88V6QboaOtfuPQeVLfojO0AJBQWt6ooRWgxv9qXJ47Cm4tNDxe0cCvGbCc
qvmbSEOWgsYLochgNXUryUsVWke7hlc1oQcpBmmE=
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 1Mn2aN-1nGizh31yp-00k5Ne; Sat, 02
Oct 2021 13:42:46 +0200
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
<20210930225611.2143194-2-philip@HIDDEN>
User-agent: mu4e 1.6.6; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Philip McGrath <philip@HIDDEN>
Subject: Re: [PATCH 1/3] gnu: node: Avoid duplicating build phases.
Date: Sat, 02 Oct 2021 12:03:13 +0100
In-reply-to: <20210930225611.2143194-2-philip@HIDDEN>
Message-ID: <87h7dzveiy.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:QskucceKtb636UPXS2aL8CfHGfhztEv/1mlgJ4fi1ScPGadqvkH
lj8HJO337QsVFWzLIcGCCNU88MvxtziLO07s/THR9W+C2qEPzwDAggOaIuKY4XVevwknm7B
rJA6vXp3h49/bamy8I5IrfcOrDcPJbzNDkiF5/wRt0ZKqf10KORg7wrLrWgT0d/q9n5VSYS
W7HH68S+UAKtI5fgJBqQA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:3ZUFcb9KeuY=:ua0PBDpvJSQawwJ5zKXXY3
o8A2Z2ZtOayaiyvyQ8uUZiqL83azaZ4bPqVJQtWGm8hMJw7pO6WG+dgj38yHXxEXBwpY80GDT
X0p5xa8WC4EwIAcnpArD/B2PT72tAM89abSxxDN8pTKhVBIMzudRFeYBUThCIt7Q9+G2CP3ob
IPImSmgIcIalooUZnCldFAlFX7MLlPnwJoGP/Jw3CRN8pgNM1ZPHgNbSG+CCPoDlZ9Gf49Q8i
9cc2I0ruoMEOjDw777qbtI41PHYAMuXxQTTp+T5taJq2OkJJP9v9ul9exiuqSjiWxOB/0eW7P
eJeRlVdr+2DkxWfOqVdxptuyVtcsC+AGXP49eJGNId0GH5HEfNfklOl+K9ZqoX22F2x+W6lgI
BtH748CA1GBn05/Fva+JDU2I6QZDBa7z3+3129GDwx2BojUHv7Ud2rL6lJ0EQCbPWWeUDbmV8
PUhnv9rOcqyQzLygu+rGjysFWnb3EAO25lQEzrnpkYpg7+ykCeRmcONWfdizUvS+UC9zl/GfF
HGLMJOCpt1767gjEmrR8gaHChrQlIwFWDTwE+5Q6axS4qJu1kzwHQgb3GEWIBh9jEbCq6wSon
Q8ZbaQd5+bWKGSiNgLbYClkNYNpxcFF1zo3WBcLcv6Eps++979KTylDS7HvZeIoLgbmATnNrQ
uC3pnny1TMXGcVI1JK3ht9OvwU8XAbRHygt22GG9x2RtRXxuHVsvJCgx0tHQXd8mTGtLfJOTG
JVXCD/eZJVY/BqHcRGkV73nHKum6bD25TZttrbYvzNH69TGQ052TNLpdC9po0lAoZalm09XuB
5sdJ4BqPEi0oa+lsXppV5JVIwhFYTt7nVwNbrqMoPYInR3GhEi3CDCsyxKCW6Zay89dZWgNwr
O6x9h+sJwttTJNmItajGfx/fJi4S7/eZwFJYauoo0LNEhFwQ9T0NoEJh4lxueKj4/b7ZDLrCm
Kas3XN87l8cvgS/8gV43Ybgg6r0cuzsRZWDua0A2prP2fSDsvC0yvdO/YIM9LoGuhpiWqhUeF
R43DPAJ6uzKfhDIrViY1JslMNKDTc1hcrXiQevtSIhs/jYBL2YXn/72F0w1tAiwA6M5dr6Uco
VUwk6L4FPNjPj4=
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Maxime Devos <maximedevos@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 (-)
--=-=-=
Content-Type: text/plain
Hi Philip,
Philip McGrath <philip@HIDDEN> writes:
> * gnu/packages/node.scm (node)[arguments]: Split 'patch-files phase
> into 'patch-hardcoded-program-references and
> 'delete-problematic-tests. Adapt those phases and 'configure to work
> unmodified on node-lts.
> (node, node-lts)[inputs]: Use bash-minimal rather than bash.
> (node-lts)[arguments]: Inherit 'patch-hardcoded-program-references,
> 'delete-problemating-tests, and 'configure phases from the bootstrap
> node. Remove the 'patch-files phase, keeping its remaining
> non-inherited work in a new 'replace-llhttp-sources phase.
While I agree that most of the time, factoring out common code is a good
thing, I'm not sure it applies in the case of patching tests. The list
of tests is specific to a version and it's likely for each version to
need fixes. Having a common phase that describes the tests to patch for
2 versions (3 if we add node 16) is harder to maintain than three phases
IMO, even though they'll look similar indeed. Having to change commmon
code can also cause unnessecary rebuilds.
For example, I started working updating node last weekend and saw these
test changes:
- 14.16 -> 14.17: Delete test/parallel/test-https-agent-unref-socket.js,
requires networking
- 16: Extra test needs /bin/sh patched test/parallel/test-stdin-from-file-spawn.js"
A couple tests were renamed:
test/parallel/test-cluster-master-error.js -> test/parallel/test-cluster-primary-error.js
test/parallel/test-cluster-master-kill.js -> test/parallel/test-cluster-primary-kill.js
That being said, I definetely agree we should have a separate phase for
the replacement of the llhttp source, that's logically different from
patching tests, and is unlikely to change version to version.
Keeping the list of tests local to each packages allows to add node 16
while avoiding rebuilding the others, does this make sense? I could be
wrong here of course :-).
Thanks,
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmFYRbUYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UzrcH/i7cT2CBqJuJMKem8JeCTV0g
Z1jWeCdY1zYvmulsczCn/35nIwFi+n+YBePIoxn9pfyl6FfrMXskMavafWUSk8K2
El5QB0ITYyWQ3w7R87GIonaMxc7Yqsy/SteTe3gqLPPQCO4N3kcx4viiigLK9wGF
Q8xSWrZZlsEQat7E/z3ID0uW1AQ3Usyk+GqjEYknJQOTyutN5T1LjwMHIrICftxr
aUZ6kKxRCBLy23kprbneZykV3DHsLwvl96gGBD2XK+rKuHjvhmHl41Sqh49xms92
dVtlA7AMR/ZPrWOvvjD8oPOi610sw8HhpuNjmrv8bE0ub7Q8dL9UEqEDQkzzz4I=
=S0Pr
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 2 Oct 2021 11:40:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Oct 02 07:40:09 2021
Received: from localhost ([127.0.0.1]:58092 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mWdNA-0007ry-GU
for submit <at> debbugs.gnu.org; Sat, 02 Oct 2021 07:40:09 -0400
Received: from mout.gmx.net ([212.227.17.21]:53149)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mWdN7-0007rA-Ur
for 49946 <at> debbugs.gnu.org; Sat, 02 Oct 2021 07:40:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1633174798;
bh=HR+bdLtpPgf30J4B1Qr3YvIPDUGQXn7pA5Z9UkN4pgk=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=lkLFhD17LFyMiSOU6qtn2ihD+j8IQgy/Zz5q83o70BrWIUTFkHjx15X9kr7muTACQ
7FAG/LShpKmuUZuyDRzlWiUXdM/ItOKx/BdmrpiusKA91wcyR0gvrjV78V60GxCPmO
AWsQMLCg1Et7y3Ba54YjyC/kC8Mew4P1cYFs+F/s=
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 1MAONX-1me6QX1ucV-00Bqb3; Sat, 02
Oct 2021 13:39:58 +0200
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
User-agent: mu4e 1.6.6; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Philip McGrath <philip@HIDDEN>
Subject: Re: [PATCH 0/3] guix: node-build-system: Support compiling addons
with node-gyp.
Date: Sat, 02 Oct 2021 12:30:56 +0100
In-reply-to: <20210930225611.2143194-1-philip@HIDDEN>
Message-ID: <87r1d3venp.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Provags-ID: V03:K1:5D+XveQupYM0PHuHvGYPVytq9aXFRRozO+mLGlsIJpL/r39KSrY
Dkl353AprYFcs8ekwS2LsrMBSVRtmEO3kVZ9DAMRAvGFdUcklGDN6+JLjz4SzvF9awWCTIA
mqZXUHzW+Czk3y/MxXs08yTYMpLhUNTSoa3eyQoUEpVionZLK+mhFJe059o5pQI+o+V4yso
YVPQbYUMGuU+2v2rx0Kcw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:37bPWH7u9p4=:ofa0WkaUa950765Qu8i7h1
6DM8DpvLLeOihOnoDmNz/QiBjEGfEQSKH9rSSjitKFB0AZ5zNshjSyKyyjLG5j3yE5HoVm8Il
gD8wYBL6Y/pJyXUyRMh15NrB42F9gJhT8X5T5Yh7QSEhwdYFA2d/lQjZFaVI5QWaey7Crsxd1
Uw/7nZD7WgWSvmFJMt6pH95IUfAy9J5lvPGZPfsi65d3kkp0aIkcLcJxrpLeJyEXHALwS2eeZ
lRkZ1lQNBo1Lduon/QCixf/c7OvA4CmP8NgVf2Bq0kAUcDDRKmz7bBrqEdbacJhfvKhvyjU8h
j+Vkkp3zBl7YeCu3pVSTkHX5ZU6YTtWhPvrBuV5WiHwLD7CQIEYy7I0FeeneqZuc7cAy8BWb+
Ljmduqfh+hWhYG4O+iHOQm3Paq0q4Zfo4bVVOw5IoDF+yfuyF6UTGHKeWnqpOML5NemB3riks
9CezkArRqTYpvOS1Wls4LDLZoC9FYd+XFZjFbyn/spiYhwGRdcfckUm8nWwdB0BxUSsoZXeKo
9DFPglTWCTkt3vjBkMeU7k+KSoqm0jiH0eLZ9FW6oLMcMHPPI7PoLH3TxQy0atrhODko5Nluk
4BecJOTnI2K0aE4oPvkg+vZa+XGpMBVGtJjKWkw2J6YgXW/v9036G5ODJ4ip14N+IA7hfSd0x
Sb0TTwyakSpwsTlNgvugPvvO5KLTgPJgtpIz7GkYiAqJlgm7ZhuzviuXaqTk8zyGjX0IImu9T
Fg3zz0eDfBlc8C9xlWkC7jQLEjLP7XhwG2V1zTZT4YcbmSzh+mV2Au2TxaqZxiAmLoSvBykGD
mcX7J/ao84Ck7aluFlJHNxvfpzUMq5TSwjMWB1eZ4GTcOvvoAtgXmwFHASVSaLH/RNI7xx3tX
VyBWegu0X8hlqKNgjxiK03VRbOxxRifrRR+3vQbNZRhTPUvKdUbkKV2DI551NZad0BkmKtPD+
oqbYtcd07RRTa31nYFw5kFNJuZNbPwuXW9R+kDBPoUcYJd8pmISZKtgBIeF8btn3cumQzQL28
/fAPwqZ46JxB5E8B/iqCcMFGFweA3NxtY2b6pjaieKnj4B1BymShD+W55PvvvYRN57nFZYTje
7iq6HCmSAjN7so=
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Maxime Devos <maximedevos@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 (-)
--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
--==-=-=
Content-Type: text/plain
Hi Philip,
Philip McGrath <philip@HIDDEN> writes:
> Hi,
>
> I've reworked the part of the patch series dealing with node-gyp.
Nice, thanks for working on this! I'll take a look at the patches, sorry
I've not had too much time this week yet :-).
> I'd like to find an NPM addon package to submit as part of this series, too,
> basically as a test case. If I can find one that doesn't raise too many other
> complications, I may send this in as a separate patch, but feel free to try it
> with tree-sitter, too.
Cool, I'll give it a test with the tree-sitter series.
>
> There are a few things I'm still not sure about. I haven't made
> node-build-system add libuv as an implicit input, because I think some
> node-gyp addons don't actually need libuv, but maybe it's common enough that
> it should be done automatically.
I see, I assumed libuv was needed for all addons. I'm thinking given
node itself heavily depends on libuv anymays, it might be nice to add it
by default in the build system, but I don't really mind either way. I'll
check if I can just add libuv in the tree-sitter packages.
>
> Likewise, I haven't tried to change the issue of `node` referring to
> `node-bootstrap`, but I still think it should be changed.
I agree it would be good to change this. I started working on updating
node last weekend but haven't had time to work on it after that. I think
we should probably name node always as "node-<version>":
node -> node-10
node-lts -> node-14
Then keep the node and node-lts names as aliases:
(define-public node node-14) ;; The latest, but move it to node-16 later
(define-public node-lts node-14)
However, moving the node variable to node-14 is likely to cause
rebuilds, so we'll have to check that.
Anyways, here's my WIP patch in case there's anything of interest
there. Note that it still has the bug you pointed out where I'm refering
to the host python instead of the target one (thanks for pointing it
out!).
Thanks,
Pierre
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmFYRQoYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U/pEIAJdXHFJ7Gdbyx+axxXdEanQN
Tls8O855DPywHIgUhgGC5j6Mz6gk4/mnnEXWhbduPn+ehqvUABql9k87wF2tb+YV
sbYsBX5Xqv8GVKHW1vl1WGnCcZCJFK+x3pwrzIvsaCkN+31E2HxkSZCVCIzIk+fb
zd6yoH+nq8ZUR6QqdhA9X13FZjgm4Fq8VeDzVYrMLrvjI5RvdM3e8kN9fAkGJJpw
1WaJYAW+f1BGgQFvwUkAgUk9kUe1rbVvnt5iwGAmqCnFKwcNIvD6wYyKieVvi7U8
sGnO5V/3voK0EbLUt86b9KgQMyeFUAr27eCXULJvp5fEm8+HdLYtt4fnDcncHTI=
=AGh/
-----END PGP SIGNATURE-----
--==-=-=--
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=0001-update-node.patch
Content-Transfer-Encoding: quoted-printable
=46rom b43db52b9a1b55b5756268b710907813f07a42ba Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@HIDDEN>
Date: Sun, 26 Sep 2021 18:58:53 +0100
Subject: [PATCH] update node
=2D--
gnu/packages/adns.scm | 46 ++++++++++-
gnu/packages/node.scm | 175 +++++++++++++++++++++++++++++++++++++-----
2 files changed, 198 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index b36ec18462..6fba9783e0 100644
=2D-- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -23,8 +23,10 @@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages m4)
#:use-module (gnu packages pkg-config))
@@ -92,7 +94,7 @@ multiple clients and programs with graphical user interf=
aces.")
(package
(inherit c-ares)
(name "c-ares")
- (version "1.17.1")
+ (version "1.17.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -100,10 +102,46 @@ multiple clients and programs with graphical user in=
terfaces.")
".tar.gz"))
(sha256
(base32
- "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp")))=
)
+ "0gcincjvpll2qmlc906jx6mfq97s87mgi0zby0753ki0rr2ch0s8")))=
)
(arguments
- `(;; FIXME: Some tests require network access
- #:tests? #f))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "./test/arestest"
+ (string-append
+ ;; "Live" tests require network access.
+ "--gtest_filter=3D-*.Live*:"
+ ;; FIXME: This test fails in the build sandbox, =
but
+ ;; otherwise passes.
+ "AddressFamiliesAI/"
+ "MockChannelTestAI.FamilyV4ServiceName/0")))))))=
)))
+
+(define-public c-ares-for-node
+ (let ((commit "6299d7be383de62da831a3c48f4017b70c664de8")
+ (revision "1"))
+ (package
+ (inherit c-ares/fixed)
+ (name "c-ares")
+ (version (git-version "1.17.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/c-ares/c-ares.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rmk7m7lv5kmqxhb2dmq5fxk73iicg5rgsz2y855hk0a92xlrcsd")=
)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool))))))
+ ;; (arguments
+ ;; `(;; FIXME: Some tests require network access
+ ;; #:tests? #f)))))
;; gRPC requires a c-ares built with CMake in order to get the .cmake mod=
ules.
;; We can not build c-ares itself with CMake because that would introduce=
a
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 71da2aa18f..79ffa8fca9 100644
=2D-- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -53,7 +53,7 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-26))
-(define-public node
+(define-public node-10
(package
(name "node")
(version "10.24.0")
@@ -284,7 +284,7 @@ devices.")
;; This should be the latest version of node that still builds without
;; depending on llhttp.
(define-public node-bootstrap
- (hidden-package node))
+ (hidden-package node-10))
;; Duplicate of node-semver
(define-public node-semver-bootstrap
@@ -524,17 +524,17 @@ Node.js and web browsers.")
(define-public node-llparse-bootstrap
(package
(name "node-llparse")
- (version "7.1.0")
+ (version "7.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/indutny/llparse.git")
+ (url "https://github.com/nodejs/llparse.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
+ "0gzsa4nwrhvm7gz817l5r6v7i8lmqpnrg25smqiq6x8xgs8dlmgl"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -577,7 +577,7 @@ Node.js and web browsers.")
parser definition into a C output.")
(license license:expat)))
-(define-public llhttp-bootstrap
+(define-public llhttp-bootstrap-2
(package
(name "llhttp")
(version "2.1.3")
@@ -648,17 +648,42 @@ parser definition into a C output.")
source files.")
(license license:expat)))
-(define-public node-lts
+(define-public llhttp-bootstrap
+ (package (inherit llhttp-bootstrap-2)
+ (name "llhttp")
+ (version "6.0.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nodejs/llhttp.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wc5xsa76my32k86cax540q0g4y85w7cikqvdjy3rkz2r7fjlyyk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Fix imports for esbuild.
+ ;; https://github.com/evanw/esbuild/issues/477
+ (substitute* "src/llhttp/http.ts"
+ (("\\* as assert") "assert"))
+ (substitute* "Makefile"
+ (("npx ts-node bin/generate.ts")
+ "node bin/generate.js"))
+ #t))))))
+
+(define-public node-14
(package
- (inherit node)
- (version "14.16.0")
+ (inherit node-10)
+ (version "14.17.6")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
- "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf"))
+ "0pmd0haav2ychhcsw44klx6wfn8c7j1rsw08rc8hcm5i3h5wsn7l"))
(modules '((guix build utils)))
(snippet
`(begin
@@ -675,7 +700,7 @@ source files.")
(("deps/zlib/zlib.gyp") ""))
#t))))
(arguments
- (substitute-keyword-arguments (package-arguments node)
+ (substitute-keyword-arguments (package-arguments node-10)
((#:configure-flags configure-flags)
''("--shared-cares"
"--shared-libuv"
@@ -798,6 +823,8 @@ source files.")
'("test/parallel/test-dns.js"
"test/parallel/test-dns-lookupService-promises=
.js"))
+ (delete-file "test/parallel/test-https-agent-unref-socket.=
js")
+
;; FIXME: This test fails randomly:
;; https://github.com/nodejs/node/issues/31213
(delete-file "test/parallel/test-net-listen-after-destroyi=
ng-stdin.js")
@@ -822,9 +849,10 @@ source files.")
;; TODO: Regenerate certs instead.
(for-each delete-file
'("test/parallel/test-tls-passphrase.js"
- "test/parallel/test-tls-server-verify.js"))
-
- ;; Replace pre-generated llhttp sources
+ "test/parallel/test-tls-server-verify.js"))))
+ ;; Replace pre-generated llhttp sources
+ (add-after 'patch-files 'replace-llhttp
+ (lambda* (#:key inputs #:allow-other-keys)
(let ((llhttp (assoc-ref inputs "llhttp")))
(copy-file (string-append llhttp "/src/llhttp.c")
"deps/llhttp/src/llhttp.c")
@@ -836,7 +864,7 @@ source files.")
"deps/llhttp/include/llhttp.h"))))))))
(native-inputs
`(;; Runtime dependencies for binaries used as a bootstrap.
- ("c-ares" ,c-ares)
+ ("c-ares" ,c-ares-for-node)
("google-brotli" ,google-brotli)
("icu4c" ,icu4c-67)
("libuv" ,libuv-for-node)
@@ -852,20 +880,129 @@ source files.")
(inputs
`(("bash" ,bash)
("coreutils" ,coreutils)
- ("c-ares" ,c-ares)
+ ("c-ares" ,c-ares-for-node)
("icu4c" ,icu4c-67)
("libuv" ,libuv-for-node)
- ("llhttp" ,llhttp-bootstrap)
+ ("llhttp" ,llhttp-bootstrap-2)
("google-brotli" ,google-brotli)
("nghttp2" ,nghttp2 "lib")
("openssl" ,openssl)
("zlib" ,zlib)))))
+(define-public node
+ (package
+ (inherit node-14)
+ (version "16.10.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://nodejs.org/dist/v" version
+ "/node-v" version ".tar.xz"))
+ (sha256
+ (base32
+ "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"))
+ (modules '((guix build utils)))
+ (snippet
+ `(begin
+ ;; Remove bundled software, where possible
+ (for-each delete-file-recursively
+ '("deps/cares"
+ "deps/icu-small"
+ "deps/nghttp2"
+ "deps/openssl"
+ "deps/zlib"))
+ (substitute* "Makefile"
+ ;; Remove references to bundled software.
+ (("deps/uv/uv.gyp") "")
+ (("deps/zlib/zlib.gyp") ""))
+ #t))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments node-14)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'patch-files
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ ;; Fix hardcoded /bin/sh references.
+ (substitute* '("lib/child_process.js"
+ "lib/internal/v8_prof_polyfill.js"
+ "test/parallel/test-child-process-spawnsync=
-shell.js"
+ "test/parallel/test-fs-write-sigxfsz.js"
+ "test/parallel/test-stdio-closed.js"
+ "test/parallel/test-stdin-from-file-spawn.j=
s"
+ "test/sequential/test-child-process-emfile.=
js")
+ (("'/bin/sh'")
+ (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"=
)))
+
+ ;; Fix hardcoded /usr/bin/env references.
+ (substitute* '("test/parallel/test-child-process-default-o=
ptions.js"
+ "test/parallel/test-child-process-env.js"
+ "test/parallel/test-child-process-exec-env.=
js")
+ (("'/usr/bin/env'")
+ (string-append "'" (assoc-ref inputs "coreutils")
+ "/bin/env'")))
+
+ ;; Fix /usr/bin/env shebang in node-gyp.
+ (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.=
js"
+ (("#!/usr/bin/env")
+ (string-append "#!" (assoc-ref inputs "coreutils") "/bi=
n/env")))
+
+ (substitute* "deps/npm/node_modules/node-gyp/gyp/gyp_main.=
py"
+ (("#!/usr/bin/env python")
+ (string-append "#!" (assoc-ref (or native-inputs inputs=
)
+ "python")
+ "/bin/python3")))
+
+ ;; FIXME: These tests fail in the build container, but the=
y don't
+ ;; seem to be indicative of real problems in practice.
+ (for-each delete-file
+ '("test/parallel/test-cluster-primary-error.js"
+ "test/parallel/test-cluster-primary-kill.js"))
+
+ ;; These require a DNS resolver.
+ (for-each delete-file
+ '("test/parallel/test-dns.js"
+ "test/parallel/test-dns-lookupService-promises=
.js"))
+
+ ;; FIXME: This test fails randomly:
+ ;; https://github.com/nodejs/node/issues/31213
+ (delete-file "test/parallel/test-net-listen-after-destroyi=
ng-stdin.js")
+
+ ;; FIXME: These tests fail on armhf-linux:
+ ;; https://github.com/nodejs/node/issues/31970
+ ,@(if (target-arm32?)
+ '((for-each delete-file
+ '("test/parallel/test-zlib.js"
+ "test/parallel/test-zlib-brotli.js"
+ "test/parallel/test-zlib-brotli-flush.=
js"
+ "test/parallel/test-zlib-brotli-from-b=
rotli.js"
+ "test/parallel/test-zlib-brotli-from-s=
tring.js"
+ "test/parallel/test-zlib-convenience-m=
ethods.js"
+ "test/parallel/test-zlib-random-byte-p=
ipes.js"
+ "test/parallel/test-zlib-write-after-f=
lush.js")))
+ '())
+
+ ;; These tests have an expiry date: they depend on the val=
idity of
+ ;; TLS certificates that are bundled with the source. We =
want this
+ ;; package to be reproducible forever, so remove those.
+ ;; TODO: Regenerate certs instead.
+ (for-each delete-file
+ '("test/parallel/test-tls-passphrase.js"
+ "test/parallel/test-tls-server-verify.js")))))=
)))
+ (native-inputs
+ (alist-replace "icu4c" (list icu4c-68)
+ (package-native-inputs node-14)))
+ (inputs
+ (alist-replace "icu4c" (list icu4c-68)
+ (alist-replace "llhttp" (list llhttp-bootstrap)
+ (package-inputs node-14))))))
+
+;; LTS release used by the node build system.
+(define-public node-lts node-14)
+
(define-public libnode
- (package/inherit node
+ (package/inherit node-10
(name "libnode")
(arguments
- (substitute-keyword-arguments (package-arguments node)
+ (substitute-keyword-arguments (package-arguments node-10)
((#:configure-flags flags ''())
`(cons* "--shared" "--without-npm" ,flags))
((#:phases phases '%standard-phases)
=2D-
2.33.0
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:59:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 30 18:59:59 2021
Received: from localhost ([127.0.0.1]:54293 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mW51v-0000eb-Ac
for submit <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:59:58 -0400
Received: from mail-qk1-f173.google.com ([209.85.222.173]:33729)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mW51t-0000eL-12
for 49946 <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:59:54 -0400
Received: by mail-qk1-f173.google.com with SMTP id d207so7523836qkg.0
for <49946 <at> debbugs.gnu.org>; Thu, 30 Sep 2021 15:59:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=MEAkXxHZyy5STr2gwnfyP0AmLavcDqzfePCTPSpj+lE=;
b=Bd9f/DCXxqgMChpWzC3aVC+p6GBzcBwU89Vg2dNOIgyp8R6YpvHbjsvjyB4T0Q+061
Sfxl5EXUT/hZzeRcipNIkLVfQ+x9DuvhYrT7TFmpOgMFqSTqqEiDztpflpqR8oyixa9x
mNc4uBn1J4GAs4rPQVUbpXIaewyBzIyOKGpbyLI2TbJd9U7QGuEgbT2FyMMx84kxMAxl
U6l81zyfAm+IIMM+uXUxOLEvXHFnZU8eCsOSHnex//shLz49MskKDOnpZ5eb242HCDjp
RYKKJAh+l43+stavAlFjBjqJnga5o3yqeq8IdTofHIrBeMFK8fbJZKvDpeKPiWmkNWh/
yN/Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=MEAkXxHZyy5STr2gwnfyP0AmLavcDqzfePCTPSpj+lE=;
b=fqHTo/gr7+CcnRB2N5I5uE0B6JJ75qFa1amQfUpJT08kmS/J523nQVgBxgLXs/XfO8
OsynvrHqBEicNSpUc7XpzO3XtdtamUh0mX3+pGwukMU1exJemON+B41FXdUJC2/dSwEQ
uUmvfcitNjF/tt072LEeyaut4PtShaLY054YEj6FxRJuOJ7LZ/t96Cr5s2/oJeaps4oy
znwclLT+OZSECkHbbpag10oidsMd8MGzAXEecf7hGhBwbWYfjfWsoOwJAzktAtqCJyNA
pXsrVEn4wQlW/C66crozw/toBBUSw7eB1jGMWG12avyF6WSJiThAByd3aMPnEMQFvlVh
g+6g==
X-Gm-Message-State: AOAM533Wp8hYGdANbaFRwk0zjrj0vX6qhB3qB1u3VUZNhaoDpjEx7j6C
aVE3hJCJnDEq4RX0PZS7a4xnqkPcadxb6VDu
X-Google-Smtp-Source: ABdhPJxXcBu1IU2gqprrhOV6cpt8s1SkuB5RKNYAKeXsLyoKWSGLXIdstdOgup+cxzGL1fBGhiLfyQ==
X-Received: by 2002:a37:9202:: with SMTP id u2mr7129058qkd.454.1633042787361;
Thu, 30 Sep 2021 15:59:47 -0700 (PDT)
Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242])
by smtp.gmail.com with ESMTPSA id w7sm2468864qtc.29.2021.09.30.15.59.46
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Thu, 30 Sep 2021 15:59:47 -0700 (PDT)
From: Philip McGrath <philip@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 3/3] guix: node-build-system: Support compiling addons with
node-gyp.
Date: Thu, 30 Sep 2021 18:56:14 -0400
Message-Id: <20210930225611.2143194-4-philip@HIDDEN>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210930225611.2143194-1-philip@HIDDEN>
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>,
Maxime Devos <maximedevos@HIDDEN>,
Philip McGrath <philip@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 (/)
* gnu/packages/node.scm (node)[arguments]: Replace 'patch-npm-shebang
and 'patch-node-shebang with a new 'patch-nested-shebangs that also
handles node-gyp and other shebangs under "/lib/node_modules".
[inputs]: Add Python for node-gyp as "python-for-target".
(node-lts)[inputs]: Likewise.
* guix/build-system/node.scm (lower): Add optional #:python argument.
* guix/build/node-build-system.scm (set-node-gyp-paths): New
function. Sets the "npm_config_nodedir" and "npm_config_python"
environment variables.
(%standard-phases): Add 'set-node-gyp-paths after 'set-paths.
Co-authored-by: Pierre Langlois <pierre.langlois@HIDDEN>
---
gnu/packages/node.scm | 33 +++++++++++++++++---------------
guix/build-system/node.scm | 7 ++++++-
guix/build/node-build-system.scm | 9 +++++++++
3 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 6d9c3ccc71..805a4f18fc 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -244,21 +244,22 @@
python
(string-append python "3")))
"configure" flags))))
- (add-after 'patch-shebangs 'patch-npm-shebang
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((bindir (string-append (assoc-ref outputs "out")
- "/bin"))
- (npm (string-append bindir "/npm"))
- (target (readlink npm)))
- (with-directory-excursion bindir
- (patch-shebang target (list bindir))))))
- (add-after 'install 'patch-node-shebang
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((bindir (string-append (assoc-ref outputs "out")
- "/bin"))
- (npx (readlink (string-append bindir "/npx"))))
- (with-directory-excursion bindir
- (patch-shebang npx (list bindir)))))))))
+ (add-after 'patch-shebangs 'patch-nested-shebangs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((prefix (assoc-ref outputs "out"))
+ (path (map (lambda (dir)
+ (string-append dir "/bin"))
+ (list prefix
+ (assoc-ref inputs "python-for-target")))))
+ (with-directory-excursion (string-append prefix "/lib/node_modules")
+ (for-each
+ (lambda (file)
+ (patch-shebang file path))
+ (find-files "."
+ (lambda (file stat)
+ (and (eq? 'regular (stat:type stat))
+ (not (zero? (logand (stat:mode stat) #o100)))))
+ #:stat lstat)))))))))
(native-inputs
`(;; Runtime dependencies for binaries used as a bootstrap.
("c-ares" ,c-ares)
@@ -281,6 +282,7 @@
(inputs
`(("bash" ,bash-minimal)
("coreutils" ,coreutils)
+ ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3)
("c-ares" ,c-ares)
("http-parser" ,http-parser)
("icu4c" ,icu4c)
@@ -764,6 +766,7 @@ source files.")
(inputs
`(("bash" ,bash-minimal)
("coreutils" ,coreutils)
+ ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3)
("c-ares" ,c-ares)
("icu4c" ,icu4c-67)
("libuv" ,libuv-for-node)
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
index 98f63f87ef..3e49e67ff6 100644
--- a/guix/build-system/node.scm
+++ b/guix/build-system/node.scm
@@ -1,6 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Jelle Licht <jlicht@HIDDEN>
;;; Copyright © 2019 Timothy Sample <samplet@HIDDEN>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@HIDDEN>
+;;; Copyright © 2021 Philip McGrath <philip@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +26,7 @@
#:use-module (guix search-paths)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (ice-9 match)
#:export (%node-build-system-modules
node-build
@@ -44,11 +47,12 @@
(define* (lower name
#:key source inputs native-inputs outputs system target
(node (default-node))
+ (python (default-python)) ;; for node-gyp
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
(define private-keywords
- '(#:source #:target #:node #:inputs #:native-inputs))
+ '(#:source #:target #:node #:python #:inputs #:native-inputs))
(and (not target) ;XXX: no cross-compilation
(bag
@@ -62,6 +66,7 @@
;; Keep the standard inputs of 'gnu-build-system'.
,@(standard-packages)))
(build-inputs `(("node" ,node)
+ ("python" ,python)
,@native-inputs))
(outputs outputs)
(build node-build)
diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm
index 70a367618e..5e62eb4784 100644
--- a/guix/build/node-build-system.scm
+++ b/guix/build/node-build-system.scm
@@ -2,6 +2,8 @@
;;; Copyright © 2015 David Thompson <davet@HIDDEN>
;;; Copyright © 2016, 2020 Jelle Licht <jlicht@HIDDEN>
;;; Copyright © 2019, 2021 Timothy Sample <samplet@HIDDEN>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@HIDDEN>
+;;; Copyright © 2021 Philip McGrath <philip@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -46,6 +48,12 @@
(format #t "set HOME to ~s~%" (getenv "HOME")))))))
#t)
+(define* (set-node-gyp-paths #:key inputs #:allow-other-keys)
+ "Initialize environment variables needed for building native addons."
+ (setenv "npm_config_nodedir" (assoc-ref inputs "node"))
+ (setenv "npm_config_python" (assoc-ref inputs "python"))
+ #t)
+
(define (module-name module)
(let* ((package.json (string-append module "/package.json"))
(package-meta (call-with-input-file package.json read-json)))
@@ -144,6 +152,7 @@
(define %standard-phases
(modify-phases gnu:%standard-phases
+ (add-after 'set-paths 'set-node-gyp-paths set-node-gyp-paths)
(add-after 'unpack 'set-home set-home)
(add-before 'configure 'patch-dependencies patch-dependencies)
(replace 'configure configure)
--
2.30.2
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:59:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 30 18:59:20 2021
Received: from localhost ([127.0.0.1]:54290 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mW51M-0000dj-2e
for submit <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:59:20 -0400
Received: from mail-qk1-f178.google.com ([209.85.222.178]:46763)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mW51J-0000dV-2i
for 49946 <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:59:19 -0400
Received: by mail-qk1-f178.google.com with SMTP id b65so7419857qkc.13
for <49946 <at> debbugs.gnu.org>; Thu, 30 Sep 2021 15:59:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=xIIEemZ8YowYTB74cFaQaWT8OHrrgh5qRh247bCYlQQ=;
b=S4AYahNi1Mkr2s7IMLu0Q+K4wSKifgm9gRwtxUzCVVnOjCusdiAkMyGyoMmyK3c9hG
uzsXFRjiZUV0M50YrEXFykAX/p8v+gqoQDjkPLu3PO3SdCroiOR9Exk4jVIfIqyIDSt8
WEhEOz/LUSWYvHKfdXBlofKP5zSJ8TQfUWLO1JY6/0hRywwdWIcjKJdtMK84ag5wDidW
6lW8roz+uxAI/oNo/3Yb2gNpvtYIMZTNCGgX/rQqtxEw5CG8jyxjt4zm8/TWraAFR23F
kD4L3gZf8XF1+dvjCgFrmLXxzbWfeg6Fsgh6pyk0tm4DjSQrfeaBQ0ofLKZjVOncPPdB
TSxw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=xIIEemZ8YowYTB74cFaQaWT8OHrrgh5qRh247bCYlQQ=;
b=Fnc7IY5q/ReO40gjH40FetAFaiuSyHmghg5CsVZ2Oy4bd9rqC8CAxdXNDVDLT5Fah4
vvw4c8ueRMiatZdtwMDMu3TLLdZs6508rBAmMTy6XWZ2Wj40JFSkzvT1dXqs8KuVec+o
7Crm7wkBP0dABAtElEe0Gow5w8a6/gHhdsLRi+kd+Ow1Jq3Ph3PA/T5qpIJO1WEQV5qt
wnNLWCfPT+3gtG/jCHdoUeb+GmxufrxfpHlFxAQzqRtSlb9EIFSyK0ruZhQhjAhEgy+o
TLMzXHzMl1vJAimq1woVDHhccgD1ibVni7gdfOSOh/Fm6VZC/wN3Ttoo239zsdYAg8sC
QgMw==
X-Gm-Message-State: AOAM530oJ3YjrTQ5FweXUQGh58n286R49NqfdzPhFnE7mUq6teJyesPB
BdGUMY+8M751ZYeZY7ZH6AVa7Xef1D5QvJNf
X-Google-Smtp-Source: ABdhPJxSPlMM0IMi1Vk1ee7m7KFP9sj6JEcfGYtuEutP0l6QYEaTGrIwVwLnSQS9gvYkh5nS/3Y+zw==
X-Received: by 2002:a05:620a:554:: with SMTP id
o20mr6967338qko.30.1633042751489;
Thu, 30 Sep 2021 15:59:11 -0700 (PDT)
Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242])
by smtp.gmail.com with ESMTPSA id o5sm985933qkl.50.2021.09.30.15.59.11
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Thu, 30 Sep 2021 15:59:11 -0700 (PDT)
From: Philip McGrath <philip@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: node: Update to 10.24.1 for bootstrapping.
Date: Thu, 30 Sep 2021 18:56:12 -0400
Message-Id: <20210930225611.2143194-3-philip@HIDDEN>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210930225611.2143194-1-philip@HIDDEN>
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>,
Maxime Devos <maximedevos@HIDDEN>,
Philip McGrath <philip@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 (/)
* gnu/packages/node.scm (node): Update to 10.24.1.
---
gnu/packages/node.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 34c2bfa9d4..6d9c3ccc71 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -57,14 +57,14 @@
(define-public node
(package
(name "node")
- (version "10.24.0")
+ (version "10.24.1")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
- "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm"))
+ "032801kg24j04xmf09m0vxzlcz86sv21s24lv9l4cfv08k1c4byp"))
(modules '((guix build utils)))
(snippet
`(begin
--
2.30.2
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:59:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 30 18:59:01 2021
Received: from localhost ([127.0.0.1]:54286 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mW512-0000cp-Er
for submit <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:59:00 -0400
Received: from mail-qt1-f180.google.com ([209.85.160.180]:44009)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mW510-0000cb-7u
for 49946 <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:58:59 -0400
Received: by mail-qt1-f180.google.com with SMTP id a13so7290898qtw.10
for <49946 <at> debbugs.gnu.org>; Thu, 30 Sep 2021 15:58:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=MycQHhB6Tae9cF8f5+uyJE1zoQYz4DNSrnHhFvr65MM=;
b=VJfoDUPu1FCcpHKOLexzvMpa4/MPPWQPjwkVe3cVElLjosZqT4dymttirkgiUUdnSk
WyJZHJ/2nNPv3CL20A9P7kNsfZNR+5p8ALzcFlDoWQ/ydjiZo6HhyDovmePUAMLa0DVj
0ePjU7T/ohXYl4cfJ8wJlzFLtT6BMd1devyPLTdfZ9gR97kTKOesjlt1DdLDAZ6c9Ive
DXBxuz/He/OB7i4r5iVGLA8/PG/UAcYUv2JAv52/tjG6U5fFxPwPl5CbZTHNdvmLk3u6
NYQSulqb0TKKqcc127KYa4TQ43e+Ej1K2YKo0KkfY52q+5yr0DRUEVw+qZm3cGOlpuWM
lnPw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=MycQHhB6Tae9cF8f5+uyJE1zoQYz4DNSrnHhFvr65MM=;
b=ir0uwtsga0ZIQGJMBzQ7IwYfkLqfkFPtC2tWJMT6UcT3i6DsCfeKf+MC35WlPshEkM
LyTDRcLHQlhqHCQY2sLFtER07oN3afXVseYpmiyj2Pg8PtfBW4NNpAs1/6rx4r5OSPZL
ofbF/eArczKOs+8HvXbbXCNT1C1wriHlOVtUNVNZzxsCwz42mSfiDirdIQwpG8sFiod8
wKXEVLsUhw0Q6r+gG4QDsgU89mIQW8Fppap6fqoJKqG1LLQQ5QGxe5dDTQx6WH4elGdY
+0bH/2x4KNADz2UJXQuoWDimnEPM2SoNDVYHbGV4xkKkLicY3/Xl4SeifN4LSgeQrBQt
Ch3Q==
X-Gm-Message-State: AOAM53018PtxfUE/F1mui1dcsReIRubiUiymsdwkW39PrOArQF8C4o5Q
YyVig+bqoloNbrom5Fw4Z3aW8xg5Xf1fvM+f
X-Google-Smtp-Source: ABdhPJydDbz9Y/Iz9hMZbuyaDyxQx52UxsJaoRI6/sWGmsUz/QgrUZBnPUNYjuInn8TzjhFN6ovExA==
X-Received: by 2002:aed:2794:: with SMTP id a20mr9432174qtd.243.1633042732508;
Thu, 30 Sep 2021 15:58:52 -0700 (PDT)
Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242])
by smtp.gmail.com with ESMTPSA id z19sm2268817qts.96.2021.09.30.15.58.52
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Thu, 30 Sep 2021 15:58:52 -0700 (PDT)
From: Philip McGrath <philip@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: node: Avoid duplicating build phases.
Date: Thu, 30 Sep 2021 18:56:10 -0400
Message-Id: <20210930225611.2143194-2-philip@HIDDEN>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210930225611.2143194-1-philip@HIDDEN>
References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
<87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<20210930225611.2143194-1-philip@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.6 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>,
Maxime Devos <maximedevos@HIDDEN>,
Philip McGrath <philip@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.4 (/)
* gnu/packages/node.scm (node)[arguments]: Split 'patch-files phase
into 'patch-hardcoded-program-references and
'delete-problematic-tests. Adapt those phases and 'configure to work
unmodified on node-lts.
(node, node-lts)[inputs]: Use bash-minimal rather than bash.
(node-lts)[arguments]: Inherit 'patch-hardcoded-program-references,
'delete-problemating-tests, and 'configure phases from the bootstrap
node. Remove the 'patch-files phase, keeping its remaining
non-inherited work in a new 'replace-llhttp-sources phase.
---
gnu/packages/node.scm | 150 +++++++++++-------------------------------
1 file changed, 39 insertions(+), 111 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index f8ac95884c..34c2bfa9d4 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;; Copyright © 2020 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
+;;; Copyright © 2021 Philip McGrath <philip@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -105,14 +106,22 @@
#:test-target "test-ci-js"
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'patch-files
+ (add-before 'configure 'patch-hardcoded-program-references
(lambda* (#:key inputs #:allow-other-keys)
+
;; Fix hardcoded /bin/sh references.
- (substitute* '("lib/child_process.js"
- "lib/internal/v8_prof_polyfill.js"
- "test/parallel/test-child-process-spawnsync-shell.js"
- "test/parallel/test-stdio-closed.js"
- "test/sequential/test-child-process-emfile.js")
+ (substitute*
+ (let ((common
+ '("lib/child_process.js"
+ "lib/internal/v8_prof_polyfill.js"
+ "test/parallel/test-child-process-spawnsync-shell.js"
+ "test/parallel/test-stdio-closed.js"
+ "test/sequential/test-child-process-emfile.js"))
+ ;; not in bootstap node:
+ (sigxfsz "test/parallel/test-fs-write-sigxfsz.js"))
+ (if (file-exists? sigxfsz)
+ (cons sigxfsz common)
+ common))
(("'/bin/sh'")
(string-append "'" (assoc-ref inputs "bash") "/bin/sh'")))
@@ -122,18 +131,28 @@
"test/parallel/test-child-process-exec-env.js")
(("'/usr/bin/env'")
(string-append "'" (assoc-ref inputs "coreutils")
- "/bin/env'")))
+ "/bin/env'")))))
+ (add-after 'patch-hardcoded-program-references 'delete-problematic-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (delete-file-if-exists pth)
+ (when (file-exists? pth)
+ (delete-file pth)))
;; FIXME: These tests fail in the build container, but they don't
;; seem to be indicative of real problems in practice.
- (for-each delete-file
+ (for-each delete-file-if-exists
'("test/parallel/test-cluster-master-error.js"
"test/parallel/test-cluster-master-kill.js"
;; See also <https://github.com/nodejs/node/issues/25903>.
+ ;; (no longer exists in node-lts)
"test/sequential/test-performance.js"))
- ;; This requires a DNS resolver.
- (delete-file "test/parallel/test-dns.js")
+ ;; These require a DNS resolver.
+ (for-each delete-file-if-exists
+ '("test/parallel/test-dns.js"
+ ;; not in the bootstrap node:
+ "test/parallel/test-dns-lookupService-promises.js"))
+
;; FIXME: This test fails randomly:
;; https://github.com/nodejs/node/issues/31213
@@ -217,9 +236,13 @@
(setenv "CXX" ,(cxx-for-target))
(setenv "PKG_CONFIG" ,(pkg-config-for-target))
(apply invoke
- (string-append (assoc-ref (or native-inputs inputs)
- "python")
- "/bin/python")
+ (let ((python
+ (string-append (assoc-ref (or native-inputs inputs)
+ "python")
+ "/bin/python")))
+ (if (file-exists? python)
+ python
+ (string-append python "3")))
"configure" flags))))
(add-after 'patch-shebangs 'patch-npm-shebang
(lambda* (#:key outputs #:allow-other-keys)
@@ -256,7 +279,7 @@
(variable "NODE_PATH")
(files '("lib/node_modules")))))
(inputs
- `(("bash" ,bash)
+ `(("bash" ,bash-minimal)
("coreutils" ,coreutils)
("c-ares" ,c-ares)
("http-parser" ,http-parser)
@@ -711,103 +734,8 @@ source files.")
libuv "/lib:"
zlib "/lib"
"'],"))))))
- (replace 'configure
- ;; Node's configure script is actually a python script, so we can't
- ;; run it with bash.
- (lambda* (#:key outputs (configure-flags '()) native-inputs inputs
- #:allow-other-keys)
- (let* ((prefix (assoc-ref outputs "out"))
- (xflags ,(if (%current-target-system)
- `'("--cross-compiling"
- ,(string-append
- "--dest-cpu="
- (match (%current-target-system)
- ((? (cut string-prefix? "arm" <>))
- "arm")
- ((? (cut string-prefix? "aarch64" <>))
- "arm64")
- ((? (cut string-prefix? "i686" <>))
- "ia32")
- ((? (cut string-prefix? "x86_64" <>))
- "x64")
- ((? (cut string-prefix? "powerpc64" <>))
- "ppc64")
- (_ "unsupported"))))
- ''()))
- (flags (cons
- (string-append "--prefix=" prefix)
- (append xflags configure-flags))))
- (format #t "build directory: ~s~%" (getcwd))
- (format #t "configure flags: ~s~%" flags)
- ;; Node's configure script expects the CC environment variable to
- ;; be set.
- (setenv "CC_host" "gcc")
- (setenv "CXX_host" "g++")
- (setenv "CC" ,(cc-for-target))
- (setenv "CXX" ,(cxx-for-target))
- (setenv "PKG_CONFIG" ,(pkg-config-for-target))
- (apply invoke
- (string-append (assoc-ref (or native-inputs inputs)
- "python")
- "/bin/python3")
- "configure" flags))))
- (replace 'patch-files
+ (add-after 'delete-problematic-tests 'replace-llhttp-sources
(lambda* (#:key inputs #:allow-other-keys)
- ;; Fix hardcoded /bin/sh references.
- (substitute* '("lib/child_process.js"
- "lib/internal/v8_prof_polyfill.js"
- "test/parallel/test-child-process-spawnsync-shell.js"
- "test/parallel/test-fs-write-sigxfsz.js"
- "test/parallel/test-stdio-closed.js"
- "test/sequential/test-child-process-emfile.js")
- (("'/bin/sh'")
- (string-append "'" (assoc-ref inputs "bash") "/bin/sh'")))
-
- ;; Fix hardcoded /usr/bin/env references.
- (substitute* '("test/parallel/test-child-process-default-options.js"
- "test/parallel/test-child-process-env.js"
- "test/parallel/test-child-process-exec-env.js")
- (("'/usr/bin/env'")
- (string-append "'" (assoc-ref inputs "coreutils")
- "/bin/env'")))
-
- ;; FIXME: These tests fail in the build container, but they don't
- ;; seem to be indicative of real problems in practice.
- (for-each delete-file
- '("test/parallel/test-cluster-master-error.js"
- "test/parallel/test-cluster-master-kill.js"))
-
- ;; These require a DNS resolver.
- (for-each delete-file
- '("test/parallel/test-dns.js"
- "test/parallel/test-dns-lookupService-promises.js"))
-
- ;; FIXME: This test fails randomly:
- ;; https://github.com/nodejs/node/issues/31213
- (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js")
-
- ;; FIXME: These tests fail on armhf-linux:
- ;; https://github.com/nodejs/node/issues/31970
- ,@(if (target-arm32?)
- '((for-each delete-file
- '("test/parallel/test-zlib.js"
- "test/parallel/test-zlib-brotli.js"
- "test/parallel/test-zlib-brotli-flush.js"
- "test/parallel/test-zlib-brotli-from-brotli.js"
- "test/parallel/test-zlib-brotli-from-string.js"
- "test/parallel/test-zlib-convenience-methods.js"
- "test/parallel/test-zlib-random-byte-pipes.js"
- "test/parallel/test-zlib-write-after-flush.js")))
- '())
-
- ;; These tests have an expiry date: they depend on the validity of
- ;; TLS certificates that are bundled with the source. We want this
- ;; package to be reproducible forever, so remove those.
- ;; TODO: Regenerate certs instead.
- (for-each delete-file
- '("test/parallel/test-tls-passphrase.js"
- "test/parallel/test-tls-server-verify.js"))
-
;; Replace pre-generated llhttp sources
(let ((llhttp (assoc-ref inputs "llhttp")))
(copy-file (string-append llhttp "/src/llhttp.c")
@@ -834,7 +762,7 @@ source files.")
("python" ,python)
("util-linux" ,util-linux)))
(inputs
- `(("bash" ,bash)
+ `(("bash" ,bash-minimal)
("coreutils" ,coreutils)
("c-ares" ,c-ares)
("icu4c" ,icu4c-67)
--
2.30.2
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:57:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 30 18:57:51 2021 Received: from localhost ([127.0.0.1]:54282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mW4zv-0000az-4B for submit <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:57:51 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:37763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1mW4zs-0000al-Of for 49946 <at> debbugs.gnu.org; Thu, 30 Sep 2021 18:57:49 -0400 Received: by mail-qv1-f49.google.com with SMTP id o15so4588588qvq.4 for <49946 <at> debbugs.gnu.org>; Thu, 30 Sep 2021 15:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PQGTRAqMVGHU0aiOq2VcNYA2rsuCKasKWH5V7qeoyq8=; b=FuyNmJjJagA1edanADCbl4LYW9KrCgAYZmCo9kbVr1TdZGcQ0VOuiiQJYXAXeS+P+q XrfqgtTbxXqS32zVzmwamcrGB/NpKqz/IGc/nCivuCbcm2qnNau1sk8Yw8rms1boULjs LayHep10fMlKDokYNjEVANrKFvoX0H87AZI44u8CGe0uljXjgstg4fTOiGyigJm9oR90 m+h7hUOJEpsxZZQrmY5IjbI6g8AOCg3FIg/IMLBC9Vg9lMzM6++OelExiWJPggICslzn NxyuWNLyuER3dmKCCvjGlvK1tCB5CdxKQWdAE2beLtrR5oWOdtowrYcBV4b2xQWL8TRL biNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PQGTRAqMVGHU0aiOq2VcNYA2rsuCKasKWH5V7qeoyq8=; b=NWrerTiY6Ii/cIH4497Gz0oJu2NG7OdsqXk6EGhWMwDhQlUDOEXb2KNdH/8FHGV95e d9874TWZLfgyR1ImrqDr9OzzdkBXLP59n6MIkmddNX/u7xRS7Fc9I8AvKfHPRA/TQHlM 8hMC9YjkzgL5h8C7nYBHls6tP9JUt8XsoPKjNsKyFhQ4Go26554Ss+0HQVeDh0Opkct9 aIQM3XKe7jog6pZO2ABkaqcmckOTkrsHA9E+axGCCe2crFLK/gfKsVD2WUkhYAhTJcv6 7VKs2xZXj+MQhjzbHbK/vlVMC9dCoQN1EYbc6vQkfc1T81uptH1iSHDyXBmB1oFQXSgW BCVw== X-Gm-Message-State: AOAM530SF9JUJoG2HmZ6iLp4BwnPZ2UJ9ZzVvzDjVcODMWEEfWrzaETw xh26sE/pOF3TZSmU+cW6bjgEKyVB7ZXz9Slf X-Google-Smtp-Source: ABdhPJyJAl7gaQw0swzz3cvrZB4LAZjZQSvgded7AoJw6mkwlxf+Ac9JAmUAYo/DlLvmAktS7b7SFA== X-Received: by 2002:ad4:5664:: with SMTP id bm4mr7781367qvb.53.1633042662908; Thu, 30 Sep 2021 15:57:42 -0700 (PDT) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id g1sm2088327qkd.89.2021.09.30.15.57.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Sep 2021 15:57:42 -0700 (PDT) From: Philip McGrath <philip@HIDDEN> To: 49946 <at> debbugs.gnu.org Subject: [PATCH 0/3] guix: node-build-system: Support compiling addons with node-gyp. Date: Thu, 30 Sep 2021 18:56:08 -0400 Message-Id: <20210930225611.2143194-1-philip@HIDDEN> X-Mailer: git-send-email 2.30.2 In-Reply-To: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN> References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN> <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-8-pierre.langlois@HIDDEN> <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN> <b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN> <87o88gq5p5.fsf@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 49946 Cc: Pierre Langlois <pierre.langlois@HIDDEN>, Maxime Devos <maximedevos@HIDDEN>, Philip McGrath <philip@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 (/) Hi, I've reworked the part of the patch series dealing with node-gyp. I'd like to find an NPM addon package to submit as part of this series, too, basically as a test case. If I can find one that doesn't raise too many other complications, I may send this in as a separate patch, but feel free to try it with tree-sitter, too. There are a few things I'm still not sure about. I haven't made node-build-system add libuv as an implicit input, because I think some node-gyp addons don't actually need libuv, but maybe it's common enough that it should be done automatically. Likewise, I haven't tried to change the issue of `node` referring to `node-bootstrap`, but I still think it should be changed. These patches are also on GitLab at <https://gitlab.com/philip1/guix-patches/-/tree/wip-node-npm-gyp>. Improvements welcome! -Philip Philip McGrath (3): gnu: node: Avoid duplicating build phases. gnu: node: Update to 10.24.1 for bootstrapping. guix: node-build-system: Support compiling addons with node-gyp. gnu/packages/node.scm | 187 ++++++++++--------------------- guix/build-system/node.scm | 7 +- guix/build/node-build-system.scm | 9 ++ 3 files changed, 74 insertions(+), 129 deletions(-) -- 2.30.2
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Sep 2021 06:31:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 29 02:31:59 2021
Received: from localhost ([127.0.0.1]:47587 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mVT8I-0005rx-OK
for submit <at> debbugs.gnu.org; Wed, 29 Sep 2021 02:31:58 -0400
Received: from mail-qt1-f181.google.com ([209.85.160.181]:43614)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mVT8D-0005rh-Ob
for 49946 <at> debbugs.gnu.org; Wed, 29 Sep 2021 02:31:57 -0400
Received: by mail-qt1-f181.google.com with SMTP id a13so1339405qtw.10
for <49946 <at> debbugs.gnu.org>; Tue, 28 Sep 2021 23:31:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=subject:to:cc:references:from:message-id:date:user-agent
:mime-version:in-reply-to:content-language:content-transfer-encoding;
bh=ku9uFVHqwjxGYefU7RwD4aGD8sroVoeATwxZs4xZqp8=;
b=Ku5gLNiWunOxN7eES5Cv/OrBAQv8YFGCyI417ireHsVnBKSJ92oPp0zWOcQ7eKHORF
FEYYY4Syl9ma7oW8NZZOzFlwJRSHsAQ2p9LIBXHEElDmcAu0pVOHzv39hVlDkDR7AclE
b0dUNI5gR8iKiLmdyvzpb+EIb/cVhtMQ12vYvrIeOopY7DYyw2SOYn7U0RhHZU5ZUUaN
Mdf5HPLA8HyTFrz+osJ3p40dJ1G7rljl8ucSdlToheALbkfFzHqKqZz9jYQx+c7DR+pe
3cDnppziB9igrgOg6ekp1QqnGFJIqTs80b2zG+lS5O6SxHsF13uksnKYq60UVt3Ka36Q
+w1w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:subject:to:cc:references:from:message-id:date
:user-agent:mime-version:in-reply-to:content-language
:content-transfer-encoding;
bh=ku9uFVHqwjxGYefU7RwD4aGD8sroVoeATwxZs4xZqp8=;
b=LRulh3TOB37RQNJ9H34e5yvUHZjw03C717NmtMymuTqEEMwIcNOpV6Wi7qzEYy46jc
709usCjVeTXMM9pawzYDpnYXjmJlXn7yJONSwWF3hVdy4oN8cXyIg88ZTU5VPfiLE3PK
JNc93SBB21FRGfgM0dcu1WhCErImZpRhIt4NEfnw6bxHrNIOIbBOQjQZXm1cao9olkMR
7Hx3hJIkdOZ6Ca0qTYxpNNmrSxod4IsLPCgc0S8nfZYl+W7DImyn775bxcCKnZt1U0fq
o6kwl35Csl8kSZj417iYFJ8QRRCAr/wQw7lXxTAS3SSiAvMx5eSZAkVlNF+kUQl5Nm0g
kutQ==
X-Gm-Message-State: AOAM532irIpT37kGKlvOhBE0jJjxymk8WWp+2wmYzUl8OSX3DlA9SssV
aKIATCccVkLS5nCDoLVrQUHgUnQFxSwdO1gM
X-Google-Smtp-Source: ABdhPJxXLBmHdS2/QcAlk8K2BgPfVThdTn/wb7C9KzINtuIChUYUMUdIy+oKoAdpB2BZFSsd7WQlyg==
X-Received: by 2002:ac8:1e0e:: with SMTP id n14mr9917577qtl.95.1632897108058;
Tue, 28 Sep 2021 23:31:48 -0700 (PDT)
Received: from [192.168.45.37] (c-73-125-89-242.hsd1.fl.comcast.net.
[73.125.89.242])
by smtp.gmail.com with ESMTPSA id d13sm1046272qtm.32.2021.09.28.23.31.47
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Tue, 28 Sep 2021 23:31:47 -0700 (PDT)
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
To: Pierre Langlois <pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
From: Philip McGrath <philip@HIDDEN>
Message-ID: <682f2ed3-90bd-a9f8-1193-34bef399ca62@HIDDEN>
Date: Wed, 29 Sep 2021 02:31:46 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <87o88gq5p5.fsf@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.1 (/)
X-Debbugs-Envelope-To: 49946
Cc: 49946 <at> debbugs.gnu.org, Maxime Devos <maximedevos@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.4 (/)
On 9/25/21 6:24 AM, Pierre Langlois wrote:
> For instance, while working on a newer version of one of the packages in
> this series, I saw we may need to patch GYP's python reference as well,
> like so:
>
> (substitute* "deps/npm/node_modules/node-gyp/gyp/gyp_main.py"
> (("#!/usr/bin/env python")
> (string-append "#!" (assoc-ref inputs "python") "/bin/python3")))
>
> Only for node 14+. The reason seems to be that gyp still refers to
> "python", but python2 is no longer a dependency for newer nodes. And it
> seems GYP is perfectly happy with python3, and the shebang is fixed
> upstream so a never node will be fine:
> https://github.com/nodejs/node-gyp/pull/2355/files
I think this needs to be a `python` from `inputs` rather than
`native-inputs`, for cross-compilation, IIUC.
I tried building node 14.18.0, and it ran into other issues, but there
were still a number shebangs with `python` rather than `python3` in
various places, though I think they'd be fine with `python-wrapper`.
-Philip
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Sep 2021 04:46:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 29 00:46:09 2021
Received: from localhost ([127.0.0.1]:47510 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mVRTs-00034z-QO
for submit <at> debbugs.gnu.org; Wed, 29 Sep 2021 00:46:09 -0400
Received: from mail-qt1-f178.google.com ([209.85.160.178]:37392)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mVRTn-00034L-Ui
for 49946 <at> debbugs.gnu.org; Wed, 29 Sep 2021 00:46:07 -0400
Received: by mail-qt1-f178.google.com with SMTP id e16so1202388qts.4
for <49946 <at> debbugs.gnu.org>; Tue, 28 Sep 2021 21:46:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=subject:to:cc:references:from:message-id:date:user-agent
:mime-version:in-reply-to:content-language:content-transfer-encoding;
bh=dz7TmOqo0Jydswh5JOONQTDW8s0VcE0iI7U/UTgkpcc=;
b=HJjO7p7NuetueWLPDxH23jKSpl3cfLMsP+b/shIUC7uwjkC+d8KxVFkAkxwEj+9jU2
JurVHtTG/GKtWp5ZEYbqgDSvO+fVEAslRS5dE3gJYnCej+9U8I4UgeHy7gUoODG+b6k5
on9uLRGUMv+SlljAgNM7HvROlpembswf20vi2hMl1Ww3NR3gOgR6YgBHpSE9XeGOlkl1
HgTcBa96l9EvpoVZ72oUBHNioeokXXgv47Nt/xzjnY4mTRt5QFZmYKpCdu+L5k6IDM3x
reIzJl4gS1toowzrsIUe/SEyg2txfwWol87WABh6wW8Re9zvCSYBXv5GCwEbCio7alqO
OsDQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:subject:to:cc:references:from:message-id:date
:user-agent:mime-version:in-reply-to:content-language
:content-transfer-encoding;
bh=dz7TmOqo0Jydswh5JOONQTDW8s0VcE0iI7U/UTgkpcc=;
b=zwNnpHihwKJ/cHbj8rgHkRkgIQDAAf+qXTkIuAV+wodTl3mXlL4BqQhEaVG+0OqIqk
9tEZPyEkuLQ2eef7pXdeLLhUeO0ecD4H+tTShn+4ecPOqndbyEdoi2tXxKnnX2FbYFF2
Xa5ddBt/khlDHzRqPJoS/O9wjNYAHn39Yt2topmoKrp4QgsPBAsum3efqWC8YdKhkTi8
7SaingIZ/aw2M3lHgrsh06Ekj7t+QEaTo1KSlo0aynX1R6g3Evz2S8qSmAh2gl5OSyJh
npX/91r5fbLH/9OrLYKu1qbWoVH0nw96KqPCDE68tSbyIjBLCjG6intOIDEv2lmzVYyk
3vCw==
X-Gm-Message-State: AOAM530ueNKdrMbzTdsNNTVlA0ouiFJ2gtjfKOnF0FrshSIYRfbK6UfZ
h9hW8InZm1PRooMGFl/R7t5Pf9iHSGHYrRMJ
X-Google-Smtp-Source: ABdhPJy1lHIepGnupxyVzNAKhAAtWrWbOY51GZKL9mNNyOYpv0schjOSW5SWmotg0NjGo0ESsjljXw==
X-Received: by 2002:a05:622a:4d1:: with SMTP id
q17mr9610031qtx.64.1632890758049;
Tue, 28 Sep 2021 21:45:58 -0700 (PDT)
Received: from [192.168.45.37] (c-73-125-89-242.hsd1.fl.comcast.net.
[73.125.89.242])
by smtp.gmail.com with ESMTPSA id z10sm956287qtv.6.2021.09.28.21.45.57
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Tue, 28 Sep 2021 21:45:57 -0700 (PDT)
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
To: Maxime Devos <maximedevos@HIDDEN>,
Pierre Langlois <pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<e2aec7f8-5930-367a-2cd2-b9dddc352fa3@HIDDEN>
<592a9a571437c4c053ceeb27ed0512deeb0667c6.camel@HIDDEN>
From: Philip McGrath <philip@HIDDEN>
Message-ID: <ac0288a7-fdc2-e43f-40ce-c778b6a474d4@HIDDEN>
Date: Wed, 29 Sep 2021 00:45:56 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <592a9a571437c4c053ceeb27ed0512deeb0667c6.camel@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.6 (/)
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: -0.4 (/)
On 9/27/21 6:11 AM, Maxime Devos wrote:
> Philip McGrath schreef op zo 26-09-2021 om 18:02 [-0400]:
>> Looking at `gnu-build-system`, it seems that the `'patch-shebangs` phase
>> only operates on files installed in the "/bin" and "/sbin"
>> subdirectories of the package's outputs. That restriction doesn't make
>> sense to me in general: for instance, what about "/libexec"?
>
> 'libexec' is included on core-updates{,-frozen}. I believe the idea of the
> restriction is to avoid patching too much. E.g., "autoconf" has a file
> share/autoconf/build-aux/config.guess with a #!/bin/sh shebang. It should
> not be patched, otherwise tarballs created with "make dist" would include
> a store path and hence be Guix-specific and architecture-specific.
That makes some sense. I would have thought checking that the file is
executable would catch most such cases, but, if this works for
`gnu-build-system`, great.
As I look at potentially making a patch, another thing that seems odd is
that `(gnu packages node)` exports node@HIDDEN as `node` (via
`define-public`), but node@HIDDEN as `node-lts`. Normally, if I saw
that there were packages `node` and `node-lts`, I'd assume that
`node-lts` was *older*. It's especially confusing because, at the
command line, `guix install node` refers to what in Scheme you have to
write as `node-lts`.
I wonder if it was a mistake, and should have used `define` rather than
`define-public`, since this code:
```
;; This should be the latest version of node that still builds without
;; depending on llhttp.
(define-public node-bootstrap
(hidden-package node))
```
seems to be trying to hide the older node.
It looks like `node` has only a few dependents, and it seems like at
least several of them only used it because it had the more obvious name.
The `node-build-system` uses `node-lts` as the `(default-node)`.
Would it make sense to change the names? Or just to remove the
`define-public` of `node`?
-Philip
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 27 Sep 2021 10:11:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 27 06:11:39 2021
Received: from localhost ([127.0.0.1]:39707 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mUnbn-0003NZ-89
for submit <at> debbugs.gnu.org; Mon, 27 Sep 2021 06:11:39 -0400
Received: from michel.telenet-ops.be ([195.130.137.88]:48166)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1mUnbj-0003NN-Km
for 49946 <at> debbugs.gnu.org; Mon, 27 Sep 2021 06:11:37 -0400
Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d])
by michel.telenet-ops.be with bizsmtp
id yyBa250010mfAB406yBaE7; Mon, 27 Sep 2021 12:11:34 +0200
Message-ID: <592a9a571437c4c053ceeb27ed0512deeb0667c6.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
From: Maxime Devos <maximedevos@HIDDEN>
To: Philip McGrath <philip@HIDDEN>, Pierre Langlois
<pierre.langlois@HIDDEN>
Date: Mon, 27 Sep 2021 12:11:21 +0200
In-Reply-To: <e2aec7f8-5930-367a-2cd2-b9dddc352fa3@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
<e2aec7f8-5930-367a-2cd2-b9dddc352fa3@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-bvtN8DPisETGa2NUpvgN"
User-Agent: Evolution 3.34.2
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21;
t=1632737494; bh=1I5ya+Vr1Yili0oqaTIGujgzeU6AxLQ/VOc/9IluUuE=;
h=Subject:From:To:Cc:Date:In-Reply-To:References;
b=ezj7ZOn8y07Mta+D7hezhSNwyoIOrq7LJuYrPrmK6L8doFfRkneCKCUmtx7/iN0TB
TRpRNqgGoYbfpRXYO6afs+SH30Y44cWm0r51YVUfNHmDstf21ucUTuty54iHwvLu06
ltQnGWqoCVIm3aB5m0jFpMbSeQ/pE0+mKNQAb4oVDMUt/cMZgxZ6prcJ6Y/36XXsTT
k1FCzThqNWfMf2gdtXYWSuY9gU/g6DAMy4k8k7Ij6IGngJKOAjdyR5FCoSCyoiAoR8
zm/RvUwbcRgFUIZgMqdg51rvKHx32NWr4fB01XLbNBHhAUcuSw35SuzJyUP3LTBQf2
MA9UyUORLe7cg==
X-Spam-Score: -0.7 (/)
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.7 (-)
--=-bvtN8DPisETGa2NUpvgN
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Philip McGrath schreef op zo 26-09-2021 om 18:02 [-0400]:
> Looking at `gnu-build-system`, it seems that the `'patch-shebangs` phase=
=20
> only operates on files installed in the "/bin" and "/sbin"=20
> subdirectories of the package's outputs. That restriction doesn't make=
=20
> sense to me in general: for instance, what about "/libexec"?
'libexec' is included on core-updates{,-frozen}. I believe the idea of the
restriction is to avoid patching too much. E.g., "autoconf" has a file
share/autoconf/build-aux/config.guess with a #!/bin/sh shebang. It should
not be patched, otherwise tarballs created with "make dist" would include
a store path and hence be Guix-specific and architecture-specific.
Greetings,
Maxime.
--=-bvtN8DPisETGa2NUpvgN
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+4iGRcl7gUCYVGYyRccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7s12AQD9RgeUKLsp/NrdpynQ5KtLzf0d
a1QqfgnU6s2rGOREIAD/SHKNqg5x/YfmpJfybEGqoFkKoZQtpzZdNBi2pOOgOQ4=
=JNjt
-----END PGP SIGNATURE-----
--=-bvtN8DPisETGa2NUpvgN--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 26 Sep 2021 22:02:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 26 18:02:56 2021
Received: from localhost ([127.0.0.1]:38927 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mUcEa-0004UH-7Z
for submit <at> debbugs.gnu.org; Sun, 26 Sep 2021 18:02:56 -0400
Received: from mail-qk1-f171.google.com ([209.85.222.171]:33669)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mUcEY-0004U4-Cl
for 49946 <at> debbugs.gnu.org; Sun, 26 Sep 2021 18:02:55 -0400
Received: by mail-qk1-f171.google.com with SMTP id d207so35052735qkg.0
for <49946 <at> debbugs.gnu.org>; Sun, 26 Sep 2021 15:02:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=subject:to:cc:references:from:message-id:date:user-agent
:mime-version:in-reply-to:content-language:content-transfer-encoding;
bh=QjLw4Mn90chDV10lYjLz2lOQVsQu0l/I9vkZk8FXYwc=;
b=Ox1HjIJeRKq8qAQAA/Cz2cBrPq4zJ5LDoBBPhUes+YozhS7u6UK47Vnks4YIVXfLHB
wn5nnhn+Gb57bvkUTvWnp+nzt65gWGQd4VHZFBB7+7O3+k2CbJa09I8XfKpEQAgc4p9E
0776V7jzfJJfq8pvap76+zSV9OH6ZEJ+hOBfywRRdVuWuJySaQDxlO7erqg4lKWGPVON
Hf0AYJHsbwIbZj20H1I3ICp6XU4HCYOIUJiHUeIsBHqQABIHAya8NIRRLtwDUnVLE1yX
MHMpVFamNE1WIHp/lzDReFTrtuGy5xSBU0Br5XqfdrrNx+XV78kn/7oFxlYSXRF1q1au
hF8A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:subject:to:cc:references:from:message-id:date
:user-agent:mime-version:in-reply-to:content-language
:content-transfer-encoding;
bh=QjLw4Mn90chDV10lYjLz2lOQVsQu0l/I9vkZk8FXYwc=;
b=BXTtoA7oj8YEZU2uRKOV88boJeQUUkoYqYHeQDe8OMuuMRboZYHEx/e/YtZaVd1Gsv
UWC+Dqux+E9Z/Avr6xqOAdJ6PJee3m4ZlS7I1T3maO/lmJZCplU06NvGN75X46rEY/BA
F+DD/WCSQ45DtO7PdWe1VABKTrO9VQt4sg4gqZOZ3MyXyOfuL8Tb/NX1rN3SbVSoJuSw
EeVrtvbIShqtGzsao17ntx2ay97fs5OEgpNX2snweJ+6Gdj2mpUgyZFnd1ljy6YaPCN2
ydC0jFXo8gpiiKX06xTaDQaJKqePrPRZjhaH1RsWawlmI9ltO6v2BLMrzykkyYudMfRv
il7A==
X-Gm-Message-State: AOAM531c6mpwwrCV6a5q1lKjTFwWq0PypgK2SBAqmQtbZAvsn0Shdqdi
mvNIgfUMlUkQy+Nhfk0rK0xvtj1t1dOWq9ZS
X-Google-Smtp-Source: ABdhPJyy+0EyoMXraDZXdutiYuQeHCjROva80csaHoGC59/5rNIk+lMfKaJgt3n9GDxAsDSK3P5hdQ==
X-Received: by 2002:ae9:ed45:: with SMTP id c66mr21729605qkg.336.1632693768505;
Sun, 26 Sep 2021 15:02:48 -0700 (PDT)
Received: from [192.168.45.37] (c-73-125-89-242.hsd1.fl.comcast.net.
[73.125.89.242])
by smtp.gmail.com with ESMTPSA id w7sm317578qtc.29.2021.09.26.15.02.47
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Sun, 26 Sep 2021 15:02:48 -0700 (PDT)
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
To: Pierre Langlois <pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
<87o88gq5p5.fsf@HIDDEN>
From: Philip McGrath <philip@HIDDEN>
Message-ID: <e2aec7f8-5930-367a-2cd2-b9dddc352fa3@HIDDEN>
Date: Sun, 26 Sep 2021 18:02:47 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <87o88gq5p5.fsf@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.6 (/)
X-Debbugs-Envelope-To: 49946
Cc: 49946 <at> debbugs.gnu.org, Maxime Devos <maximedevos@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.4 (/)
Hi Pierre,
On 9/25/21 6:24 AM, Pierre Langlois wrote:
> Philip McGrath <philip@HIDDEN> writes:
>> Since the shebang line for node-gyp is specifically "#!/usr/bin/env node", I
>> wonder if it should use the node built by this package, rather than a dynamic
>> node.
>
> Yeah we could do that, although I generally prefer to follow whatever
> the script already does, there could be a good reason for them to use
> `env' no
I think it might be better to use `patch-shebang` from `(guix build
utils)` rather than `substitute*` these by hand, and it seems that
`patch-shebang` removed the indirection through `env`. My guess is most
of these cases are to accommodate the fact that `node` and `python` are
often installed to places other than `/usr/bin`.
>> I'd guess node-gyp may not be the only one with shebangs that ought to
>> be patched.
>
> Yeah there could be others, although normally the patching phase from
> the gnu build system should have taken care of most of them, hopefully
> all, I'm not sure why it didn't work for /usr/bin/env though.
>
> I would suggest we patch things as we encounter them, did you find
> anymore issues when working on your package?
Looking at `gnu-build-system`, it seems that the `'patch-shebangs` phase
only operates on files installed in the "/bin" and "/sbin"
subdirectories of the package's outputs. That restriction doesn't make
sense to me in general: for instance, what about "/libexec"? For Node
specifically, this misses a lot of stuff under "/lib/node_modules" and
"/lib/node_modules/npm/node_modules". I think I more general fix could
subsume the `'patch-npm-shebang` and `'patch-node-shebang` phases in
building Node, too.
> For instance, while working on a newer version of one of the packages in
> this series, I saw we may need to patch GYP's python reference as well,
> like so:
>
> (substitute* "deps/npm/node_modules/node-gyp/gyp/gyp_main.py"
> (("#!/usr/bin/env python")
> (string-append "#!" (assoc-ref inputs "python") "/bin/python3")))
>
> Only for node 14+. The reason seems to be that gyp still refers to
> "python", but python2 is no longer a dependency for newer nodes. And it
> seems GYP is perfectly happy with python3, and the shebang is fixed
> upstream so a never node will be fine:
> https://github.com/nodejs/node-gyp/pull/2355/files
I think in some places (but perhaps not enough places) Guix uses
`python-wrapper` to work around this ...
>
> Maybe updating node would be better than this fix though.
I'm not totally clear on whether the upstream fix is in 14.17.6 LTS,
but, if so, that seems great!
>
>> More generally, I see that there are 355 directories installed under
>> "lib/node_modules/npm/node_modules" (which corresponds to the "deps"
>> path above). Most of them don't seem to be available as Guix packages that could
>> be depended upon by other Guix node packages.
>
> Yeah that's tricky, ideally we should remove all the node_modules deps
> and package them separately, I wonder if anybody tried to do that
> already. I would suspect it to be quite a lot of work, sometimes
> unbundling stops being worth and when it's hard to maintain dependencies
> manually.
>
> Hopefully we can get there one day though! I don't want to deter anybody
> from trying :-), I might give it a go on a raindy day.
Since these are developed and released with Node, and apparently we can
build them as part of the Node build process, I was thinking we could
just make packages that point to these versions we're already building.
It might be good to hear from someone who develops with node/npm, though
... I just use it to install software that I can't find packaged elsewhere.
>
>> On 8/8/21 6:29 PM, Pierre Langlois wrote:
>>
>>> ... `node-gyp' needs
>>
>>> node headers to compile against, packaged as a tarball, which it tries
>>
>>> to download. Instead, we can run a `node-gyp --tarball <> configure'
>>
>>> step to manually provide the tarball, which we can package separately
>>
>>> for any given node version.
>>
>> There is also a --nodedir option, which I found could work with something like:
>>
>> (string-append "--nodedir=" (assoc-ref inputs "node"))
>>
>> That seems like it might be better, though I don't know all the considerations
>> for cross-compilation and such.
>
> Oh that's a good idea, I didn't really like having to download the
> headers separately from the main package, especially given we run
> snippet on the source to remove bundled dependencies.
>
> Trying this out this approach does work, but I needed to:
>
> - Create a union directory with both node and libuv. The node package
> only has headers for V8/node, but we also need libuv, so doing
> something like this works:
>
> (union-build node-sources
> (list (assoc-ref inputs "node")
> (assoc-ref inputs "libuv"))
> #:create-all-directories? #t
> #:log-port (%make-void-port "w"))
I found it worked to just add libuv as an input of packages built with
node-gyp. I hadn't tried to change `node-build-system`, but I think that
would be the place to do it.
>
> - For some reason, --nodedir didn't really "configure" gyp to use that
> node directory, I think it's meant to be passed everytime you run
> any gyp command. Instead I found that you can use and environment
> variable:
>
> (setenv "npm_config_nodedir" node-sources)
That seems right. I believe there's a similar "npm_config_python" for
the Python executable to use.
Alternatively, I think it's possible to configure these in
$PREFIX/etc/npmrc: <https://docs.npmjs.com/cli/v7/configuring-npm/npmrc>
>
> And that works for the packages in this series! That'll be much better
> than before, I'll do it this way.
>
> Thanks again for taking a look, I'll see if I can send updated patches
> sometimes this weekend.
Glad it was useful!
For patching the shebangs, here's a variant of node-lts that worked for
me, though I think it would be even better to combine it with the
existing phases:
```
(define-public patched-node
(let ((node node-lts))
(package
(inherit node)
(arguments
(substitute-keyword-arguments (package-arguments node)
((#:phases standard-phases)
`(modify-phases ,standard-phases
(add-after 'patch-npm-shebang 'patch-more-shebangs
(lambda* (#:key inputs outputs #:allow-other-keys)
(define (append-map f lst)
(apply append (map f lst)))
;; from patch-shebangs
(define bin-directories
;;(match-lambda
;; ((_ . dir)
(lambda (pr)
(let ((dir (cdr pr)))
(list (string-append dir "/bin")
(string-append dir "/sbin")))))
(define output-bindirs
(append-map bin-directories outputs))
(define input-bindirs
;; Shebangs should refer to binaries of the target
system---i.e., from
;; "inputs", not from "native-inputs".
(append-map bin-directories inputs))
(define path
(append output-bindirs input-bindirs))
(with-directory-excursion
(string-append (assoc-ref outputs "out")
"/lib/node_modules/npm/node_modules")
(for-each
;;(cut patch-shebang <> path)
(lambda (file)
(patch-shebang file path))
;; from patch-generated-file-shebangs
(find-files "."
(lambda (file stat)
(and (eq? 'regular (stat:type stat))
(not (zero? (logand (stat:mode
stat) #o100)))))
#:stat lstat))))))))))))
```
-Philip
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 25 Sep 2021 11:02:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 25 07:02:13 2021
Received: from localhost ([127.0.0.1]:60348 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mU5Rd-0006lc-G0
for submit <at> debbugs.gnu.org; Sat, 25 Sep 2021 07:02:13 -0400
Received: from mout.gmx.net ([212.227.17.21]:48515)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mU5Ra-0006lL-R8
for 49946 <at> debbugs.gnu.org; Sat, 25 Sep 2021 07:02:12 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1632567723;
bh=JrIJ3qUk/I5yAQTu+2SuKyleh0EM9VAMmJlzlyJ+mTE=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=dKW0kwObKXsc1SjStvKopWSHCWDheNeyjSWAikQgmEZCfUEWSFNyJukGZcRT4gftI
62738ktZ4s61kBRvL3zpZ65avhp39Jm3G5jWHpcqGhTBbs380+Xs8a9CaQ5RmEs4S7
AujaYJhCUKf+xJCG76Ur+WLqpOTFRopOWyYREmY0=
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 1MC30P-1mZME20dpt-00CTOm; Sat, 25
Sep 2021 13:02:03 +0200
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
<b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
User-agent: mu4e 1.6.5; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Philip McGrath <philip@HIDDEN>
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
Date: Sat, 25 Sep 2021 11:24:10 +0100
In-reply-to: <b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
Message-ID: <87o88gq5p5.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:xL0/nceP+Bk9DUeQM0LuvBIm2ecMsLTsYUIJZvSvIo5jgdof0Xu
DUje5E2lAQJBQy1AQpQy0DRaLsv+GrME3Ru2LquZxRjQuMrzr4P5hjUUmO1q/LV+tg24Hl4
gFs//7/bJcZghT9itbzpJbpO5bVq3rTPPNaJFBa89EdqQj9mEXkvHXNyiJ51gafKV2xQ+sc
Bj7k5zMs/iu7tVn3+BZQA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:N4pm489yZLQ=:YnBods8XQJp9b0ye4b0Yfz
UkPeaINqC7MN1cTKqvQ4M7kFd6ByjTZkAdZJPcmrFe1qL3WyqIg0PEzCsOqusfOfvhF+9OlM8
c1/V+TPOJ9bw8F+5TSb3uugSzRXJ11IBQgNGImh52T1Tpul7OVZOuUQAVy40nvMDNzbWhIvl0
ljdiAO+G7WdVEBxvcNVF4Xxtd467Nu1DG+1+uK36DnzL8KqBosWOkyxwJr4WqBLE6jK4X1isu
lyDNI4/BNX9Whk8VCEK45IqdCP7kl6AhsP4Lghl5z9cL5edLLJxS2Bt6T/NNrUYLLvU1dqLqF
beXyir5DI+Y0DdAoYrA7Bw8K5gGQHedeMkxpMsxAeP8Xjgnqk24y0mYUHRwlrm+rDw0YCr+ge
qgPgHJGdM4rs33F79I6ozEKauyVFE2uno85s6Rue3xLK5XK4tqHR+MlVwPWX8AM5Jc7x0fCi4
ocYTtzcKnZUckzMHOT84gluCusz/gVtb0M8voGIB3yRVt27iO+VDFr2ZzX5hqLX0XZPCj7Pc7
BU6WJv88BrZzNJEl+J7c3kbQD6hxGZM0EZk2/Z0vnpNvrT2yaIcXrfLHTeI8JF+Ijf/WHwu3u
Brg8Fw7j2uAeJdEzI856taGtK+9zwNyQWqybSskdwRTUdaUAwcPE0paJqTo42FyUq6grX9SXQ
zhiizAHTfsb5bUmROvurFrj/Ozxu1zrdaekFV4DKgiHz0hGohn3qZSYsxqyo2Ps0NAzzsx8Uo
S/LpCdlgzR9cTbBwSJ8JBvu3n1UvRH885yp1oDGRwjvDNNVGB4e4XvWVK+wQzNkPnZeunGSse
DMe8N7JL+fFk601tahlrQmXblNIsmraMnjqDZDku65S7PqPBMPx5YKzXS+Lm6A/7ghbBuLnbJ
dfCGD6OAJYq6te5fNWHpVK/j7CIRtrWjZCW46k7ZVswT0PshYMIluNr4zfpU8ibyx/1nCdZBm
Nlb2IEiGodj+32ms2Wfb0R7I+hiCZZ3WWFKg9Q1Y+vktOre0noLYeZRYw8FfjCrQO46Dixs4/
TZYpNIL1/i2c4Dpivoh3RfuMv8K7F6JcNadz517LHq/XcdoRHMICdsr7gf4qWApU73wYC86kt
7CPHEqUAATt+rE=
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 49946
Cc: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org,
Maxime Devos <maximedevos@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 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hi Philip,
Philip McGrath <philip@HIDDEN> writes:
> I'm interested in the node-gyp part of this, which has come up in some ot=
her
> software I'm trying to package. These comments come with the caveat that =
my
> experience with node.js and npm is fairly shallow.
Thanks for your feedback!
>
> On 8/10/21 2:28 PM, Maxime Devos wrote:
>> Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]:
>>> @@ -120,6 +120,10 @@
>>> (("'/usr/bin/env'")
>>> (string-append "'" (which "env") "'")))
>>>
>>> + ;; Fix /usr/bin/env shebang in node-gyp.
>>> + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp=
.js"
>>> + (("#!/usr/bin/env") (string-append "#!" (which "env"))))
>> For cross-compilation, this should most likely be
>> (string-append (assoc-ref inputs "coreutils") "/bin/env")
>> or something like that instead. Likewise in other places.
>
> Since the shebang line for node-gyp is specifically "#!/usr/bin/env node"=
, I
> wonder if it should use the node built by this package, rather than a dyn=
amic
> node.
Yeah we could do that, although I generally prefer to follow whatever
the script already does, there could be a good reason for them to use
`env' no?
> More generally, I see that there are 355 directories installed under
> "lib/node_modules/npm/node_modules" (which corresponds to the "deps"=20
> path above). Most of them don't seem to be available as Guix packages tha=
t could
> be depended upon by other Guix node packages.
Yeah that's tricky, ideally we should remove all the node_modules deps
and package them separately, I wonder if anybody tried to do that
already. I would suspect it to be quite a lot of work, sometimes
unbundling stops being worth and when it's hard to maintain dependencies
manually.
Hopefully we can get there one day though! I don't want to deter anybody
from trying :-), I might give it a go on a raindy day.
> I'd guess node-gyp may not be the only one with shebangs that ought to
> be patched.
Yeah there could be others, although normally the patching phase from
the gnu build system should have taken care of most of them, hopefully
all, I'm not sure why it didn't work for /usr/bin/env though.
I would suggest we patch things as we encounter them, did you find
anymore issues when working on your package?
For instance, while working on a newer version of one of the packages in
this series, I saw we may need to patch GYP's python reference as well,
like so:
(substitute* "deps/npm/node_modules/node-gyp/gyp/gyp_main.py"
(("#!/usr/bin/env python")
(string-append "#!" (assoc-ref inputs "python") "/bin/python3")))
Only for node 14+. The reason seems to be that gyp still refers to
"python", but python2 is no longer a dependency for newer nodes. And it
seems GYP is perfectly happy with python3, and the shebang is fixed
upstream so a never node will be fine:
https://github.com/nodejs/node-gyp/pull/2355/files
Maybe updating node would be better than this fix though.
> On 8/8/21 6:29 PM, Pierre Langlois wrote:
>
>> ... `node-gyp' needs
>
>> node headers to compile against, packaged as a tarball, which it tries
>
>> to download. Instead, we can run a `node-gyp --tarball <> configure'
>
>> step to manually provide the tarball, which we can package separately
>
>> for any given node version.
>
> There is also a --nodedir option, which I found could work with something=
like:
>
> (string-append "--nodedir=3D" (assoc-ref inputs "node"))
>
> That seems like it might be better, though I don't know all the considera=
tions
> for cross-compilation and such.
Oh that's a good idea, I didn't really like having to download the
headers separately from the main package, especially given we run
snippet on the source to remove bundled dependencies.
Trying this out this approach does work, but I needed to:
- Create a union directory with both node and libuv. The node package
only has headers for V8/node, but we also need libuv, so doing
something like this works:
(union-build node-sources
(list (assoc-ref inputs "node")
(assoc-ref inputs "libuv"))
#:create-all-directories? #t
#:log-port (%make-void-port "w"))
- For some reason, --nodedir didn't really "configure" gyp to use that
node directory, I think it's meant to be passed everytime you run
any gyp command. Instead I found that you can use and environment
variable:
(setenv "npm_config_nodedir" node-sources)
And that works for the packages in this series! That'll be much better
than before, I'll do it this way.
Thanks again for taking a look, I'll see if I can send updated patches
sometimes this weekend.
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmFPAacYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UX4cH/iBUk2LanVkCltAcn4bCP3vo
+L+wCv7vDSWeU0D0H3VIVCutk2x+6nUcSLch8hansMGKIaDnfAzuf7o60cl7MLfh
v3JfY20Y8yFPFhRV4xPKTUmFt55cyLBkBfjDjP8hALTaON8wASSm802vMgELgMx/
TyaSWrcW8ObXr9M+721FyTKeG4qtHECunEuDJvJ1tPEo7b+MRN9I+PwkmRM1Uqh7
1DxOBg9UOL4Jt2VoDRbqO584j/+p3A+9uGzuLJ4R/Va+FPvSXuImQy//YwkHyW7r
eRd5NWFo9ch+OsfJUhORAVKGThwWWwh2bT36OgtfMXCd7S4ko/EP56eOaZ2taK8=
=rNU6
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 23 Sep 2021 09:18:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 23 05:18:56 2021
Received: from localhost ([127.0.0.1]:52718 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mTKsa-0003l6-2l
for submit <at> debbugs.gnu.org; Thu, 23 Sep 2021 05:18:56 -0400
Received: from mail-qt1-f182.google.com ([209.85.160.182]:42998)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <philip@HIDDEN>) id 1mTKsW-0003kr-UI
for 49946 <at> debbugs.gnu.org; Thu, 23 Sep 2021 05:18:55 -0400
Received: by mail-qt1-f182.google.com with SMTP id w17so5535599qta.9
for <49946 <at> debbugs.gnu.org>; Thu, 23 Sep 2021 02:18:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philipmcgrath.com; s=google;
h=subject:to:references:from:message-id:date:user-agent:mime-version
:in-reply-to:content-language:content-transfer-encoding;
bh=Dyz0CNDLY7PJ+SB1db34tUNBDqu2SkATL0F3ZsLfvyM=;
b=j/A+N916gm51dqdc/PPnl5eK8uk7ZJRByXS+9TQTfsMTVLctQMM1dMiklFlIX8Im8K
8RsJvZItr3+rOyfwb4Oyl7jSuFaIVUG35ajIOTL2BuNOuv2j+31FOgv2TzbdUFdqBMLQ
2cYxnm8YevQBY/SNqulheixNxBP5+7tTCkAnQ9+V8LypzJpH0S/4G0gpmdzo+UvqHqQj
VEaBJJ6MMOxOAmsxuLvs96IvXXG4EBhBCoVAwvYFZgIAz2wND3KIq9Z0N3nLUUoR8x0Y
jQii13ZDxWd10IHyvjGvQXTAm+V6bZVBXVwOKJyfU/WlloSIKmTVvy308tJUZIFWUv85
WFNA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:subject:to:references:from:message-id:date
:user-agent:mime-version:in-reply-to:content-language
:content-transfer-encoding;
bh=Dyz0CNDLY7PJ+SB1db34tUNBDqu2SkATL0F3ZsLfvyM=;
b=Vvu7brLmUTButzCV/+S81XttFjv7IKZBHqIWJvWTE5oHbWUMclyPbOtSfi2rKgbU3z
eifoSlHWhePaglijLkvnKckOIOloYnb3kWLnqv6ZXOTD/hCkEtuAc5uw6s1xUcTmOLWu
i5+4IuXWbEh0DWbnNmPAzM4uN8ww1kc9bKio6StHb6Ot1tmNo1ZMNMtfW3yA+MA3UPBV
1yIjq5MvH0rFGCiBPltANc2U9GQXeS3BIPRH/eK5bKPr8iYTf2LqsFlljpT4G82tvA/1
HitGCmc0hB+DEeewi8emO11Z5muIIbizoI9cSBFEQ82jm8C2xtSRlkeavoZu/5dPLfa4
KFlg==
X-Gm-Message-State: AOAM531JLtH3qRwgjWzaH1Ke8zlAeEYLNB+bMlvlL4fF6AnCwZZCt5RT
d9+Ps+AA1x1Rti8nakUM/QrSkfVc/BvfcKfm
X-Google-Smtp-Source: ABdhPJzAW6bjRRAWqN2Jwv2rRD4vVqVchTuU3DBHdZ6x9P/gl83wDnLpHYbyGAq/KV+RTERyHItEYA==
X-Received: by 2002:ac8:5290:: with SMTP id s16mr3603367qtn.412.1632388727271;
Thu, 23 Sep 2021 02:18:47 -0700 (PDT)
Received: from ?IPv6:2601:589:4900:c80:3911:a236:500:1c5d?
([2601:589:4900:c80:3911:a236:500:1c5d])
by smtp.gmail.com with ESMTPSA id g8sm2817217qtp.62.2021.09.23.02.18.46
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Thu, 23 Sep 2021 02:18:47 -0700 (PDT)
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
To: Maxime Devos <maximedevos@HIDDEN>,
Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
From: Philip McGrath <philip@HIDDEN>
Message-ID: <b6be6177-c9f4-22ec-87dc-a54a06ec48cf@HIDDEN>
Date: Thu, 23 Sep 2021 05:18:46 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.6 (/)
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.4 (/)
I'm interested in the node-gyp part of this, which has come up in some
other software I'm trying to package. These comments come with the
caveat that my experience with node.js and npm is fairly shallow.
On 8/10/21 2:28 PM, Maxime Devos wrote:
> Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]:
>> @@ -120,6 +120,10 @@
>> (("'/usr/bin/env'")
>> (string-append "'" (which "env") "'")))
>>
>> + ;; Fix /usr/bin/env shebang in node-gyp.
>> + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.js"
>> + (("#!/usr/bin/env") (string-append "#!" (which "env"))))
>
> For cross-compilation, this should most likely be
> (string-append (assoc-ref inputs "coreutils") "/bin/env")
> or something like that instead. Likewise in other places.
Since the shebang line for node-gyp is specifically "#!/usr/bin/env
node", I wonder if it should use the node built by this package, rather
than a dynamic node.
More generally, I see that there are 355 directories installed under
"lib/node_modules/npm/node_modules" (which corresponds to the "deps"
path above). Most of them don't seem to be available as Guix packages
that could be depended upon by other Guix node packages. I'd guess
node-gyp may not be the only one with shebangs that ought to be patched.
On 8/8/21 6:29 PM, Pierre Langlois wrote:
> ... `node-gyp' needs
> node headers to compile against, packaged as a tarball, which it tries
> to download. Instead, we can run a `node-gyp --tarball <> configure'
> step to manually provide the tarball, which we can package separately
> for any given node version.
There is also a --nodedir option, which I found could work with
something like:
(string-append "--nodedir=" (assoc-ref inputs "node"))
That seems like it might be better, though I don't know all the
considerations for cross-compilation and such.
-Philip
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:54:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:54:09 2021 Received: from localhost ([127.0.0.1]:55664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mKIS1-0000V5-N5 for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:54:09 -0400 Received: from mout.gmx.net ([212.227.17.22]:60083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pierre.langlois@HIDDEN>) id 1mKIRz-0000Ur-Dk for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:54:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630234441; bh=c3kA/BqzNOZgw36rer04I/RrlI1LT+q8uLv5+I52Kzk=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=UNHBqZ5AiQ3IwcTQxDagfJ8t9vF/BnQYxKkHOCihbOMqjN2p1N61zZsN6Qs2XArAp 8ckrsi1mJGjziBrg8D7lFkU/entfICZTT8v4a3+7sGEOveYmcb6wHB/awQamlor0RR kwICtERGxAUMYphU5kcyxqD7dzghNJsjeT/TxP1U= 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 1MowGU-1mnZGp28i6-00qTuU; Sun, 29 Aug 2021 12:54:01 +0200 References: <87czpwzg9e.fsf@HIDDEN> <20210829104608.3103-1-pierre.langlois@HIDDEN> <20210829104608.3103-33-pierre.langlois@HIDDEN> User-agent: mu4e 1.6.3; emacs 27.2 From: Pierre Langlois <pierre.langlois@HIDDEN> To: 49946 <at> debbugs.gnu.org Subject: Re: [PATCH v2 33/33] gnu: Add emacs-tree-sitter-langs. Date: Sun, 29 Aug 2021 11:53:29 +0100 In-reply-to: <20210829104608.3103-33-pierre.langlois@HIDDEN> Message-ID: <87a6l0zfll.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:grmF6saw9sGuomDCrQn2EZ14xSTCCrvL89q03TW4L+3E2LSQ6xE 3U6phnCfbCuXYGpR16ETR63JKEnGkZoWzJE1mj4H5o1gbrklal/miOALas+wytnNY09eHZP oB3uzjz//jrthJQ1Wmr+9qqEI9e5jhVD58opbNz4z9/c2QomodwA57u0zzi5lFxO75/rNze nPQTG0CFMvr64u4pBJLIg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:T//ahn9SQAk=:D9tijKNVzULXGYv0yBQW+Q pgbSz3T9c4Q358pB1F+JF5DzRVksPMk0YXy3HenZwK2eB3/W6WZJCLPoTSTs9sY36ujzIaJXB ysO9wWoq9Pt582X4Jo/94vkmVOaV2oEZF5DzsT0GVaUduWI2ybUp01RIdlgHghD/SkiACHInl N0y1RdjTR81kvMPiu9k8O0IxYiCdYZXjanNiAp8PY5Y+hystzkN1hnkywkaHtrKqx5QNkuqS5 5+gKbEztLTqRvaMdqTpU5KumtWIeI4CNEHZkc9BoiUp+vXlATMDiAqmmttFTStSb7QL0c7XAJ vNLQ9XAkRZAoDb+eWlGkFT1KAG/8YoY4v/PygA0jdBXx5vOCW22lqns42WBKZvM5kBzhx6l3L wzntPjUCONSUXRKg05zRnM/j+fvWW8QLPu/XWdoswaEWxNxUELyZobj616KQpJWbJkKnNfIX6 EtxK9C5ee2CiORW6rEuCS0LhwymogaVJwkfLn71SP1SEdChDAEkp4gH7cAA03xOjqmTm0+BLa LIZADDHHTyradqGc2mt5v6LrbPZxgphAaSn9iDZgAl/7/OgNhCLRAhxIQqoijHTHqmaQ5nQGo e+TlaRCkix+rRtqYGGQfm6fzRVms37ohUB6QZtZYBQ593jythbLoZzyy8WMcEstaNkgWeHEdx uYP9KwXC6MHWuRHo/cQsaQnYuEkHfN9kk7Oq4Xse2wYtiBYJJnipWkOwbgRmttdUklFGMtDa+ O/37tzjCEWFm3CqCqXGHukuNMfnn62Uv/idZtMEaSGF8X5Ifw+Q6uLXeodyiQaOIO5vRUU7cW otaDMJ8QNK3IW6vkXPR6l0/4sQ15dGJWZGN8I3h4bQhMNQAAFIssWsfi32QOReTT9yISP76C+ 7wYiKjAi67ecWYnM3QHlRomgO0SzDFytOFe2ziZRyjx8/qREAwpDIzCzwgaZq0WamsErvTGY8 vgGlDgWWlaOs+2xBR/0fOoBUvVIPqWZFuPm4JFQmaddm7cYVw04KClEAk36eKN4lnfAkPA7Oo AxHyyOv8wUvu5AHNC7vp20hfky15zdRnK2KXkOArAyQHLycwY3KaBCOp+NPVJWruzxQUtsPii xtobKKyv7RpF63pbwlsLD3dqF1rJtZbUZZ3knImCZ2e0Ipfwju3k3JGnA== 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.0 (-) --=-=-= Content-Type: text/plain Pierre Langlois <pierre.langlois@HIDDEN> writes: > * gnu/packages/tree-sitter.scm (emacs-tree-sitter-langs): 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 0454d75ad4..6bb52b68ac 100644 > --- a/gnu/packages/tree-sitter.scm > +++ b/gnu/packages/tree-sitter.scm > @@ -709,3 +709,83 @@ Emacs packages that understand code structurally. For example: > @item More informative indexing for imenu. > @end enumerate") > (license license:expat))) > + > +(define-public emacs-tree-sitter-langs > + (package > + (name "emacs-tree-sitter-langs") > + (version "0.10.3") > + (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 > + "0fa0xi8sky5h3rscnvcci9djdi71qj30vivzzvx7w8pqkmsy1vq7")))) > + (build-system emacs-build-system) > + ;; FIXME: Support for some languages, such as bash, is still missing from > + ;; the bundle. Whoops, I forgot to update the comment after adding support for bash, I'll fix that locally! Thanks, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmErZ0YYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UCNEIAJ5g/QxVLsVCxc0mteI/GGH8 9JJgBK7Vm/I1YctpnEWyllBqARrPz5n1lz8S3fVTbq6ULO6jM+uf8FEIerZWz57R ds9qK+0LzioOxCEKW5o1p0ag3uasxeJjb1B0bOK9xa7zE6dnpPRQqzl0Itz9lAPd julUBUsMT9LjdLlZjbiLhA2W36ebocPo3DiOU4iaMbO2ajt3DD99mJ+ZNdRS//7T gY9xNnfIxugg4r6TH/XGOAph5NVjKzcmyqIinLen8fdgUlNUxlV1xZrXGz5YoCDV jWAzxUT10y/T6kdUgSICYRQP6X0IY/WlijGCPIFiWpX9DmrJigq9dg2gAnI+xfE= =lgHC -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:52:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:52:32 2021
Received: from localhost ([127.0.0.1]:55656 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIQP-0000S3-8R
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:52:32 -0400
Received: from mout.gmx.net ([212.227.17.22]:56037)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPg-0000OZ-Ep
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234298;
bh=0cJbls6RGZN+tWZO4SXEONuZdpA3vNAl1eVM7chLL/Y=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=kBA/xmawox78egzAozavvJhAC0Sk/yDb1hMaLeLiblJjoYmBM+ECvqz5d1lQzqcWo
qMB0TG6D95eEgMz11+uToT+ZlzRvcRUZohjJYNIwkzCyMJhVakg8rvMpR9+B5/llDa
85poF00w0228kV6XZJAcSYR4FQCK1iDLdG8oG6w0=
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
1MIdeX-1mGhJL1EGb-00Ebk0; Sun, 29 Aug 2021 12:46:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 30/33] gnu: rust-emacs: Update to 0.17.
Date: Sun, 29 Aug 2021 11:46:05 +0100
Message-Id: <20210829104608.3103-30-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:WuCkSPWdbEIokRiNSSW2mEpu56n12MrUWJDGrN4AqcuJyjUMUKI
JoDtPMzspSdbTBzC6j3i/zHwTzww7RSrdBJII4guTrDO0ZnYu3tIvaj57rdTIAe1488H/jW
6MumkQPVV83JWtq69NJ98XquXsZyCF7z9NWzA2PX/kmiZu4Kjhn4VLd3Sb9h549j8fFoHda
Pdqg2ohGLqwoiYKP2fngQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:CsoCk7ygL1k=:b3xrp+S4DLSHrsky7PB+EB
EHEbyvUC/4ZfqCVjrVBV/TtVf5Hpyk3qmnSjDYvgKJ4PdO3SK5+FQY66itww1U6aeU+cZQ0jk
HsP2LwS0ZfiL+9fvxuPcM4/LPIYTVu3rCsjZi+C2objjc33whzinP9lbK7Aey8zB7owCco0Tz
kjtH64U77kePwgi9jSYZsWTYllMMF/AdBFUG+0m+1KZWywcUBAWX5WpMLaR69OwG5w3luSk5L
4uICvcVvN2M6WvEftHCESpU+Hd34vMxAQMMyK8PyQtV5916lNUMwm0UvU3Z57jJ9yJ+w0iKIa
9Zva+hmXQJF038ObCQf5GHyndEkvSNyqDWB4wGPQwBDaEzkzjwC96F+y4nKVykYm/eDs8FLGS
SZaiU+IgLFAadu1/YaIzNaorLL9VooMLFtm3RKpDU4wFTY+xWWrlGylfI0dD/JXllRYsFUArr
d0BIqyE9Ye3s0/smD0yTWIeD6enNbSE9dhJYdT5x7CjDGiMNMc48BRFoX/rlTK/g18FhGFykq
O30VhGJt20oXDBAVH1KKrKQDEkhVaRh0fkxKJurpwU2vQB+b/4vfQDbU44tzfyyJHTUgMtoDF
kFR3Axj5PVQ/uJUUirdpQgdiqGih7O6SwxTTFKxjcskb45YRxc1dTkyMcEFUCNgClN9qRrcUT
PjTBLC04aKFefUBscEfKrWkY914UOpMU7XkZd/rH/FkS8BrbbT8w5yLJO1D51whlWPghhr1pl
MIESdW7LNy+GrhP/2NoQmyMDfTBX8H88L+5rpd9OcDZeZlZ+nX7wQS8swo848owEAeKAP9pGi
aShIY09Yfp/0ZZQGgR7NYKFQN5COl2y86NvuPZ2n7UQ0KbBUA/e33+iAJvinUwDTxnP2JbW1+
oDfM+geWhxTaPRTMzZPHoQPtUTW6Df6+qPF6KrGbegLotWb8mScj27hrnZV3Xq1xN9p+5Gxpa
U/AoSJXrgaExNAqg88rtd264dk6xC2Z76YAdYMQUXG/7t9zKoXjOhfr90TasD7E6vl/bpZDnv
RgmM4ROkMNkOyS+IuwzU3N3rTy9XME54MWZ7dqvsCgLgV0kPqWbLS/R1Sxd1AvEkEB0Itqai5
jUWrY1nM6vt5EHboH+OUr/oOOpLZ56iaEeVsfbvoMQH3aujz56lkka2ew==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-0.17): New variable.
(rust-emacs-0.11): Inherit from rust-emacs-0.17.
=2D--
gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d7375d7e56..18538650f8 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14642,10 +14642,10 @@ signing, and verification in pure Rust.")
@code{Right} is a general purpose sum type with two cases.")
(license (list license:expat license:asl2.0))))
-(define-public rust-emacs-0.11
+(define-public rust-emacs-0.17
(package
(name "rust-emacs")
- (version "0.11.0")
+ (version "0.17.0")
(source
(origin
(method url-fetch)
@@ -14654,16 +14654,18 @@ signing, and verification in pure Rust.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ "02f31apvz03dr0dwn5wyirdmqkk2d635iki0kmsh291xr6dysy2q"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-ctor" ,rust-ctor-0.1)
- ("rust-emacs-macros" ,rust-emacs-macros-0.11)
- ("rust-emacs-module" ,rust-emacs-module-0.10)
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.17)
+ ("rust-emacs-module" ,rust-emacs-module-0.16)
("rust-failure" ,rust-failure-0.1)
("rust-failure-derive" ,rust-failure-derive-0.1)
- ("rust-lazy-static" ,rust-lazy-static-1))))
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-thiserror" ,rust-thiserror-1))))
(inputs
`(("clang" ,clang)))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -14673,6 +14675,28 @@ signing, and verification in pure Rust.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-0.11
+ (package (inherit rust-emacs-0.17)
+ (name "rust-emacs")
+ (version "0.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.11)
+ ("rust-emacs-module" ,rust-emacs-module-0.10)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-failure-derive" ,rust-failure-derive-0.1)
+ ("rust-lazy-static" ,rust-lazy-static-1))))))
+
(define-public rust-emacs-macros-0.17
(package
(name "rust-emacs-macros")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:52:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:52:29 2021
Received: from localhost ([127.0.0.1]:55654 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIQO-0000Rw-S1
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:52:29 -0400
Received: from mout.gmx.net ([212.227.17.22]:50447)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPh-0000Oc-Ft
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234299;
bh=hGsmnd70jNnqpUrvdvObgDfxmqpXI+UeJO6gkV7J740=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZSMI8jmWhscB6Pm65dUrcruADicSrBK7ARXYYhkeQtBEU+PfBo1d/jgkC/SGR2bu4
Xph8UkiAFeM0r35BBO2oHQeZqP8k9ngDx4AdR3KNb+krzzMC4EnouZXiQ+wWUj6JU2
G4B2mH97K6+xXC7LaPkHeuugC2NsIiev+vNdh32o=
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
1MKbkC-1majHn12U8-00Kzej; Sun, 29 Aug 2021 12:46:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 33/33] gnu: Add emacs-tree-sitter-langs.
Date: Sun, 29 Aug 2021 11:46:08 +0100
Message-Id: <20210829104608.3103-33-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Efu7kQ97ARUSCVvEnLTYntxq56k1eECu9p+zwYs/qH3zRDi/0ce
OMsfBYxw6TBh+lG1i8iVdzIvxJEvzSFcJn0XJTFLUsrH5pdIKjyH9NsFpQ7zgeuy6xYol79
ymO16udXVe1TW5r473aejQhp8+jZVrbP10Tk1TVwBGj665H0+wLVEZ2PBx44RGrIW9J+sGE
Cx0rRLaVVSORsJ1EoRcQw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:nq0dePAl09o=:9j2GbvSTyLXuKssbQ0lc09
nMa+/EAQrVYw+yCxFxvW00fQR+ncnlwTTUSabxt5+jA1cyY+Fz1rjaLwJjSmSP6Eq30M3nhsU
p4akchvDI+Zl6IHNa1YfabwEP3nFVdzTIL7AkS6lTvaPNitD0wd+caz67P/0PiPRDqxkb2aT0
/S5ArETvvg+LDBk6x1u7BvqHorf9siPxVUl9UJ0hwqE50eFIWS8DCh9u4RzJAjotCafCgMN0q
B72y0kPcdp6cdlb5X9H4AktMWIz7zlaH0OhjnDbEJgGhlO1PClAe6rlkVhvC4zVWkkx8dkuar
75GzWWTg6XUJ6YZBo/6BN1yaMFVS6q4T2sRFq6cDkAtWMDsBqNiglFVDLSb5CmMZ7Pt33bGoq
et5mEI5CO+4OI1sswjwgBd3/s4E7nqVuyPwDo+3aB82Lvi8pVVJCqS5UcZ9jMx9JmJps3AbBf
uWD5rLSNfURYvKh/vp8THBTRl+v73WFrrL9OMgO/KtMXGSW9UdIGN5aBilWguPj1hBAJDG3c+
tbcZzbmX051jtsP9sETI6ydva+XMzO+0TaCoAu69BZj+3ZgO3uZ17IzMugEbWU0M8xYtMx3xw
6aKVLutNlJomitYVj6LhYZ77gObs//krskHyN+renxyPocb3YnptbRzkpY0YxZ7uZiiyButtT
pC8uLbHwrSsvxFq9abdRoPxnx6UuVjjmdhnf9eVgT7dH6S3KgoMZnk6Gj4a9kyUW69i/X4IAq
COTf+gzysDIrpNIHsGZSQZDncAYNeNmV3kybQATRSbrE12y6VA7aIQrqyf9eAKIqbq7+UE5t9
wB8mc2qp+ddVjtOv16b9p54mO0ORxaZVDHTAlX25uVT4px1Z0XR+1+thBFBqfSrMIQ7S6pubJ
A2ecwXt1mAVUZkv8pbgfaWwFmxLfsMv5yC1AJTwWz5tfRos+hGWG23TaQSxqVHYV9EKMFJ98G
etyM/Bq4IIXyljUSYwhxEwgxyWgRuUTsr6PEIu9Th8aJwnJCWhZr5JiE6rmQA+XUjQOvYueJ9
Bkp+nHgBfO1UptfBFk/GZD7BWV1bItfUpaNs3I7MGTOe8+KHFDedtyicuNXeIBJh+hScdBZBJ
6KToA16CHwDo/nDLs2JT2g7cr4Mv4MYUAQs11WfLt5fJU2ry3mBHnZplg==
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.0 (-)
* gnu/packages/tree-sitter.scm (emacs-tree-sitter-langs): New variable.
=2D--
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 0454d75ad4..6bb52b68ac 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -709,3 +709,83 @@ Emacs packages that understand code structurally. Fo=
r example:
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.10.3")
+ (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
+ "0fa0xi8sky5h3rscnvcci9djdi71qj30vivzzvx7w8pqkmsy1vq7")))=
)
+ (build-system emacs-build-system)
+ ;; FIXME: Support for some languages, such as bash, is still missing =
from
+ ;; the bundle.
+ (inputs
+ `(("tree-sitter-bash" ,tree-sitter-bash)
+ ("tree-sitter-c" ,tree-sitter-c)
+ ("tree-sitter-cpp" ,tree-sitter-cpp)
+ ("tree-sitter-css" ,tree-sitter-css)
+ ("tree-sitter-go" ,tree-sitter-go)
+ ("tree-sitter-html" ,tree-sitter-html)
+ ("tree-sitter-java" ,tree-sitter-java)
+ ("tree-sitter-javascript" ,tree-sitter-javascript)
+ ("tree-sitter-json" ,tree-sitter-json)
+ ("tree-sitter-julia" ,tree-sitter-julia)
+ ("tree-sitter-php" ,tree-sitter-php)
+ ("tree-sitter-python" ,tree-sitter-python)
+ ("tree-sitter-rust" ,tree-sitter-rust)
+ ("tree-sitter-typescript" ,tree-sitter-typescript)))
+ (propagated-inputs
+ `(("emacs-tree-sitter" ,emacs-tree-sitter)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fake-bundle
+ (lambda _
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file "bin/BUNDLE-VERSION"
+ (lambda (port) (display ,version port)))))
+ (add-after 'install 'install-libs
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (define (install-lib lang)
+ (let ((input (assoc-ref inputs (string-append "tree-sitt=
er-" lang))))
+ (copy-file (string-append input "/lib/tree-sitter/" la=
ng ".so")
+ (string-append elpa "/bin/" lang ".so"))))
+ (mkdir-p (string-append elpa "/bin"))
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file (string-append elpa "/bin/BUNDLE-VE=
RSION")
+ (lambda (port) (display ,version port)))
+ (for-each (lambda (input)
+ (use-modules (ice-9 regex))
+ (cond
+ ((string-match "^tree-sitter-(.*)$" (car inpu=
t))
+ =3D> (lambda (m)
+ (install-lib (match:substring m 1))))))
+ inputs))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:52:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:52:28 2021
Received: from localhost ([127.0.0.1]:55652 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIQO-0000Rt-KY
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:52:28 -0400
Received: from mout.gmx.net ([212.227.17.20]:59267)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPh-0000Ob-3C
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234299;
bh=XuJZZGOojKBqjgBUCVTioLjbmMwvS/WNf+8gQst3O8E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=aNPPqXkQRjP8naxpnpbG72ZCT4AS3jsMV1Cgz7ATlGmwnf/Sw/Iv1qrKPIPDw7rRE
dwCLTcQUW2DqGfgjWWRjARyL/QeNDxE6dCiAP9kzUJss0ID6GOqhh2oz07fq3yekd+
K/qLqBCxyaKHOip674nD9yW1fH/EApAY2N/pNTf8=
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-1n2sFE3rPS-011VTH; Sun, 29 Aug 2021 12:46:39 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 32/33] gnu: Add emacs-tree-sitter.
Date: Sun, 29 Aug 2021 11:46:07 +0100
Message-Id: <20210829104608.3103-32-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:RHf343EqBaPOMRFDDgz3U71sruY3kZ2AWmC8jdiHvNNYNUzJNSR
vne7x7jAqkGGdY+lU12lWcOJxhBMlkA/dMSHBNcGXRp7EJeE4QQtWZvwL/cMh7wYl79dL7h
VNkv5/Nh2r28CtAt/NjZYVCZm4MXbF96VP3iv1xYHavebZU3cNmdpNMeCPaTZAVHLDWZeeE
LSGK6LnykRG+psBkw1F0A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Eq5IO3kgzF8=:rnFHePCsh7U3s+GK5C1bXb
Rz4NrbQmXc5HE6kNZ3dJK+zRMoeRyImr7YudMQEecTSIuesDac9cX+uTkvNi/IjZsbBgfr0SQ
uYgV5kT2fa3r2Pfenv8M3oE0S4Lly4u8bsoxcqOQrDyAX5YHTRyj/5LKdQDE/P7+ZqW4ZqIBw
6CR302732qIzMXbp0979K5SQrPY6UsHR6ZHWC1b774BfSwh0j6RTHa1aUFgZIYbfLWWzHQPtf
bByPbNWWP2LgMfa/IjytaYibjTpMgcqo2LbRM83GFgz1gTLodKmCEvbm8LVZ284ToJwEsPEpp
PXe2YdXJNB4f4cDUAkd0REJCp5W0ReacZ+KJxJkNg4fh5vY5VMYJjW9h8lv7UFqmQ7TvsOfq/
VfQyaA3IKYU5eizcpR4iSMp0bwtZZEq4nayjtap6mnSQzyN0eKWqo5GUXMaXU2sNHVzznxho1
qlb6/MRbKxz6KGkFvMn8mBajBROiZD+HhjpDGhzExiI+i5SA5r6IwbetFsG3a5NolOkxhGTJZ
nvuzCnpl8aqYn1r9rXujBngTGYPYMKRkGSkD23FlMU2glUDgpCdyn1YkQ1bbUdBBpzAFeFbR0
/Lt6ki5cv6L0HnHQOoA6/B9M8XU+/CbarvQhM4vnJz1AOX08T8yzByit36LXO5fmS9pYz+nhP
OKTFx9XaV3at5wsb8dwjI9QEptGyb/Si9J1fWbS+SlI/1wp8VGzSRd+vZ82MeJbi8ha/00g3Y
Q1qqKOuD0Hg+JGnj74qqbdSvXeIubVPXt6UmQXREAKLbbqlWP7Wub3X63epHkPipqcnJ/924I
yjbp7cYgBtF8NLOFPprkpeOWpCpN1BLEATCMEDRExeMbkb38JqHmf/60I/lcAK0bK0s114fDU
IrjodqGlHhaT9kwxkW0spx2iP8Ry4XNtR5ltkQX0qh09vJ9M2Nlf2ZOBzMAnTfo/Aj1esSk7j
Ooe3Qdj5G5y1HLbeWPqPpcEmMDhJWpvD+UEgpD1hm6Ne0OQiX8O1cbH6nzcm0a5V/x7yWKqSY
+X9c6Vh1SDmlVMTGZ3Sp4R5lkYshvqH6nw5cYXAhQuP48Pkdl3P30kQ9ndnYh+BFK4mpJxTsI
eqS5izlfbGfYIEJJ2CHQa7f5FBI7QoCieZzzAOL6kKffawQliZjwn9r7w==
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.0 (-)
* 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 13f7a63acc..0454d75ad4 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -682,3 +682,30 @@ library.")
(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
+ `(("emacs-tree-sitter-core" ,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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:52:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:52:16 2021
Received: from localhost ([127.0.0.1]:55650 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIQC-0000RV-8n
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:52:16 -0400
Received: from mout.gmx.net ([212.227.17.21]:47723)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPg-0000OY-5H
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234298;
bh=xWML9wnsnbpAWPIPvv4PSeMHiqKtRd+ixjdnjVJ3kuI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=GphfPEEgb2RodPvLMdqCtUgj/kh+5tfuofkk+y35EQ56LA3P2j4SU1kF5tbJLUIm/
DRf4WOmxePCfWp2EZJ4XEtRUoDZ/Gv1By2lnMmffq6oiFJS5mt7Y2K0zZ2WUgIGVhl
siTL1QszY/m3fpBu9x3HeIDt1JGCr4q0RQHP1crY=
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
1Mk0NU-1mibXJ4Am0-00kOrF; Sun, 29 Aug 2021 12:46:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 29/33] gnu: rust-emacs-macros: Update to 0.17.
Date: Sun, 29 Aug 2021 11:46:04 +0100
Message-Id: <20210829104608.3103-29-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:DiLm+qw1e3TX2IbaJaO/zsaCK+72MvmCGeOJmcVVv17gMMDbwSQ
8JyZNFMrKYXLHODi5EkAhNNDVL6y3PdY3O14tMSR4FLMUz6fqHDco+em1OqdJ/yOSAWdOnz
2UCsZ3iy3SPbDZE+K/znlaYFYpK98roLT/YYe9xoENcwWyqRDYDC8hg+2qy9FKa455kM0ud
QmQvw3mkmTQbzkv/b0DRQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:naMBDPid9tk=:Mg8A9r6wHDsF31uMsAzU63
3rSMEVBwtQMEAEW6TS2RiN07mn5BDVKKi3MQAVqbYQJJjFGI4Y5j3/xevorN9e4bQF52iQRUj
/RzembuJzYk9k8rR8Ba8ZhCxcHloVKRhijza/wEE55c+KBQRERv0i7k54r+cAoxF3GG4mWIV2
FIWauPWh/hY8aqIOi18CS+jTtlYy9cCeCewhQSfvCV+3DjzfzahlO33F6SspuLSHnHXZy8Mce
h+vZSm2b5AEJ7Zb+AdorpUDzEuGEd2W6grsxsUh13Nxgw/ZSTUdgpinI+3GxyfZS0tbrfmMrL
/2W5/LDRwkAf33ytlz3H8BGiIh7UiDTHqfSvUQpKrxXixgpo09baO5wSovTVTfQa3qGOI/m8O
UPaKEuq0Xhx5k9DVZsN4UL1EiEDHrRLdPCwXNDWpmpyYU2TPCLE66gAAO7qolJTOyT3dVuMEi
uq1q1e0E7b5DqGJvm6kNNtonedm8KHlIqfs32XkaFbuoWa6szPXw1iFDU6zvv0YJ4nLiN8GVU
o84lJIuNrO7mrxomDupixo0ySBrL//C57Fc1j1wk0rjfHjDNKYuI+vpve8ugasDw98VZ6zq1o
aD+LBqOolh0numpdzZ/PKsIqIjmyir7LKvmh4VuXsrs0NJHKs/vbgdRLljGbM9wy2dwdv/57p
82Y5+5FBUS0vpdbIPT//R90Me6xhRSat3XqdH4OxOigDyDH9/ToMRhnNAZOq9XwJvVmzFEj8g
cR07R7YLdoxX43T4InC9wBeEMP12dJh0VxA7yyNM/iRi/qToh7nYXkrdau14Yv9Kj+E/3gOal
jNkfz/V3uqxX09GGCPqMGYICADBWv/0FsmJtY6ikD6gzvqtWP+5mcyWghC5DJad/gPSVAa0uD
GhUfCfQKoFACNLYpUQakhygqP1z4my+/KuikBFFogf88jNdZiZ20mfCQa09uV1VkMMeuFXHYv
HcNuRKjBeXmxo55CjsL/hw3aPQ5OgPNtbQSz4/XqcNiLmTfEi3lHRg69k0kUsozM4B9Q0XMXc
vcHnXTDBpDh5yMZ7jvqot3ICOgvuuYYxtJDcfQuaIjBQyHLALovR4R62zsFEGTsZYgHprtBDb
ZQ8dnt2q6rM7eFhn409oYpXk2dLlXVaYWkjPesBJamblJBzhNaLoxrMqw==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-macros-0.17): New variable.
(rust-emacs-macros-0.11): Inherit from rust-emacs-macros-0.17.
=2D--
gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e4892d5852..d7375d7e56 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14673,8 +14673,31 @@ signing, and verification in pure Rust.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
-(define-public rust-emacs-macros-0.11
+(define-public rust-emacs-macros-0.17
(package
+ (name "rust-emacs-macros")
+ (version "0.17.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qg1dcn5acbirq617qq2fgg9adswif2dnr292s3qnq62wzgnyrb9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-darling" ,rust-darling-0.10)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/ubolonton/emacs-module-rs")
+ (synopsis "Proc macros for Emacs modules")
+ (description "This package provides proc macros for Emacs modules.")
+ (license license:bsd-3)))
+
+(define-public rust-emacs-macros-0.11
+ (package (inherit rust-emacs-macros-0.17)
(name "rust-emacs-macros")
(version "0.11.0")
(source
@@ -14686,16 +14709,11 @@ Emacs' support for dynamic modules.")
(sha256
(base32
"0390y8vafxdi334hhgrzvcqjq3n5ckcmvilqcfp8vajjq8irrly6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-darling" ,rust-darling-0.9)
("rust-quote" ,rust-quote-0.6)
- ("rust-syn" ,rust-syn-0.15))))
- (home-page "https://github.com/ubolonton/emacs-module-rs")
- (synopsis "Proc macros for Emacs modules")
- (description "This package provides proc macros for Emacs modules.")
- (license license:bsd-3)))
+ ("rust-syn" ,rust-syn-0.15))))))
(define-public rust-emacs-module-0.16
(package
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:52:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:52:16 2021
Received: from localhost ([127.0.0.1]:55648 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIQC-0000RT-0w
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:52:16 -0400
Received: from mout.gmx.net ([212.227.17.21]:48015)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPf-0000OV-HH
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234297;
bh=2PseSKIZRZI3g0UehygKSiMcdSF0bGa0Prp1zuBNukY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=JuI40BOUTP1zLauvXf5zDuHRzrRjNj67w/Y/Oj89syICCMrk4luT+aGFXK+3u8tbU
LRLwVgaGAAisntlSgoU0kik6+/d1SrrTNZe4nD00uJVEOdaYAzkILCQXVtUqHiEchx
RrUOmfPDT2LuZNRfO9Td9F0DJ5mui8tDOB+PnFkY=
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-1mri4Z4C23-00dUJO; Sun, 29 Aug 2021 12:46:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 26/33] gnu: Add rust-bindgen@HIDDEN
Date: Sun, 29 Aug 2021 11:46:01 +0100
Message-Id: <20210829104608.3103-26-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Q8klWj/Dl6n7LA7eARrJzDwZD8ayR/G5qwy82CqdsUfp/U5+q2w
ww3pHKlZ8daZ+oWd8j0/EuiPogVAAQat+aynKg1D/akumsggv9IV6dSHmEtZdwnMl3OkfWE
xwhzKtJCaa5P3i/BezXuFeq7FmF11W/ilf5brnJgvjfTq9jh1Of9YtRLIitiYTfuTxH9RGq
u++uvFIg6EdfPLFrxYM3Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:FYJkpTHgy0w=:oRWzLZoO/iQ8nzB79zCo5S
DuQ04EkQxNSKmApDST29R8DIkM/ffD8YLOWT6e9QD1+Lyf3vjN36dMcZPE2yoLULbjg0Yz0DB
CFlzbw+hdxcqzZqIxaKzY4kqZyuGxGIt5GxCOjZoe2w4iXh4VfvzA6Q8j5tfsKS31ygdIiZvW
syCCmgGKuEpVzPE42hEAmOlyk4pXC3aahmboMovIK5KCgSg8AWwz+CSLZQeQ7f8rKRetV0orp
6cYU/U4IY/e02FOpdDa2zh2nsrFkQH2OY2oQZLFYDynchPBoIWf+gVcV64XSlbcDSzehhUMK5
x0Pbmm8HGX6KtZh9mpynE7x8QLvrQJ8O5yPcvVHMBCfO1Evt6vz+wkPejju7qysFQ7J8FXpvZ
gjO3X3BDkrS+m0/NpcTjYuFAVv472w2FG3UmZB8BqbE52acliGK81v4hD+FBUNkK7wKQMQC/b
QMQ00M3YFUglCL9uwEyZqaI7Jl8XVX7J9yi5MI6y8dL1PQQ9X/lM8MfKd5pDQnotR995wIxEC
WLDD5HqZZXnYegFBcpDTs+fxTXlY/ko4TlWyU/FAKAB4NwA0pPHId84y8j3NUFR64MPGc+djX
B1zCfPvULGP/QeACcYxqUy1jZazgP10ZWoDYd2QX9y6QoB66qOQidyoZNKY/sHLRtEdiJWjf9
Aw5NmMHNsBmlMDUY5CioalP1dbza9L+6RAI64e/goGCxY3C0LcuEm07uy341Jl+qfQlIOrhTu
k62CHRAT9ldG/1GTQDCzGfyzDoa1s2MdVspfdJOJzZI9JsgYFxs8tkFjbyG85/VKWAMVnf1oO
KMTNs6mp8T3CyGG2gxV8FsAqbp+t2tDypQ83c44mgudc1wlHChUcs8xHvUil3Qx0MbSPGyi4X
/8OAqnX5+CLth7N6uB5LD5rRLYCdo34gSF2YWmoZzMGkxvEwCUHUv+cIqE/OwZgrA0apdZzav
tifVRNawEh89UEvcDt5dKVj9Yftk2j8mDcj5wd9VbGdpFftR4tdwXpERrRa0R7/RfpvMOo4JA
udCJAAvgdZ0FCmvg5V+zeals0aGRlWtcMt9SSe8CourwBW0vt/tgyg83P80SUgCQ0k1CaG7ET
tNxPbJdgZSGM91TIb6WAi1LUWbIJOrp0ZF89CnhOtMV8bAEfShIjuBqDQ==
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.0 (-)
* gnu/packages/crates-io.scm (rust-bindgen-0.56): New variable.
=2D--
gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 476d35c241..f769a8e9a5 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4541,6 +4541,43 @@ bindings to C and C++ libraries.")
("rust-shlex" ,rust-shlex-0.1)
("rust-which" ,rust-which-3))))))
+(define-public rust-bindgen-0.56
+ (package
+ (inherit rust-bindgen-0.57)
+ (name "rust-bindgen")
+ (version "0.56.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fajmgk2064ca1z9iq1jjkji63qwwz38z3d67kv6xdy0xgdpk8rd"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-cexpr" ,rust-cexpr-0.4)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-clang-sys" ,rust-clang-sys-1)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-env-logger" ,rust-env-logger-0.8)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-lazycell" ,rust-lazycell-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-shlex" ,rust-shlex-0.1)
+ ("rust-which" ,rust-which-3))
+ #:cargo-development-inputs
+ (("rust-clap" ,rust-clap-2)
+ ("rust-diff" ,rust-diff-0.1)
+ ("rust-shlex" ,rust-shlex-0.1))))))
+
(define-public rust-bindgen-0.55
(package
(inherit rust-bindgen-0.57)
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:51:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:51:46 2021
Received: from localhost ([127.0.0.1]:55640 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIPh-0000Pl-Gd
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:45 -0400
Received: from mout.gmx.net ([212.227.17.20]:53075)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPe-0000OU-Ss
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234297;
bh=XEVsE5haDqyTF5sJmIF4ELU7bh7XBDWzcbkWvjd9iio=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Pjld7V/szvsmCGohbZN93SytLqKDLWQtTqHTHALvGUrbn9qUa3i3AFEu6oWMv6mM+
yqn3tY6w4fLcQlMwYOaGYrexuEZtrv7ZSF8kgu9ZWTiEVNkezARhBHeYXymuinVh4c
L6nLBZXUvJFAN5cISBoxxZuuBFZnWojV2ahem1l4=
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
1MpUYu-1mo7Jg2tf2-00psUz; Sun, 29 Aug 2021 12:46:36 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 25/33] gnu: Add tree-sitter-typescript.
Date: Sun, 29 Aug 2021 11:46:00 +0100
Message-Id: <20210829104608.3103-25-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:aEQA2Hq+oC6Kav3qhssM9yHe2/LFSqOay6NmnnYsKNdCAsuezXD
uWBDvZ5ZRXzFcpS10nth7HeHBnCbIOly8lhhm7lYiNtsgvhka2/Y2V2u6hfuatOCRbCtCT6
ElWTmEG5Lwk0T18uJuIs/5hZFoqRTi8dNPdWVuY0MAgU7fyx4NEIfL5xhfcIxbSyE6gNKPd
MdAGvrXGhFR3ZyZsykSig==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:YPgCtautpBU=:YZBajVYazJ3EFW8Amq0RXi
izvu7llqCoGjNA55hez+XFq/TxcfUJco8A22Pt7b+w5qSJ6mdBh0IMN/hR5u0I6FHE0PufS1L
eT1M8dsC+ixCdj9EGKo1fwMDKn3sw3FTBz2Ca2GaiqPQa8xY+fAHuplabYhmzUuJepX88Kuay
eYK2CGjV4lLfkllm9e0xc3hL4PkxVT6rYAicPCOEMIzxWII9NeIMnEN1wcxre6cxJoo4tcK0Y
MtzfSW1tAbmMN1/Po2K7umOsvxM1qK12Nsy6l/usD7ZhjKTRA//anxVHSBEb+2cF4MdgDka1b
6D2iymFSKOT7wqiWeuYkM+Dzbzolv3zZTHCtsYHm8fSliepXzcWwrIlP22peBWGXRWI1R4FLU
cwYy/GTDGUBF6eI3MPg2Tboso0Gpb5KVUoWhOyjyMO3jXgyoN1oDo+5i62S8JpqJZZe574VVA
Mw3nPAHGKBzUxMX19gnPjkT0deqpfxnmh3rr2o+dbePyUiT3qqHUY8uiRbnr3if6FMQTKkbiF
mua4iWW/GMLRKrMV2VVCnm/vhSgE4521giSceO2PQeF/dBshPU1qIH//5oob8rQp5TlxJXn1q
89ltoF6rSP2i+gPeUdv32O4KmicDAuC5lBnlu3PMyXl8MwgDHNt4ZCETiGKksvkP6sH8GFrEY
G+HbakrP+Xd99g6kE+G6uK+lbcalnR9+oKcEip3lj0DPkQM8WAR+otewB/SOP2hCFIwslUz8N
QIXsz3vASvawPkijfJWQe+dXRDXMjV4UZN0H03thTtqOetccuGcFrQ/NuxHEb5JJxY+E2pGmK
9djbSJBw7eIImqz0mB+AlPiRFzmQLDAj+4/WRP+LxlCtS4ase8YX4luV4KTgYQwHMS6HQrI2C
j6kqgrA+NsiA2zr0wvHka1pJ9v0RkXiGEPaC4chdCl41lYJRl8qU+AYZvMdC88uy09Z6EsSj5
qU5mgQkKEqgAG3cUaKbMagOBxRDeNrSktA68XqmBJzSQsRpWmFoEq//XSBfrcdnMmGwiKGRnk
MfhcbAcePQwli6cNgNFWiL/zeWeNG9AbnmJRprRSNrEjrYuxjLDsS99U2wac0bmF7WrKQ/zM9
NJzJSCCUpTZHGs6DdMrjLLSa+cnjyj78BLANQHz7/cyQ2fPlzmR7qt7qg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 60 ++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 8456a15607..001322dd84 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -516,3 +516,63 @@ library.")
(description
"This package provides a Rust grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-typescript
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-typescript")
+ (version "0.19.0")
+ (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
+ "01pkmwwmbv6kxda0n6g4cfg72ldmpi9gmp11a5gygn472vhrh2xw"))))
+ (native-inputs
+ `(("tree-sitter-cli" ,tree-sitter-cli)
+ ("tree-sitter-javascript" ,tree-sitter-javascript)
+ ("node-nan" ,node-nan)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))
+ (add-after 'build 'build-gyp
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((node (assoc-ref inputs "node")))
+ (invoke (string-append node "/lib/node_modules/npm/node_mo=
dules"
+ "/node-gyp/bin/node-gyp.js")
+ "build"))))
+ (replace 'make-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files "typescript" ".*"))
+ (for-each make-file-writable
+ (find-files "tsx" ".*"))))
+ (replace 'install-native-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ ;; Invoking `tree-sitter test' loads the grammar which
+ ;; compiles it to a .so binary that we install.
+ (with-directory-excursion "typescript"
+ (invoke "tree-sitter" "test"))
+ (with-directory-excursion "tsx"
+ (invoke "tree-sitter" "test"))
+ (mkdir-p lib)
+ (copy-recursively (string-append (getenv "HOME")
+ "/.tree-sitter/bin")
+ lib))))))))
+ (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-sit=
ter
+library.")
+ (license license:expat)))
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:51:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:51:45 2021
Received: from localhost ([127.0.0.1]:55637 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIPh-0000PY-0t
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:45 -0400
Received: from mout.gmx.net ([212.227.17.22]:35591)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPe-0000OS-IE
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234296;
bh=t0RWa1UxeqzH8MRS4ZDM3LQ8CaHPyHDeRunP/ahO0uM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=O9Nz+SZSg+mPWsjfC0SIOjizq5ZrrdSZhTM7ny2euW7Ct8SLqYxX/Qxzv25eO3D1P
7uo+M6V8nzJZAIiunqkCV8aOg9H8WTyG/AGS9UzgoQ1/QqblN2fpUwcKomBFU8rgPv
EQJgJR5c1WK1FUsmH+XARhgTvC07TdWLzCYjjfoM=
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
1MKbkC-1majHr3Dg4-00Kzej; Sun, 29 Aug 2021 12:46:35 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 22/33] gnu: Add tree-sitter-php.
Date: Sun, 29 Aug 2021 11:45:57 +0100
Message-Id: <20210829104608.3103-22-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:UGGxURTBmB5Y6hVvlyxqFY+YSdOKYUT8N3ocxuVEGLHk4Acmv67
BztKVHJPqyzKZQnk2XvjleOuQLiDfUVb/9DFkl3/LqJvYI1+uiHd5zl/dXbeqCi4s4Oj8cU
or98A2w3HyqEq6qrGUcftY/ce1ITzqtumt5wPKv6h8hf/IXVabVGMCUR7e+HEDnkeCh+zSL
HaH4I+JFYxIhH7bj6Qdyw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:EkC7b6NdWyo=:v6xaqg7mdohKM1wnKBfq2P
b8K0xYhNfWlTUKRF4yE0WmZsGh8ZrgYKCqANjrukWZ2/Fydl/e4ygft1DmBzMshYhSGSa12n+
+tLIXKf7YoRBt/zzQ4cZS4CefnAobhg/EBNwdG3QhLEM74XtD23635i1U/5xVGJIT7cAeTGRf
aHa2mOnuYbQdmVwUhStLQS2BqDZtqtWmEAJvtRsnml4mQX4JFmlMSSeCmjhLO8WP+BitS3ANX
8Ce0Q5nRdbVPTw3kkAvg7tx09ShcGay5Cen9KyGiZlR7B+spTzkvEQnWY4e3TvFduwCuRu0nT
vgA7I+ksfB7JBJfRuzECHJwFek3helchk/qiRFE+xKz2X79gjdsQCiZ8ShniCmzW/IWA2vpkN
ttuDGYwlbl5mu3wqbnFVUPDFRpUvLm1QlEhAJWD6VC5C+FnW0pk9hy0zmIES3MEMWtM7tdHg2
X/pzW6dfgnYlhAao91e86zelJr15zyrwceY8SGvUGv2dPjSCQeH4dx3Bd+6Vb0hiao47L8u3R
Xlc6+gE/kdaoT+0mmI1gvVA9BLYgxL6+54VrNWsTKRKXP5RXaQrD/sWmEmV0AGmRA3bae+sia
yFZjV0is+TMaTb4iFbdNdjKQTQpLqrxPSJBr7NMS0i31Vu1aM1Lu7Yy0fVxEnpP4lgMJblq7/
f2BwxL/uyFNcn/POlOyTJ0w8ROHHkBE01A8kN6BuUtWu2BqQFqTTl8EUrzeVUnpGJBDbQ8vb6
jv0War7F3Paz2gATeDgg9s0pekyCxGA5L6XDXS1MxtaEITT6WxIoiTD93Uu3krM5QAWM7nK9O
csQ660iLbtGs+oXQ2H9yw1qm1e1FjhaCMrCFSpQnUN9nv4YWTY7DYWgnhxHF1ra7JlBmAGfg3
aEP2MS6X+H3PZiTX3izI2QUDUPD8z3McYReyV032HPzW1D3xFEvSSvBoFLSrNCeBgTix6WoTf
1MKwWqQOUQuGvT7W7a/KuGmqHx4uiIh7w8lsCoQdzDl1Pia+5ExW3UID20ofzRSa5n2b+Qgdt
UY+NnarrVzMERTXGy1RHYYxOOzHLRNhR4+CNOGOdVN+VjtcvtocPO6M/L87TjyA7jBqgmGEa/
sZcAtgjJkRjwJtCdSqNK625TESjS4AR7Crqdx1CAgkAc8shFKFudgDIAw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 36831b00b6..d717bbf7b0 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -433,3 +433,32 @@ library.")
(description
"This package provides a Julia grammar for the Tree-sitter library.=
")
(license license:expat)))
+
+(define-public tree-sitter-php
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-php")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-php")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17cmybgpprw7w9d2v7lmc6zmr90d70g0jqq279gzg0mpwfzla53s"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:51:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:51:45 2021
Received: from localhost ([127.0.0.1]:55634 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIPg-0000PM-HE
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:44 -0400
Received: from mout.gmx.net ([212.227.17.20]:40019)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPe-0000OR-Gz
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234297;
bh=OSUE7uIpTzONfHqB5J/MkJGqtuZAscGHUl5nLVL54DI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=fi2GBTxpm4inqT9xpBgXHUp9IMJkR1sfhFeMJDPjikeJw7bOG1GopkFz4TLcwIBys
vikhFx6zi6LvxZZyUWk/ukZebYIH2kPVj4aeHktEzjQcyRKPYkdsEdOGenr53RP/9c
3MPpSXX7xl4n30x0hD5vz+44Q6KCcDZo2NDJNaQU=
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
1N6KUT-1n4H9p1alF-016ivc; Sun, 29 Aug 2021 12:46:36 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 24/33] gnu: Add tree-sitter-rust.
Date: Sun, 29 Aug 2021 11:45:59 +0100
Message-Id: <20210829104608.3103-24-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:x+lSyW7Q8q5UCvVFDrKzDvweNNiKaqA1h+mdeTmpYIh8Jl+cpKk
+dqOtkplP2/ENPJfOpkkmmhZQSLgiQpfeM8KTq2sotIf1yH989avf5Kz6WSXe4N1IUDlnUQ
Lh+k06aZMD/W9t7oTDg4os3/82+ZzqxsATct5LbdMGeUu/HLeis8svpspDiP9NAP2aYPR0R
LhK5HQGypJPFwpMFQaS7g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:MttmzAlWOyY=:lOIf5rzsalmhql4Dw0mKBK
QJpaW2d9n8b67M46N+068mRiEOkyQw5WGdBUYkBVPyUkjklF7VNWrzLT+qvIFLDQ1S0Nqw0kY
dY6GX062JrbtvG9JcBVjLeCeYOwV4k7SmUtH6h/uxSzJcPoJdIBcuoL69yP1aL+YZ5X3e0Go+
1pBKnnkbbe9ilk68lbI9bINFJycur9V/mfKY6kaLqvXoarRyyLTQ7Bg0KHDQVwK2eadApVeZW
JjhcrJGuS7T1DyBuiaZqKS1WKE9v/n+AKGszOAGuvse2fcVB4XB7Rtp0AnpKySueUhPF8HPK/
/NRYmbAdtsK0byCUCd97aqq9/T34KjuytzhGMSDQP9w1irZbyZm63CK12lSiela6/ng5bzsNb
2tMHVPLIdOdjaE617wI1AgkDiX5OODw+YoPBrh+UHvPb5OoT5kdt4fpg7DXj4pmqsaZ9oJPk6
4yxnZJP1+z0xPO1PhXFGR8wGM2N5Ddd0EaMhm4jXE7LCVyqLjBrYnu+cFSp2MA4Eda2VngZx/
ntbA/w3pFig61KlMhFtkoqC82r4kgMtEA8xAD/HgD51J5pTiycibbdrSUYCxp15lIb1PFfWmH
0ZZTQ1A3PpiF9iVeqfu36Dy8GaELfhJYdjPGjnY6m+7AgnINDrktgYn7LKhYvy8ZTKpkXWyRm
M9KCdkhQDbCpW7hw8TBNK5iy0QZntA6qPnPZwNC3M2IAVpr7hWxMMOYcbXXeA90FVPVydh6zJ
w5fosaG1VPy1U+xl3z4UcwYhALw89l6HYXyede1VcF+pO+hY+kwchFOFbw5OR5t68w2Us8E7A
KdQIxNHzPLmELdyUQWVs3FD7r0nFzsPewJKLSNUzKq8XQyJUYje4B+zot9CbjnwBfYk1yT8U0
XTxNSAKegDMfXDXyTZWgHbJ7KjxzKooebJr+qk6wK1vuUgRW4hZIq6g1lNnAZ9hJPsSDFKcmR
H2Q2C07UgROs++qVl3cSl3j/YlwkdU5BR4POoizkpXN9st637/5ODGm+04X13HbgRSC3c51mX
p9o7/N8tpgvGbSt63DSK0q6u7uWI4DJ0X3cxrGx9cLSckmdLgI3cYVsDJNu7yKDyXXIzzLm21
bBws9a6uyQ9sWxBE2fPWJW2Zo9AeLYkSVSGbwu0DliG5TK1Ky1zE5XJcw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
=2D--
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 ae8bfcd9ff..8456a15607 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -24,6 +24,7 @@
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages node-xyz))
@@ -491,3 +492,27 @@ library.")
(description
"This package provides a Python grammar for the Tree-sitter library=
.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-rust")
+ (version "0.19.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
+ "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l"))))
+ (native-inputs
+ `(("bc" ,bc)
+ ("tree-sitter-cli" ,tree-sitter-cli)
+ ("node-nan" ,node-nan)))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:51:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:51:44 2021
Received: from localhost ([127.0.0.1]:55631 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIPg-0000PF-7P
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:44 -0400
Received: from mout.gmx.net ([212.227.17.20]:54315)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPe-0000OQ-CE
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234296;
bh=VNV99ple4T3Bggnsm1/C7/f3FszTLoaEnS7tX8NQzTM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Gj2RgK92Mup4R9iqFw1iNf/mK4vytcHWusH7PWcGVgVaqJzyEbHp7ZE3oy0Snrrzh
kq4+dgZmBzR4crxGRiPlljCF1xulHSQw9scG4jvwzYRprQFSwfS7np8Fh57gGT2/X3
jfkkWvR5H0m7oQWOtyhYT/SMMIJ89+UnQzDY2o/4=
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
1N6sit-1n4p7c1wo3-018N5W; Sun, 29 Aug 2021 12:46:35 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 21/33] gnu: Add tree-sitter-julia.
Date: Sun, 29 Aug 2021 11:45:56 +0100
Message-Id: <20210829104608.3103-21-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:0oDvgvA9yD1qZI23ClhSs7nufKgiZKe3CilUwKoWh7tqEbOl/Fb
wdmy4aL7rMa+ysrjNdtSzuhHFhLMZjwG1x3n1FJoeVrz13JkMOSVC5mlUcPglelBzkVx3sw
0mFmJQ0+8P+8j/c87uYBUYFnVvh8Cysub+2/EON8Q1jyCK4i24xIvh2ZFMz0s1Nq131ugMf
OoocqQRFn2RTdd4adVPsA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ffEyHADHyGQ=:A3BjferHWuDwy8K6CCxE/Z
Cf4ndCWIGIPzq/eCwjwedwBEo5GkL+P0FAyz8dl6aXlk9ZiylTmK3Z1Jae7z249P91CN7Oa+g
gP25nj1xZpL3cAzOHtccYBu+xDe7PQCYW0TPnaG4P3JJf4Fe/2Ijwtl9W/QvAbq9sO2UdMCHJ
Bhn/TRvzH7bVNGspukKmvFWJg2Cdtuo+4EDwJMzyFWbjjo3ngUvIxiEiy0L7jCO+ldv1sSxfl
3lVXeQ+miwpn0/Ya6yelKUvfA8lBBFDWJ5Gi5YmtGb6k+EH/C0jiFA3YHA0Qjhs7D5GtTiEJh
drDs2FoF4m6iM32i0uKJ6ENDX5Asaz3o876Zw0aoYh10jkS2SfSUjCkgGkqPJ0PbNyhdDb9rh
t7NXvBrnxlGv0KGWEijBbK8LOkhtZU84uJhwozCn5PM0fIDx0G1OMKRjIl9nXoKimsQhnGoBI
qzqHGn/KzpBqghXHdUILxutKEMSmo8636QzjRvLGeuM68JaLImPbI8s3Fm4NVn2hxctEAi6B0
g8J5PMLsTH7Ks73FsZgyjPZAmlLynJjseFse6noDjzKao0Id2EtGxX0LKW/Z0FVNGzX3dvAu/
y5F81DEPz98FIz+0DuY73EBDBXS7wRYNR/xFJhx2ipuJktSLoB4y3mfyQkTgZ7YJhzZ99SnCq
6qzQn+Zk+BgAiqwo/A8yvFyfgMZTOHVqeUQEgKWMvVlfNU5ToN/Lz/CQN8sD+LJAaHDGHeTBd
DgVwAo8QQfIzrBMUcEIdOLnpJ0paUaHSeIH+t7reKfVAOeGhYMzmTGro/ZQ/iPlU17R2fe62+
ONQu1Kr3j7VB60AVuUKg8EERUxbBPXDev4xsrExTurV8qA+f0h5JkGC0IaecSkcfmZOYDwYkf
Kb4+TMKlEQt5diDMGX6G/ZX5F1VpISnwUbKZ2+dNRlMx5uRxMa1+lHW1qEEIbxtmhvdUSejQ7
Jp/o/V6yRbTjxMxysIb4JbRXcijfkIHL4C4oYBrO/uWG27h/qaNpyjTh9wNVh5JDKtPyWz0CS
qfCHu9p01dOi7LV/mMbdZ66PkSaa75MumVDlKyIGSz/23osfDlS+mMS5agdyGdR47kJOODSJB
WjuaTvyagVmMuVttH5qzql6CU1ySRWniW/Zt4xzZKVzDoBNHunqZE9VpQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 74249b2aca..36831b00b6 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -404,3 +404,32 @@ library.")
(description
"This package provides a JSON grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-julia
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:51:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:51:44 2021
Received: from localhost ([127.0.0.1]:55629 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIPf-0000P7-Tr
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:44 -0400
Received: from mout.gmx.net ([212.227.17.20]:36871)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIPe-0000OP-C6
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:51:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630234296;
bh=V027JpTlnMt1/5JoHP1SMYx6feAuFgU/UbtIbXbZQ3c=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=XVRG6u15kcw0oJrC2ybsm7quBYVhyPAfM0qsfonAaxZySwOV0Jy8eeDXg3rKvclce
pLQUvM2QhCeIr00LJczK3druM0qmiamyVEqAyXcC7VMWOlmAQyUisZGEeEaVuELJA3
BrR8OgqWac1ubYHWcWprKjTm3O7dEhviCsD8nEGY=
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
1Msq6C-1n8y6m0GZE-00tEXt; Sun, 29 Aug 2021 12:46:36 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 23/33] gnu: Add tree-sitter-python.
Date: Sun, 29 Aug 2021 11:45:58 +0100
Message-Id: <20210829104608.3103-23-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:BsvmADWFAmc+BM/ClGPQEBJGhDyqhXA7wRqSACLGMW+ASslMR+k
cQ8IdD+/BhXHISt2casMDW9iKbPVVZUgO83uasVXRFeAdcGiJmb3NFdnc0NvNqcQ+1Ku7yN
87nA+fJiYQJ+WdAAXlH202jnsVz0/Ee1ff3hIBmsPh9Yd6ssKvgMTdhb3jQZm9Mk4XP5125
ST25RHg8/0mNPfKIwEpUA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:bQzDWUZ0qcM=:DG1N2IxVycyshjafrXqulz
vR808l6P8I5z6Mt0negG1pGOsl/m+8BNFwxkWIfhEmp9xKRAXsiz/hzfsDTbJcIDUbp0Z01Jf
ucwfSsQUGmxdI5uJmFhPc52ybYwgmpP5RJP27SrC7nhJ5PjHmb5KP+Y/erAixOIdYOzRzjZLd
fhcwMFv6vF3ugywg51rUi7BtUbBDLFFQxHq31iTbRUhGqsXAHu6dbz9EH0tjGXHlhVVevGI0t
ecgp8UvKeZUnTMEWU6YJrJ1e5Wx467SZvgEszYsEgSVXjgW0X7RNN6ZxwjZk6V1UZ3WVRzhkt
GzA89GHsvCoUwwJqe3ZKQ2FjjxAylWrY4HJuR2hX1iRy+yEBPBvbsN4eV+zOFXgQ8m2Tau9A3
xoR0W0SHC4ngSMye8//XuT8cuxMrfRfi6ix82tZ/ZOeIfdPLAhraor1R/ElfF1nlLRa4uAufs
6qweEAArfGDRmvR6OUc96lzhaPZk5ACfKOjH2FqZUIgWDaQ1AciZP1I3vNxNlFH5foHuwvB5C
BSkEozY4Hi+5V10Uuh2xeYPgaj1B6SuE6+gi4u8nmKszK/ve9/L0PTOIJdcrzap8AHI5F5Tyo
VqyoVHiIZs0ZzGUxPrnuH/B9K16sDcKcoGHrsL/1QtQ3TFK/EQFN/H9ArI8EFDGXSG9Li+Ni2
je9V6HpdQBO4s29WFNcG3T7VZDpVbGJBIc2v8UAoMdDNDcZEAf+IZsPa/RXL3oePD0rwRq1lh
0S5vBl0m6tphOvv8dwgHBAMxceE6DmuIQIBSfKCZj0wSe1yZULUgtS87xlTGls+vOmyLKxQxL
EqSG7EK60sh0nI51hFurh9odHaEUF7ajlkxk5fafFLx41mbAqRTG5Jk6vtNuTfq8Ayfr8oEav
HWIJwiyQt4DLQSk1ACdM5+OdXkJ5QfuUAzYqZiV+2UoFhDw4yXQ9IhlIlevQ0jwFM5UhPs5kA
Rmid0oguERgrsXHmM7IsB/H7g6WozU/fcGOlb96G7grN8UMoXwEu5qQOocLHFOA2JgQEGhxXZ
/RHrFIPZXIYaCKO9nooyAkxPj82M7Ve/Sa3nf+7wxTxX4ByX58a/31lqkZw9xJumksFvJ3PsB
6XSc+0I5jEy8dtbdl96R+PnHGZpp/gWUHjtQXqJ5lODSXzwNRlIB2Ocbg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d717bbf7b0..ae8bfcd9ff 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -462,3 +462,32 @@ library.")
(description
"This package provides a PHP grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-python
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-python")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-python")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "04b85qxqs64x6nhbpcgrzkbilxaiwvr9yd3h065rynv7rsdg0hii"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:07 2021
Received: from localhost ([127.0.0.1]:55604 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILD-0000GL-2m
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:07 -0400
Received: from mout.gmx.net ([212.227.17.20]:59067)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKq-0000BR-G6
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233998;
bh=ekxmQybdBqyVUVcjavI4JewqbFzZX0D4i05H1DDD9Iw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=VnLCFrlJ1c8snHMG8tGbSZB7i+zKPXO8fQp9PVpLxpPpgi7ghpwsjoynLeEP/nmeG
xnO3rrFErLQky8LFd3GruPqsPYQ5vaCZ52F1p7jbpLzySRXbA9sAqGmasVtQF5Lbby
DVbeiWTRGs1JwQEMfxMKRnais7b2fnN/EILHyn4U=
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
1Msq6C-1n8y6o2Xou-00tEXt; Sun, 29 Aug 2021 12:46:38 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 31/33] gnu: Add emacs-tree-sitter-core.
Date: Sun, 29 Aug 2021 11:46:06 +0100
Message-Id: <20210829104608.3103-31-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Tp4T2nrZzIkE4Ho59QCwYRGisP1lgY6Lt7s0bZpLyvQWORcUrsP
w/9SKClutN49HzJRjebQkx0o02AawfKaLg5xhxHLSASXRRVrHhVbOoD3GAd34zR4tsT+VYL
7b9iitanL/ch1R7XEgC+B5b1M3IENAoySd3Az+wTJSB5RVtcP7DjjKfrZpv5BM5s2NvPvIF
A2enLC4sl3Awjj24ZeOfQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:yq6sdGMPA6Y=:eo2kdBVixVECXKfh6wbCzV
XiWz2iKJ2nSOtL4Aecfd9X/eEdaNh9Q66IDzz2XkO+sWC16GUSvkpeRiDxSS4HWJYFnIiJk6f
E1DSOwJqUX1xYun4k4RL/bsFtZRzGwRQGnW0uWJZGDkp7tTN8N/iiYBghmqRsXLv+Kjq2sUIn
+CC4Rj25NK40qRsr8PMDhDAz4bKq2NQ1EkQlATLss3NYKBjE/JyvMsJsM9QUXVf3+EuAyAASk
dZX0cGelWSulcHbH+9gO/PX2DIE/ZI+oEdl3igWb8l7mO5Ha77TTESRju68w4yPV/+1viQqzK
+3fhks7421rf+vkvCug/vRzfGBUb7BwTHI9mUFbDRCO4YYqH+Qb2SJSBvHOQUyX8WerlekXmK
bMvq5QrAzecAMMSgLCV6A9GwgoyTDIRy9QZ0lYq0H4v2Of/IvSRwgV3cYGuSWQ66LlGEMxhM/
TKxJCFhUzY1ZjvdvdlW0GiWd+h19jpDPruXMbDTVLVZ7agdxIntEr6GW7pcK18akLHEgUb7Mu
CTKtrFM6cTBZt3SuS7WpY8VwwXAtRqC9OnPIKKL9MP6BgNsH9NObXLJ2X3OYYPRQHmkFeppIE
G2BB0YXW9RkMB6/2FjdrQioy81CtLdLozkSZuM8lBd6UrymEupNaYO/HPyllY9BE1nrB/SmH4
sBhHafUowEcqnLIvHq25DZ5unyaXFKf2RpSXsG73EMEbc6QDqjIAdbr5NvhiMt1mEybWqlIBp
aJ3gON8BvK8Q0FWwpT4F376i3cu+sm9fUxDsJDzohahrfr83YDEFlSpD/LTlZ3gGyt0/QVCai
D1uwN+YoieRsAdeFr0IhOMAGbkIpJdsjGZYETTybHftjeMGoqWJ9xaky3bCilu9FeimkCCr4B
o3nT1o5tMlr24rB3ctm5Wdg4y1Oo5T/b5M0IJUWlNr/F4fSccki/uwW8JXjHb+/o1e6JbRDnu
pE2eVh/4B3/ssWz30dtraeWnANI6StmrEUH26iRx3CIhEiJFB6jSlwR+7dxFQ/KfMy9koLtgn
ukq/uEi0NJKaKoJjHGKX3MkeQMyLJalfxKxTQYfeTasQeV0m8HjV6dYSMgJYBXWnns2RJkkWP
6+m/a5dJ+FwVRxAusq1JXVWBV6vVyrj3GeH38y+ykzZkopuX7jeHxqjfw==
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.0 (-)
* 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 | 79 ++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3357fce4a5..13f7a63acc 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages tree-sitter)
#: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 node)
#:use-module (guix download)
@@ -28,6 +29,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io)
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages node-xyz))
(define-public tree-sitter
@@ -603,3 +605,80 @@ library.")
"This package provides Typescript and TSX grammars for the Tree-sit=
ter
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.15.1")
+ (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
+ "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as")))=
)
+ (build-system cargo-build-system)
+ (inputs
+ `(("clang" ,clang)))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-emacs" ,rust-emacs-0.17)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tree-sitter" ,rust-tree-sitter-0.19))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack '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 .*") ""))))
+ (add-after 'do-not-fetch-from-github 'chdir
+ (lambda _ (chdir "core")))
+ (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
+ `(("tree-sitter-emacs-module" ,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 "LOCAL" 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 "LOCAL" 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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:07 2021
Received: from localhost ([127.0.0.1]:55601 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILC-0000G7-M7
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:07 -0400
Received: from mout.gmx.net ([212.227.17.20]:41007)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKp-0000B8-Iv
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233997;
bh=UxMgRg3l23I1MXc9hdZhj+QH01Exdpug6A4mE18S1nY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=SKW8n9jzKOkguB9leiY+KSBBxr4vd5d9agTAbZxkEutS03NG8TrQhjyhkNNAdNtFp
byw9nXMDhakWtAUr9BoUYN6vxqhyPsAju8xMa5OHeDpPyfD+5p6OUW79w7hUk/ziU8
WUcWqc46+9hNnFLgaIfLKan5zdbf+roKhtruqSqw=
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
1Mel3t-1muRtg2s7B-00aj9s; Sun, 29 Aug 2021 12:46:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 28/33] gnu: rust-emacs-module: Update to 0.16.
Date: Sun, 29 Aug 2021 11:46:03 +0100
Message-Id: <20210829104608.3103-28-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:779o6OGl43YZN0M0p8laPhGtVuFgvN0YnH40Rhq/82P0+dp+otY
EoXBtYLRP1uyPP2foWPZlgib6XjvTADVlnrmTuIMAGWHlRJThtorBzGVL+omXPt0bXQxzDJ
ZN5gelx3sTuKzlZsBghggGsJMiTRcL8bNnVSe4e8OROzszMXw6pDWaVjGUx7I+w52wbfmc/
oh1gx+qrBBiHXCV4sdmXg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:0+1XhJrrkKo=:8Obag4AyOWkIyt7QPMpnkc
x6v5XeEXiRhfs8NB/ekjgUe8Cl2LsELUYo9zoTKW5hRe+9nNgqIsNgYJXGebKaCBdqj1/qmnV
vHniekeAtnPvrzXpRYPHnTVjztRiSnUtllSE2n7P6yXYtvT3GoXRouh18LF+Z3c3djwj5LPel
P57SNkM5SeM7vsXI+qUx+14/9HOdqqa5LZeqgJOHFSsv/PZ3tVbAK0O88uj3dDqwXs9vD93Yg
zlsEBZYGxE+knMQlgQOQ0tLJYeFpJ+MHStoZhV/Wjt09D0vmzXgE3Oh8JAP7WtsojwmVY4YXj
W8XXpsb8gxRf5jq47Ed7U5HVltT0h50aW6uC/iv7DqdOc6vM3PvJrKw6R0+b/MG97LlcMMgDJ
mKEjEU/HF1v3Dwo+WkfL6x5Mz96Kq1QhKOeaAwrZ94ApXuYmviN+0kIooVNHT761gbHM9MGnG
ZVE/pDg10eMgE3P/EzJSZn4WcCMrJ5mZOv/MLJx5wbY3tQ34z9qGnGfYu3KthqWOAxR3Vi94O
meC5o/5Hc64bVHqNj3dke81QJBtfVrLufizS2m5EkYSqbw0yGJ4adIpKCdAQhuhUFLY5BfEd/
Vza6VklJMxqhqVs5ZyzOAOAsbgey7i1/+IaqtNLXxl+i76XTLtxls9vz8IbZqqzs4+naVIrvR
A67VoVgJiGVT6ZtQxib+QvObHPe/9HELZ8t2UZ6n5+BxA852+r8nIOSdEQPqS0spH8nrw4bdV
yiWhzuIc/mpXzEENlja9N0FrfiU33xGwph6o38uNLEZah1Pi9FH4gIxVy8CN++J2Wh2ee5kV3
+9zW9syaDbo/oNXO8FfVC8YIg1QfUcPi1lzVya+JCkZ2RxI4TF/WYZ/MyD3dQQLs+EuSyAlEL
Q7xBzCqmiKlCgdWFGLq+9GvvZSnc0OyRLCjw66S3CdG1CdIhNxMOKPHv0N5TWjr59Ap0cvtVX
7/LWWQ5e4vq0JoI3iC2ErMF6yCLQ+Rkxv+w8ujWG20anfsKkVSRHJCueljyZTQ2WK7lvAnxBB
+iwmwvEUEGETAAzZ7ivRQMRGu/+S2iH9zdS3Kay2BcJkOvV0assflcgi+FtH21oQRpJZ21SWi
U1UFjAvdlxxCvgXDaR0JmWaWU7IR2Ar3gTHcPWDqp4PlW/7e7kE/bJ/jA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-module-0.16): New variable.
(rust-emacs-module-0.10): Inherit from rust-emacs-module-0.10.
=2D--
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f769a8e9a5..e4892d5852 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14697,10 +14697,10 @@ Emacs' support for dynamic modules.")
(description "This package provides proc macros for Emacs modules.")
(license license:bsd-3)))
-(define-public rust-emacs-module-0.10
+(define-public rust-emacs-module-0.16
(package
(name "rust-emacs-module")
- (version "0.10.0")
+ (version "0.16.2")
(source
(origin
(method url-fetch)
@@ -14709,11 +14709,11 @@ Emacs' support for dynamic modules.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ "0s8qrh0ggjmqr04zkcf7s4ijmpd44rjcag78npnq64jv10lxvsry"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bindgen" ,rust-bindgen-0.48))))
+ (("rust-bindgen" ,rust-bindgen-0.56))))
(inputs
`(("clang" ,clang)))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -14722,6 +14722,23 @@ Emacs' support for dynamic modules.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-module-0.10
+ (package (inherit rust-emacs-module-0.16)
+ (name "rust-emacs-module")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs_module" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.48))))))
+
(define-public rust-embed-resource-1
(package
(name "rust-embed-resource")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:06 2021
Received: from localhost ([127.0.0.1]:55595 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILB-0000Fd-FN
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:06 -0400
Received: from mout.gmx.net ([212.227.17.20]:38845)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKj-0000AE-2L
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233991;
bh=Vgh2eZkelgO2F9SuT/oTcPELfMcCqST1QveMvJpfIWg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ZZK/GqVPAYj8J2QSZJ4t9C1lkaPi+tDsXhatCF+kLQpQF0H0MC5xzQzZFBEs/gEvR
GshQFjLwQT8Uh+SLlsRnU/eEDKGTuMBXCGZ1PktQDv3r2fPKyvdP0iUBBemrdXz0Kp
O8XdTDbcZac8+P1lv3j5hsUvkrGcC4tFZmpVGUlM=
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
1MWASY-1mUfYi31Io-00XfOe; Sun, 29 Aug 2021 12:46:30 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 07/33] gnu: Add tree-sitter.
Date: Sun, 29 Aug 2021 11:45:42 +0100
Message-Id: <20210829104608.3103-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:R5Z9YDmmELd1123258lwBG5a0DFKovi6jPdYh1czEMFqNEnNu45
3fBkwCGLP2zaDdc5LBXYyX6ZGwm91MZo03lQ3j8OiV5qEOrrHDYUxGeRZaETg9rHrWf0Jbi
Nam446eeqv3s9vlbbbpBMD0YV4CJmeZQkWTqzNen7cM4wXa9k1t2vrul8BTPAGSuyV3CwS8
FiDem/kuvi0V+H7DnBz0A==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:wngC7+KKy94=:o8uEbLr/9Uqgs0Iv2b7jKd
1qB8GlQWxW7JxLicYS10MxKHSojr9fjgnX27DcZDHqW6SjfQdkPFfvo5H+6JHpIt2shOx/IRv
6EMxxKReT3mIj9OrTYBlbVqSwBiA0mvZ+lz+yq4HCLjsecDdVsc4MnWt8BPgMZNrCB8+hyCQ+
jsfF8Z5neYUgTKe1cxTEOZt0mtt9GpjBvulQXRDtBPBN3giW7aKcf5qJJgVgFLXVmhGnmlsSn
npBBUJQqa9BDkAjgflwIsVRnbWzB5GTmhAMQ+70DcjMkn4sl6puA8sVPmMy9i7Kogk6SCPgps
moSYbSTcvq0ReSY8UOuXXJ6rXTE18rhUO6i9PKxrP/fp18HXnFrybm8uQUwGuJVh/pswvnNzm
VT56rUjjm7mAfMN1XqbZ8lP8F9BROwMluDYwwOSO6wtTSSaUvpPjY5S9TUOVDUfLqLf07SyFZ
tA/0jWTzHdfKXX9wOge3fcmZAdaKrzebKBFzG5l8KbGBip715gH7iOXZ/3gBx0+r/iz1bQC0a
R96Bw5G0Wcows/bl2pPkaRSgTccEXchgMAcxq0ySz5lQPgZDds4PESGulXMQR0TUbN0jAn2yT
mC20kr2XmDQxUnadBp714F44PL5JCLHQFPpyJuCUMGuR4Ffo4ORG0sQGy21mgSGehAT8uQzyv
aRTUIJZwCJWuSZ0hGjqPPL8oRlU8jp4vR7n9JTbdFBgyXCdeyJor4wRzR124P/vWGytirNRdl
il2EkIZDYn+Bo+SOWXosglIsWzqVqdYGlkOYOJebfcQbDxmdpztINMNU59Yo4/8Sf78VGWboL
ER+C/RJBexuZylTH5dh9ZUWQ/W7IjS3OpUoiVCLgsxQV44v0O4m1zvvMT9fDKv3qhZluDoner
XvRagls9wkWwPy4nmIRZa2CGe/+cYdguzJ72jXzfHTHrAoumhXVd7x5sbtAf7PYXrpL0LOLRT
Znn7ZLSkCavbqfYyvQveb1ppeJkCCXkThnyDSm0AQCpQBrN69wZBfgmFIBYYpUL9rP8fm1GWA
2XsC81uW6esQjF/8b8VaAUDKmksanVy2+CTNe/eNdZU56W8zMbrGF4PkXof5CqTCQ4DD9zoEl
Qhx8TlMtra5hQM9RDIHRWpofyKbk7igwQjWRZiZ4ucG3guOFuwe6Tqqhw==
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.0 (-)
* gnu/package/tree-sitter.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register it.
=2D--
gnu/local.mk | 1 +
gnu/packages/tree-sitter.scm | 73 ++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index a0da1a96d8..0315106c30 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -559,6 +559,7 @@ GNU_SYSTEM_MODULES =3D \
%D%/packages/tls.scm \
%D%/packages/tmux.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/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..e6e66cd447
=2D-- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,73 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2021 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 licenses) #:prefix license:)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.19.5")
+ (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
+ "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ;; No check target.
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'set-cc
+ (lambda _
+ (setenv "CC" ,(cc-for-target))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib")))
+ (setenv "PREFIX" out)
+ (invoke "make" "install")))))))
+ (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 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 @code{libtree-sitter} runtime library.")
+ (license license:expat)))
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:06 2021
Received: from localhost ([127.0.0.1]:55598 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILC-0000Fw-8A
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:06 -0400
Received: from mout.gmx.net ([212.227.17.20]:46555)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKp-0000Aw-7q
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233997;
bh=bXsLp+DBWusk8VE+m6N7+Fdl8EXV2N2/DEL3B0dm52A=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EtldtzHwU6SsZ8bAihT4COMztZIbfxuH0cEqYhkMyLdSV1CKZxSHQiaj9zxKrKDQl
az6J2sIeT+LadOQxMoz/5+PWVPk7zO+PQ6sCv54j/0ZSVBfCUGkotGjHwLbmDBSqlB
PVoGMycBxOTunuFef7J3AuaZ2UomMKFK5A+U7Lnc=
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
1N3bSt-1n1VCY1KyJ-010gWc; Sun, 29 Aug 2021 12:46:37 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 27/33] gnu: Add rust-tree-sitter.
Date: Sun, 29 Aug 2021 11:46:02 +0100
Message-Id: <20210829104608.3103-27-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Q7/qhjfp/vEhM2yo//gOL3TFTKN+mvIO/ZQlj+W7YrAZcNaesGy
HAYUF053NFUYP+HY24wMau7IoER+24tX6wf1bCNm6ckSyD3meLDGpRWhgUIJpJHc4NqLnHU
S8GknOp/LqQs4bS0W3n82bsTu+PKN1qV+WsjcXuzbDSEAMdePNp94SIj2I1WkEUF0EvgD/O
JnVyMnKr59uPbaff/qgog==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:kUmO/jb1tAw=:6+nfciBmFruliin2lNfIJS
II7+06ArnnCEmHQcc/ulwVVXVHS4l27Q3rhMLJT5cHJfMPempwGue/k4nNiIYEQQe4E07ggaw
IvTPVtCdPA/HrNSdzvY/e5BKIwge0qQf2BHbbDg7QNb2cmFe6XSAEgeuh50BDJNCORGNpKy+d
a+E+97+SgJnJrMV7R73X5kLIgSFK84ldcIVDv7YzPCOipu9oSFjh5LA3tZbqKlXD3glvNPCwQ
qy9+j+Je2lGKsrdmWBQWpFG1yY1CSU444qQmyJou6OUO5eiJ/5nvnFJS9Zr7iSQy5G/wVXuqY
xl7KgsVlKNEgZKJnGIr2GYMW15ZybjWSAdFrNkAg1SeerQk9ZugJnTWaAxlZOEeeNTJ99P4jz
3rXB93p8gkOX3G9rqCrDVG/209oiIOGLQ7HnlbHjgBpUYYELEInXPL2EGUzFAdFxGRyOJMeG0
RRWxqMvrFwlFcUEPh0GaLWdmRVdo1eIpGOWT2Cm+Bl2G3Orvsodce4HMW5AhF7KVRLa8dn6m1
lqt4/JLrBCVsyJAD9q3DK9LOlRJBu1UDAbVXW5Z26oJxEODxGzqG3DKJpQ+94IBWWnO8KQsbh
pDwVKfcXyHqnhMXGd/4o7VTOBT+eLEofcemFC7KRkSOVBUVC/ic/AE+FGzElTXkkSlW6JcTMZ
rwA1T5NyE7qdnVBhEoXdrFKNe7CkoAilo/jmF7/7u8IhIParKXKTNVEIamtdDQesP5wYPBgZC
fndqz9IJTaVXBAXSr8nlJDEtH5FShd78McEmw+LaWQDmtRPEiEtBPH5PfzmbChhysqLr2Yykj
GvJ6pLWGE7lOx3RamGv1QPC792mJK6RdE1iRZ+r/4w59n4GYkPC48KEbK8cYs5RNgDKC08WJ3
8ER+GEUcVHKp5f7rynUZ35KtpQ4/BJFk5o4ZE+dSpU94QHnerPp+lBalg/srCAvcmPaF1/zgt
ojg8tMZ4/Ym4DOH4v4q+zNFKO3ljaVaLRC0Rov8+4D+vhwSc1HPdVEHQI0Wo5+e0XNguFAcT+
fsBRRpceynMFkQGBFBNY+MAdY0VXocgE+hi77ht5Lh2Lm0A1LF/qrSNLQlId7enOUoYR2rXFl
2bPzX2DjnHyoR7lDaFOHOlnwNio/xft98cIRlldGwC6zvLEGl7r/4ir0w==
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.0 (-)
* gnu/packages/tree-sitter.scm (rust-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 001322dd84..3357fce4a5 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -21,6 +21,7 @@
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system node)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -134,6 +135,32 @@ can be embedded in any application.
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+(define-public rust-tree-sitter-0.19
+ (package
+ (name "rust-tree-sitter")
+ (version "0.19.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1h6adq5kqf4izzsklch5lfxx2aisxga463zz7w44rgwnck16wwmd"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;; Running tests misinterprets comments as doc-tests.
+ #: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-public tree-sitter-c
(package
(name "tree-sitter-c")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:05 2021
Received: from localhost ([127.0.0.1]:55593 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILB-0000FV-3v
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:05 -0400
Received: from mout.gmx.net ([212.227.17.20]:55045)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKm-0000AV-Jh
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233994;
bh=m21stkMTuP9i1VEmSLM9SHx/4GfpetrEfJ7H4ciZ4vQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=JSxrKqJ8Asm8u56vsjFYN7534gpeJAxHp0H6Yyarnfx00P3hUnsgCvrjXFW9336R+
x9XXfqHiU/Kb3S21/HRVOAWypBcrVBsHRJzcWTPyGQvW5vj19Vd7DpRNRY2pgGgHSp
ffnMeGzCLr2nIWiQu5CCpk3na/yuE8QtUXyWLVo4=
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
1MZTqg-1mXxLY2Wvu-00WYP2; Sun, 29 Aug 2021 12:46:34 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 20/33] gnu: Add tree-sitter-json.
Date: Sun, 29 Aug 2021 11:45:55 +0100
Message-Id: <20210829104608.3103-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:XX9nYRVDA8LwMx7KpipJsWYj7X/yFzPTQT60H4r873Rnx1+miL0
lJWcOaZx3EExPtrU73jpOnzKpZZp4hLUly4RWHWVPiUmTRjIKLmYK99/E2Dx3+Qe6F/Uwhu
z983bw8sg4FGw6464z2MQYeyVVO27Kg+jJj0uu2N8HJpAeO6e8r9/V0S6Mhc2Vv1xltocN3
eF31g5WqSBSCnxJkKGY3w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:1nNmsM8OQBI=:ueQDzKp3ELm/sAQbf2AYz6
9Cl2drWDQBTi1J2xMI57yNhyh2+rDkJdQAahFPpZJm6C9whseTvRBa6iXxiLkh/qN9RClqWbj
yJ4QqiGOlBSP3NtqKkRIbDSAS//ITAbApdEPZysMW76PSJyKcWFXfXYaQyk6emA85BsuJYdJW
0QXjZzHsveVjE7fBh5nluXxpW+8JNVWy7PtAWk1+EHSAi548KH/K+MfeTJgJWy9vUbaF8J0DT
XGj+3Ah9OwDdCOEHhPCo3C8C6qkA+oIlaXTGmoKHgiLLwAdnXJIvfpZE04TJIqN71aRvajAN8
BCNqH3KpPlF3Qno2jxoiJw92n1s50QDTuPPIws/5ocAmPzBgZZOIneeD4Eid0vfQbuOadoQov
ZLFIkH5YGDnTKDX997Pk2zdKXW9F/1bUPJ6RG6CIOElhm7lQP+ZVMznei5lUJmNv/BqboSoKM
uMYBiGGeF3H2yDTIC1HRTwFvBJtq5WGqB5ri5Xzl0krOz34dc3AFpN9uePoiLIazJu4b/47/V
CkQo0YGn/w0E31xI9I/FpEdRQo0cbp9iwEo1Ek3+PQw2HV6JTdw6/w0as7LQh8wnS+NfpQQTT
sRsLXMsjcVv4i4Y7MwvUuK/ZHwT1FvgOHp2zArDFaQwOZfoJwmtTNT/a1nSZwlBr1rCxD5PuT
x9WW5Pkv438UXm7OL0xExwEgHZ4QwjeQ+s2FF2WslMZ8EABfEKGkkJEGuotXwThTqXOLFd/tc
U83pGGmjipS8aP8vHackLVkPHQAi5NNMo1p9J9LogfqawmAGqeyt7G8Ly+uFY9u/u5b7rMjzZ
b/9KIY/FN3ymVb4JfCo4skKfRNZXvZ+lNNrY9ArctpsCDlgGEWgan6N2ckfvdjf1bRBKQkN6C
1RH7HCDwtKK1C3TQvfH7up5qKj+yT1+pPG9ngEl5clP1U00OsPJ0qMUH25xA0bZoOp0bIyLeZ
yhmK1P7kiIDzYqmLPWuRgxQ0ARm72tUvd0eIVRYbclbPua8GG4a/IBgRPw3jrEL7CGE0Oocwd
2txIlwdlkSB10eMemPS2ELfHJI6JU1NiUfKoyLSAgRtA+LRC5tF+QApCSli4fA5MaT85/ggYt
7S6byQbIS2Mjkiv9VAAy79RX4VxcxcLGrK58fOLyBc18Eci9uNJaCmH/g==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 2be6b15cb0..74249b2aca 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -384,3 +384,23 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
"This package provides a Javascript grammar for the Tree-sitter
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:05 2021
Received: from localhost ([127.0.0.1]:55590 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILA-0000FI-LK
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:05 -0400
Received: from mout.gmx.net ([212.227.17.22]:48083)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKm-0000AS-4q
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233994;
bh=xnJd3Sl3lK8AQ9+7S4G56gApR1414TV8ev9BXbCWcTI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=VkuxR/GCDnrTqhPeDg/CL3xhdiJ3DFkwm1A7MMzJUE9Sii3ww6g6lY92sSsIgtTOg
+GuNB61YmCXPrANXHFiZKfgE1Lc2bqFUH0qoMu70lecxGR9VWnhT9g93ecIL94SYW0
nmwSs+JCmcBzGHGwwW/UacuY7j39GsxygFjH8sig=
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-1mWJS21K4y-00YD5u; Sun, 29 Aug 2021 12:46:34 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 19/33] gnu: Add tree-sitter-javascript.
Date: Sun, 29 Aug 2021 11:45:54 +0100
Message-Id: <20210829104608.3103-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:gGmG8PGqVkWHD6NWyXqW4GlUCTI0cczjP43hW50W1rX/ml4mNml
nuuJSvsq8XmrbGGJcJb2gYyEOtq3oAwoooAQxvpgtXu8HwGzgRxpVcmingbOwS1MnPfrNtL
U3Yjpa3QqirSP0Un86ewe/RxdRnFhHeMjyYMLDBRDilD5GIZ3WM0cT6QRPjKQ8sXAAzrOHl
ChjV6d8jZstABNjkwV8Vg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:PO+pKvB+arA=:h6iQ4G9I69UjRsq/VkiVGB
bVmNx12JvLTcCFfNQW/MqO3+5qkRodjvto+oJWWXWdIZS/NQ1pw3mfD5IK/LkualQxk9JsHZv
IOYiAEBrgFQ8SmgrpeTIJ9w+CZsHtiJSBczKGC1SjV1YIu0uSrlgSiv82eUu4SR5moHotXAGY
zIV1F4Xp9V098feM9Tswv0lf/Nat5z/0P+EpZzfyaZrhSVuqr7fjxDiFAx8tWwDED8CD8v3/q
RAFgJkCimV+1GvNCNtQtAMf5KidpM3xVBlUOjPpUckgKQ6T92vKXlBD3WsjdYost8oJ2hLKTq
WxnRSNVZ9/FrIE+6A3BoanFi1nWywd0CclGgOEl2yIPCBFAgkuKbffg2DkmQn10NXfNWclovt
p3yiNN8dXD2srcjBHKspn3/fzYlNZYaaB3uP6y9J4B3gkPmlop9NxfVRe6Yp0FKiWXikwP+fu
3q52foQTPlLniIvXqC78dudcBZ8Ygbxe5fXTmBEyKr69PAtJS3EXI9AKzOhhmPHaTV2AGvA0w
842mgzqaPIqLYiW+ImMwYtee6U1YYE8yjYe0bYDFYmW3wpABQKAxp/1gseyUaGuvHlpl8f9Sp
g3tldPtcw/80fVIDI5b7HhDgOTSb2MVtTed0ckS6gCJgBkLVhAky96vIufnZ9S7uTbUhi21vM
s3J7NtkrzBMh/pYAYrQyVQALDQGJZFpkzughQeaW2vN+6nCISPXv8Gc4F0mMG3AD4hfAjNGrA
tHDmPuqm56EhhoULUOMfy75mOaBK2WZ4MdSCCOQg+GfDtDDGya1oEDd8BnF1htK6VsWzJyTxx
Qx0FweM083rRovhVHQ5yfkpjrDKYIxujHtdKX5KspF48F2IxijUnYUkSGHv7/cM+JvzScg5+U
PXxVbUC68VWoxqhT77Df5reiX+FTlTgihCoaPRJdZiXOpjjoWfSG9zFog9SGi94nQRESOn+y+
eddYzVHILvIzeUWBKEUTfbOtduj3+dXsMUQh0zVtAhlxHvZYn8/seMCWZ2kKEvfjqfA+l6oXN
FsWVoKbcBrOHaXbLUckAy0u4mZmaYvzhkzHLtoq2VJm/1acACJscepcVdb59Ps2E4Tp3Tjhf+
udl/XYvtVatGYJVOsNsttsxVKSBJGmvpz6T15f6pM85dJfRpoz+cI6o8Q==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-javascript): 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 174f0923f8..2be6b15cb0 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -354,3 +354,33 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a Java grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-javascript
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-javascript")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-javascript=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "063va0s727yzhy1cz04fipzwwbq4af6fhgka6g970hk9yf7ggmnj"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides a Javascript grammar for the Tree-sitter
+library.")
+ (license license:expat)))
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:04 2021
Received: from localhost ([127.0.0.1]:55588 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKILA-0000FA-Ay
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:04 -0400
Received: from mout.gmx.net ([212.227.17.21]:35853)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKl-0000AR-UW
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233994;
bh=4xJuuTKlcku5sH4rT0cPJK5IoDn0xtD4L/ETf2qf/NE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Q0XqY7S3HPOpyAOwVC6uwb+NxxFo1l1dxDYcQQs/DFS+dIjgvyRmGP4IFv8RhHJ8D
yI79+9uycagjbIvBpYSr2xdt8WifDTVIQ4uccMx4p/JAwsRxmJsoDgnFKoP0Q98AbF
iKj4ADgJupXxntc6O3ipuLKwK+ipiyON2i2oGdfs=
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-1mINK106Od-0049WT; Sun, 29 Aug 2021 12:46:34 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 18/33] gnu: Add tree-sitter-java.
Date: Sun, 29 Aug 2021 11:45:53 +0100
Message-Id: <20210829104608.3103-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:5UHI4Sx86FNRkImrtxuUYdpIEsYqthLfR1p6ICNLQpDXK5CZj6O
2B7UGfrD0tvh7JcR19lYHfSHQYi0fI7qm4rik1YRKPBeJlS0xxkpatwYjmfbyRGsX0tcYxP
dCcglf8ZYK+PxqRIAonJhz4yD9eybcfyBoQn67yXhOHtOItTMbF1tMJD98y9pS8/+4fAo/l
RwexzwsIwWvQwKREhDgBA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:HBfhtjoR2vw=:XtDr5vN1nkA+o+0fxoPx56
J9cuzDIW9Q61QWkw8ueVL+hpEDTMCN4oekTET5Hx75q1ujuY42a8C603H9k4I0zKGbXRSfsP2
ExKcF+ikvqUCXdj4cMTVJrSWiDvmNfr3a1rcsamXKON/GMiiYxgvrCNlBUyLnfeVSSWM3yTnc
uxxsH4ipAq6Mii3VKrHx54IFJS/mzRBQjR8WpMEtKIFBMa4qSn/4x60Pak1XxP1tXQdyQqMSx
hs/zVU9NqJRgkom0PrKsI1Z8Xb3WRNrErUxEMhCHAdRqO7S9C96FeGtkwAczieT0NkRRlXczH
f2gVotHmLBuMUn1Hn2p3yc9HWqShcf1BC0rc7dDfTEcYOupagyg9b77vOjSNqy+huAVC42cFc
zft1BGvpg8ifHfMkMBOx7OlD0AF8I+wSic4dQYTQc+qijSCxdAA0W4ED8DW+p1IF9dBFW52BE
FpSW4sbhOmASyrRrclfsWER4lVEdvW0uvNSqft1+nMZPcEhd2MBx5KQuC1e6OzHQ6akJqiJuJ
dL73SVxXTtC4qv/n7zJpvh8uuaSckJI1jfObLFMlg/Dl81S0FNyi1aDT+IMfbJcIDT8ILOgcY
GWfwdWeKH+FcJYV1ZR2Jrv7K/66T1tP+uaG1rbIKNIrMNrp+jOyDMVFgjaVLJ9y6YTrLydR8s
s0q/bnAufDvCPuqDnYXwS78nHrnaCLn8MSZvEzq1qqCZn8VTCllz68oRxSG1GiPJEVDKCU5Ny
ib7c5tfLe0g07DVD2CCpfNtFUAhVAVEdgehbgEbrxh2ad4evUwjlXNGqhWmzbTq5EUXh1fZem
7rW9Onk4YsyvxeNfr6SlP/i9XER0T5KpSTUuuX8QTDJOH6kHtgl1TgePSFg8g7i5g/jH2KEKg
+95v2peu4poUt6ldRvjWRt/Eqv0PXvF9QMnOkXpKBc6HHoYe0rEA6GSE3kofWcGgqebSYARGu
rWumRMV6FsTd8okXdWQGq54wO+njvPUVzSzywSw4lun8MLbp1I1WxSYum1mFy/DL7P8OnsV+0
dpYRTw0rDEA95VTIvDZ+dPxVDLSuMC6fvb/pTSfn4lMk0oMTeSAwsiUsuU6jJDSFyFI0nxkUu
vu3j0TnydlxtSYZ4VBk4edEEH7J76a1uc1RduYMTK1ty94EqWeQxVATJQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e2a0757e30..174f0923f8 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -325,3 +325,32 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a HTML grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-java
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:04 2021
Received: from localhost ([127.0.0.1]:55585 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL9-0000Ez-Ul
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:04 -0400
Received: from mout.gmx.net ([212.227.17.22]:55159)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKl-0000AP-L9
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233994;
bh=PCYB42uD36O/DDBscvoOKWNa6YKXS5owaD9uplNvuKA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=E+wyM+6fIcN8B7lH51amBbBgYjxoCDI9j24o8YB3gHhwwMQov6vxdiUvT6gau1gsO
zTjV1jwmN2G1pZo/ZLmLAcwx7jBTHxld7j6Kv4P3XXksi0iKnkhZlBd1DZ/PKC8sj7
+NVlwZJcK8W4z67KTo8poYEiK5w3E1LvWG3kQHOI=
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
1M3DJl-1mIvHo34s1-003bIB; Sun, 29 Aug 2021 12:46:33 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 17/33] gnu: Add tree-sitter-html.
Date: Sun, 29 Aug 2021 11:45:52 +0100
Message-Id: <20210829104608.3103-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:FEfgHEzI1VVOxDHp6WC6G5jOxM2sSW7HG/Y7akP3AveR1lyZzte
WTZya9A1avgljNqbTk4ncy49+5/rgh2ZBv74uK49zqKTD3d+xPuV9kkIJeC7kEV/eFB2X4D
qVxDs6e9Wl2ljjoy/1QKJqzDJMutCznkJgYlYMr65h6AnzYXzw+RT6U04zBv/sjN0dLQStR
BHqqe+aX5A9iv4/DwPHXQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:i3x2FIW3N2U=:CZIneGyL6xaOkEA9Z+VMMY
YKnQrkZc+LsyF6z4ax2jXz4yzoUaLxCyjQATV6d6U6GX/+7/la1mKVBuVMCR8G9F20DQwbY7o
BzrRDx8DYhBwOBjxUXTXLE5OutPPqoBKmuyLMymYdUIJ2qIQHaQv8CV6KU69uIrUAbZdAKVMZ
NQO2wWdd/3yC2rKMtIEWTNVdFEM0B7I/cdAuYRx5QD6FSeuKRyeW5k62TeOsr4hoDVc3ks6vY
QQ62aptdG/Y/KZVowYIhjnU0GSf67yUQz+Dv1OD7wTptJ2PacNKmqiMwGP4gPlf6BvqVLuyWc
cw/08blQQ3XaElSyqj8Y/MHkIhEnqAnPufO+B5T3atE6acmIs3TBVvfFv5nRC4FBqL8EGKhRW
DfMOejhOjvXkGsua5Vh8okKkfAK/AmK+HdcObGI0hBQ6a1YYWIeNYjiHe2ajT0p+YQW0hrXGH
LzBZcMlnOtRS45Xq5Hdnu1NrJyUHKaQp5ZdVk7H+6fO/KCDUlN9bn9ed71KuLO4X0OiqCRVfO
CjwX4d8pdji05WQ1vZsy/bZ47Fs6MaWgUtfmTAagsoLPgtvoo9PaUjikfknTiNKU9ikjZx7Ym
cW96aXGNW8KEq7IB7oEHJkBgTVf+KbhoQ3n0QY6kbRAKJeFWH8KLPfb7PjLfy12+TcAEAjOmn
/mfOjSSvofBJmeFF1C0ThFJXU4Z9PZoc/zvG8ANyE3LGxVW0sN6GMoAnuPGGO1hBwBH2cvIRE
dLCBIty7zVRdl8gzsNUZAwNdr7rEkngIR32XxDTmIooBtpnoL+Kf5FJVZuXxx6KiTdzhhpF89
yGIk/CEdyODCacVCJu4m44dcJHMQ/yQ83hPp3QWTdeiY+z7zcsjWPUbQJ+oLCbl/0pQiBfMla
pNNDucZMcvv7MGK1AVXV6nTxMiM74XiUgfILVfzTqe+bRN2b1K9/CYsi19Yr7ESoRUhgCwxyn
Hl9A11vJGq/KnSvNqCOgtRrPWFlHVY17Rj6AxEKbYu8rrg1M5pB+iPZRZjH5auFuM55AAO2+a
Mqm/NvwrH3Dfcugu0ERLGy9AUUleDxKeKdt98bG8M/9noxOHijrCMBItsMhVBd6aSVBQ86qu4
MUVZaGHBRTLblxu8QCVSZij6C6lS5KBDlb1/aY7kBSPPYTjooS/2B6MrQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 5cb3a0e76b..e2a0757e30 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -305,3 +305,23 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a Golang grammar for the Tree-sitter library=
.")
(license license:expat)))
+
+(define-public tree-sitter-html
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:04 2021
Received: from localhost ([127.0.0.1]:55583 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL9-0000En-Ed
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:03 -0400
Received: from mout.gmx.net ([212.227.17.22]:39841)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKl-0000AJ-6Y
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233992;
bh=DSoJwaIBQi5yJ8i2s90mTQ96yHRoG2wAxhHJ8eocWqM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=dmUE3MNDuL95M82f7aKPr58/bfs6spvbvAJcHszOR8SrFr+B4Ef5NulEPn0iw7PGa
wI7p7qSUXR3Zn3rNfgEmQt9RCLpY3hwCqoDvQlD/24Ykkf+pF6hIGm1IjqR2vvQLyH
827UoDealNFqz0apjakNkXPWOwulQCBwnairopG8=
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-1nAKt9176x-00rqnd; Sun, 29 Aug 2021 12:46:32 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 12/33] gnu: Add tree-sitter-c.
Date: Sun, 29 Aug 2021 11:45:47 +0100
Message-Id: <20210829104608.3103-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ZAXptjxI7eeP8gQ/T4vK/mVdZb8sENma7UVrionjj6vkjUwGHLP
l8KJz0f0tzj8slVTeNk3Lb4Pxx1w6OYbBDqLlmrMPIsYIUT8BGm/sxreK2YAhPP2kwL2YES
cFlT9HHKOopWG8+4IktSzmn9i3x57DZMw+sGSoOKQzq0qdxyDm4bEYoW6xNpd8WyUS8mR+R
O1z1as8fuHJfnivhuepnw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jRo8doZA86o=:+hKxO57hE6NM9a9U344RLe
/Wv4C+x1xi+pPe2tWzDv4bbqrTVAVlefTogQrbblrQHH36WZDMolNS5ps0vA4pfZGtqymz7Kz
J5gKMOlfo74Y5T+1WzEo4y6F1jxLUib5Grl8gBNuZownon75ftp6YBMAdN3NF2XkshtmlrHG/
hT0KX3ugXFQyIHKtHKSr99d84BAMHaRIfHB/cME9MuTomTqrrrQYAabPs4ioMBeI01LFIpM3N
k5igJjVYT8RCojIVi57kMx51FmWYuo/vp7R5iJURUNQ7NyIwue2tkBVEDAZr2kKh3OTyudGQM
8LJsGFEYhrAzOBz6O7aaZLMOOI7jCLn+CbJwDz96Va5tJWVtjN5bNOhX15QGciP+rWn1+ck2D
vRHDon5n/bsoMvTP8eobKyXRJKYOfUr7H7uzZ5jYLDFSl/Zsvf+04NuOyFCnkLU4RTc8FEMrE
DmAjRHjErWDJd6xj4amXOYrqRRvtRm99+aBzWySgm5Y6JoLL1mQjXteH76ekBOi2+9gXR27k1
Y0to6NpqqmmZGSFE51IBwpiivrbxtq/lpiZt3qwTAL9CKbLDf0JRuK48ZZm3mkkGcpYbHJ2B2
tDXNg0Vtq6nSsN+0ToXrsVQ6JuG9QEWs1TeCS9nCbQWU4AW+e055pvcU0ea59rvlt3ZkIZ2ay
Gq+5IF9X3Sy9mkZBEuxhEHNcmphPvPmj1kfVdPcvckONhrioDwJ+IKB18zVzBgZPBxc2Jfvk9
iscJG21IgTmk/HdRJAdrQrjVZ2k8p6YH5QcHtIpb9qGHPyFZn8pDJRH8LfjWDHHiA1wKfQ2p1
jVsuRCvtpUyXADb+NMCzlytVbKVx3PGGN4ytq6rF95CjygUIUJgdzIyAwrG8yrQtgKlZTwh46
34hRvFmV6g61aGj7nhXIo/CJHGrbKLF6XLKd47fu+x2B0na5gFdJtr+eYgRyWFU8Epz4o0re4
ddbI1H1EecdtpjiEaRicFZW1kR6obJimXEyNTEZIGIJBU7wK0qxxwwO1V28H5VX+/UJslw2PY
FVe+z43dYsizWEH5NIDDwokvQ00KhP+qqdUCDOP5ygq9VmwjgEnmb2+Dvg/i6fFR2Q8058ab5
NFcHZw/oXTQMG+IBfjvOUEE7M3BnNa5hg1x2jTjWpIYVkFvtIfkmaCbkg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c): New variable.
=2D--
gnu/packages/tree-sitter.scm | 63 +++++++++++++++++++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d8d4a305da..bc04a4a5a7 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,11 +20,13 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system node)
#: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 crates-io)
+ #:use-module (gnu packages node-xyz))
(define-public tree-sitter
(package
@@ -130,3 +132,62 @@ can be embedded in any application.
This package includes the @command{tree-sitter} command-line tool.")
(license license:expat)))
+
+(define-public tree-sitter-c
+ (package
+ (name "tree-sitter-c")
+ (version "0.19.0")
+ (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
+ "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv"))))
+ (build-system node-build-system)
+ (native-inputs
+ `(("tree-sitter-cli" ,tree-sitter-cli)
+ ("node-nan" ,node-nan)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; tree-sitter-cli is listed as a Node.js dependency, however th=
e
+ ;; node tree-sitter-cli package is just a wrapper which download=
s a
+ ;; tree-sitter binary, see
+ ;; https://github.com/tree-sitter/tree-sitter/tree/master/cli/np=
m
+ ;; Instead we remove it as a dependency so that we can use our o=
wn
+ ;; tree-sitter package.
+ (add-after 'unpack 'fix-configure
+ (lambda _
+ (with-atomic-file-replacement "package.json"
+ (lambda (in out)
+ (use-modules ((guix build json)))
+ (let ((package-meta (read-json in)))
+ (assoc-remove! (assoc-ref package-meta "devDependencie=
s")
+ "tree-sitter-cli")
+ (write-json package-meta out))))))
+ (add-before 'build 'set-cc
+ (lambda _
+ (setenv "CC" ,(cc-for-target))))
+ (add-before 'build 'make-files-writable
+ (lambda _
+ (for-each make-file-writable (find-files "src" ".*"))))
+ (add-after 'install 'install-native-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ ;; Invoking `tree-sitter test' loads the grammar which
+ ;; compiles it to a .so binary that we install.
+ (invoke "tree-sitter" "test")
+ (mkdir-p lib)
+ (copy-recursively (string-append (getenv "HOME")
+ "/.tree-sitter/bin")
+ lib)))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:03 2021
Received: from localhost ([127.0.0.1]:55580 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL9-0000Eb-2h
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:03 -0400
Received: from mout.gmx.net ([212.227.17.22]:40611)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKl-0000AO-CY
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233993;
bh=EWBnebpNM3OBdhNzVFkv39ZnKeZoAiZCfe14kQyRHmU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=CkkHolk+0y49mRyw97w+NOVHbh8KS+9QFYRu44GBsFqbelya0l646CfNaq+24N41w
3laHSM/a4AMuYz8wEbtk2oX1iuHe82knjOFJZkHOWZf4qWOBCpDQOz2EEGqnvejEPe
yCIrJGvdNZTTTYMtk+VP27zyYHWNfHnSwipn55Jc=
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
1MnJlc-1mltKH1pSO-00jHpK; Sun, 29 Aug 2021 12:46:33 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 16/33] gnu: Add tree-sitter-go.
Date: Sun, 29 Aug 2021 11:45:51 +0100
Message-Id: <20210829104608.3103-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:9S98DgeooSsGIw73KOLVTvzZgt9bLhFlNFQ8Tk4D3O82l+64jLn
zUQexXcazJjk1mjM6QcNAAkZgzFdhw1XhOxuzbo2b2delEhNsc8uPiUFsgrVSJKBFGbh/6f
rLNHeLJnBzu7Cvj3IwOetSGrr4ppdcg6ddoJ+8EFFfbpfa9F5gewPZKdxRioJb4hWSw4pzc
3Vamg62xTsdGROdTMOzdw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Ul8wfoVUZ/k=:hHcD70Jy3sDQ+08RhU/2md
7Rvwfjshppgp7D/GYt/wJopQd39iG6G5T42cu/ryZILxO4jcdOH6Up4AnbCmJw3t6fydAGh8W
1og3hehed/ExUuMiGYGszPvwpnZ3aviLhYVOQvRi0Li2UxCwRn1J8+UrixQbtWc3F19CR8/dc
f4KGtVZUrQPNzaBP8rhosEL5sAwETkr6Mb1arJmcMyZH0mzNbTnHQjq9S+UCMgud7W1hdxzYi
hMQ+zxGX3gBzhrPaV2/2cXZkIMcZpCL21ysqiRmQ+B+RdlzszbFNoZyKrGHG416QKS512zO3e
Y4oZ6tfUfdzFXNSqwTDCy4e1STngWI3VgO9qJNBfckD0hwwirxbdq07ux8+4EMnbvpe7wAVnc
LBTSb5rHm8Z9wEj0CgWTsG/dlEUh5BzWlkxzej8Dh8Avb3CDCh420QQctR67SgGjyG9fMqx++
N/ENHX3tMVLgEcbMRAduhiIdkYsQdPdsGF+nqu9TIBa/m0vdBmlYSkTaihWrOZfMqeT3Md9e9
O3tTelkeFW62OLJ8at+QFtpyBuc+p89JF7XXk6AM6LMwAMZElzpAEUGlYX3AD9k+uBbiBERfq
+bK2rRtJT/9PXXbfhdrGZobr1l1Rej5wMuvOONxaKLRMKVxbpZc5N9bJRP5baxLi+ptBrzY7U
V0EqCqPT8UUAJUbK96zgkkOiF4Ht5iCvnqYrRFYRujDqqpXbZpU4vRq/4KhCqNuMZT3vsuj4Z
jS7qpqobDJQ141mMv8YGiOgoZ7P7cE5y22qij3X38O89I8AGKNwT+uHEJk5DRvBP9QTBUO+mJ
x7itRK2BX6d5+PSSS7G6XTxRRgfdy3x43czbKX/ZBQfoyAx5JPr2mTJvrd9NdIf4aTY6Ghegw
Rf0VRFh6YCHwjBMe8oPLcO/rTHFTQT4Gcg//RvRvtAlOWiSBLm0FA+xe8g9/S/gBeZt3U76So
zxRml8QI0ilb6FtHOLijKEcZrsZ6Z8bXGuZlwtPIb0lSiFDr0XUJNXGaViRchc+HaHW9Pd+rb
8s2igvmTwS2SqAhOW03KYqZLXs2VjceCoSiQgwpvRl92LH3pOzD5lymSz7LjJ86AnMJ5dgEpA
CIdGNFIKkHUhy8PejQh4e+aCE56XzwWRaYOLoRS+neUOxtfZa5uTkG2hg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-go): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 592a61ed25..5cb3a0e76b 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -276,3 +276,32 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:03 2021
Received: from localhost ([127.0.0.1]:55578 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL8-0000ES-NY
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:03 -0400
Received: from mout.gmx.net ([212.227.17.20]:35831)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKl-0000AN-0n
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233993;
bh=sBQ4Zm9E512lrlU1CBov77A9FGzPDpEiUqAmgzt4qg4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=aKmvP2B3RR2kC5+ABmq3+pBTQ0XTu0WC5K5z//tBNKbxtQ/pM49bfOnVEWuKxQOud
zWzxbraXyUUpnmTaa3jO3aVKqomHi33/eSPjlKRbzWltMBP4C6Nx4atTVv+fxW7a/y
ZWk2oPkCj+kZokjlghTp9qJa6ClhmF4W4maJYFbQ=
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
1MKKUp-1mZuCs0c2x-00Lotl; Sun, 29 Aug 2021 12:46:33 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 15/33] gnu: Add tree-sitter-css.
Date: Sun, 29 Aug 2021 11:45:50 +0100
Message-Id: <20210829104608.3103-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:/qvaUDfwQPbEh5rQ7Hmek2L2O2PziI5RpzAoVKnw2P2XRKJDaqi
G7vqn9eDTsFH72d73wkHje2BykueAWJ05pdON5lSzr0R9quDp+fAps8t1Ks8tlMc0G3qX0H
s3sPmMerOzstFFUMtVvmcJCZBXrA4qJnGoPoGlsAoUkUgCV/+0g0gfoLS78QB5tEbPfPo+I
xzHYGz0yK7OxG2sdcZEJA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:78XOD5TU/cE=:4EWr1XrY2GSkYDLumlh6dU
ak2u5X4I9FvilgYjGBZ4LfvTsuEikeDn0AyCX1zO6GJhO3Y4NwF/lMD0BAjK1QcY8CUOym8Q8
poFIpIh5quwmQpNR9waszWKDekO7G7ODHhBdlRrpYi7IVoh9gNpr0gMgm4uPYFtlPa++y2HDx
ODUdQ4cZVtmru3IDSlR1+uW74L6IYbZectJvkn0uENPpdjchkRiThWNvi3oaD2ww95fWPQnj0
Gqm2RnbABf/MTFiYF/J9vrYhLpCOGzp373gsRxuyHddGB7NT9h6KS2+ELHScB3TA09SteZfGG
W96dZTdyzF9POoez/j4L7h5sPePleqlO2cmWgLNLkRE2wRj2lD1mpr3Z8xJJcVNzfVJ/6J01i
lgxi/xOqLJRG4IkOVC+c0XRduOzNLkTQIJxhjCzU4qsogTokbsNErW2B8WgBKfQba04kwY/No
7ZR8X6qd3MXTbsN1fDRiq7j6YIAAEfpaFnQRaB28oSRkfimf+MZhKToyeCr51O+rHz4mJNYIf
a2oCw4ewXV6hfpstLTsor0Vwa4R812/i6B64A64lN9vNtrBI2AtnoCC/HtWLN503Ru+AGAqNS
Zl+3k0OWjygPBZH0k5phH6d3Rj60V6IP7Nu9XIU9bTbt6a3NPGpuvS6CVAZGs+gdQPUjsmEHG
ybSs9vpwK7BrsF8PxUz1/n/2X/LmIGWSWv3z3NBDzot3aBKhgfgxXERiuOsDUUo7/Q83jabWu
LwfnXzMzL9cIvrvO4wH/zG37xa1VZ2sUyLNipjr5CWR/61sTqH0ySarkJ/ViFnTXAFPCwDEgi
zHUH9uWYEsTxflzIL07KeMpP9S8siOA08e788N0Ka4caIwVD23pgq3aPwflTrNSINm4GLOxxu
xr5uwstszEHzHrP7aYqIyG35zoRWPbj520SHeKCQivgVyHSZ0E/Lev+QgucKfg4BnqduBL2lx
BWruqZJrFp+nLGEqIful9cJXfF0YWhAqnd0YKHtecTc7xeXcWad3njCFEZ3UFgSFlOuWlAgX/
MTobZRDhKrwiFIr+y0XjFhyajC0KRcBHJJWVYkc75f9rdC9+VNjsIA2l5DFHGhP3/7zZgNJec
mfn0Cop/z4cmNt+D9ByMiWdI5Re5M8usbYYA30zadeF3KJ0rqfvWr9Ktw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-css): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f98a7d392f..592a61ed25 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -256,3 +256,23 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a Bash grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-css
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:02 2021
Received: from localhost ([127.0.0.1]:55576 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL8-0000EI-9k
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:02 -0400
Received: from mout.gmx.net ([212.227.17.20]:34677)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKk-0000AM-Nd
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233993;
bh=6vy3IoYr/SLa/e4w/SsJaHk5Zl4lutEoaiNrkF5/Xbk=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=YlVVCJ0zwhBuztSsnsAYAuZlJ50RiOOVYIloJiqJ+z6am6yVRst2takXx9C6IDU6h
UhynGnJwoyXo5uHzfEtS6KFC+fxBE61LmPky0Y0nZIZnxaCNJXXASr3d96xnRrE7vF
yZQRYzZrflQvX9wJOzmmt14670NDzHpnvTXO4R0o=
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-1mINK33bVH-0049WT; Sun, 29 Aug 2021 12:46:33 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 14/33] gnu: Add tree-sitter-bash.
Date: Sun, 29 Aug 2021 11:45:49 +0100
Message-Id: <20210829104608.3103-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:NRL9WSsc3depoe8ALyD3zor6juWzhJN0dGYNwnKxuzxEBCkHlQw
ewq1yYCKIx3KBqTwEhOC9+6/l53B+KWU0iKuB5ad/ydsLH/AtbTNF0RIKd9yKrME/vYjUHu
g5vLEYXFOCwUJPlAs5zYxW7+2pdsG//teyKrDsgsHpc+BreK9MgptSmPzULjNR7ezV1BKk0
sMWDrZQaxXxPLy20yP8VA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:aluFdWl3pH8=:qy6643DOpfwUMSDFZlFIO2
1aw8ZLe3WR8jILdqibTC4e0es3Tmo/xtpn2qy5+GoO6pyIVPrzMm+z5eaad8dOGLaV/MAxXk+
ygd6J6E5A+yytYZIxbAsQPDyKEBC7fRVzcgsdE1N86fb9q4YspZirsO1gz3ZCa/L70ihN494A
HS+P/CmhBHJzhZHPeLfrLXJSnyI4Kgt9q2jxRnSI8rTAbaATnUX17IdlfOCJGYPwH2U33l/o6
ahmmmwMaYJwIOWILl5T0myjJ7UjG1tmNP1hWonL6jEhgPckQO94CPDzT5F8tcM6PV09B08SHf
cZWtLgtM53+7+OBk/9EaqGEno22l/lYzlu+XhOab4kZYU/FJNoi39a7NuF7SuL0ULDoVzWt7Y
lSDJ14o2ewbbWLvhE98yTnMNACCbkVGANjho+bsUsQogjwYOerdg4E4VHxmbK/DYGL5eGgk+U
VUV39QnlkuTj0rcUiw+uPbR6nhELx1M6Vmlt6daG3fav2/rq0W79X1vIG7RbruA/h9ijykc5T
Iiyi6VEOED+agbrvlqcAB48Rf7IUPjsmTLqCiAoffIGakTzd5pGcsjrpb705YW9x5eVipt259
J+0uGbg7nR9qhArocOOyQyvcZe8GnSr8Niywp80mWFovJraUR1kIiFXCYI9e2/7Yd9cIyU4y5
cKxTK6PKEaSzRueG72zmiWoa+mpKU9AejzRh1z8QXNf2EheYAvvMXSs8G815HIG35YRpoaz8w
rm/YmhXkW9E5TPyfWYkpBtabZPkwSUV4B0vbqPEhjev/zksdMNopT4bkiwIqPC9p14J6FG888
LwEXWnqwIbgOeiUTCiMfVtqRE4ScYe/Cm4J7+9uL5cnwdtYAmOvMoXpTWIIPKJxjBYQZbMP1u
ItomU7sSWxn8MNqtB3DbwWx56oOb13epOLyJYITQqLDZAgvv7sf8V4NeC3wsotD6xuQ5Fg5D5
WII6Zb5XjIxn9e+LnWlz0rZCjLY57OwBAJNKhoDIG7OqGMhOnY5F9mKK1YFBbBnYFquLLiaaw
Ag3qmTxgYCroWa54NGqcUCodgAldxQCqpVQIP2cYryxUD9A/LYBbqd0tArxIoA4xHnmULEBgj
HEGSePIWOMg3vnVV+Wbp8lpC1wScsNHVGq2IkmGwQCh57MZ/0Pii0Bqhw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable.
=2D--
gnu/packages/tree-sitter.scm | 41 ++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 07bdb54627..f98a7d392f 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -215,3 +215,44 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-bash
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (native-inputs
+ `(("tree-sitter-cli" ,tree-sitter-cli)
+ ("node-nan" ,node-nan)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The `prebuild' dependency is a way to intercept the build st=
ep
+ ;; and download a prebuilt binary instead. If we remove it the=
n the
+ ;; buid system falls back to building from source.
+ (add-after 'unpack 'remove-prebuild-dependency
+ (lambda _
+ (with-atomic-file-replacement "package.json"
+ (lambda (in out)
+ (use-modules ((guix build json)))
+ (let ((package-meta (read-json in)))
+ (assoc-remove! (assoc-ref package-meta "dependencies"=
)
+ "prebuild-install")
+ (assoc-remove! (assoc-ref package-meta "devDependenci=
es")
+ "prebuild")
+ (write-json package-meta out))))))))))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:02 2021
Received: from localhost ([127.0.0.1]:55574 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL7-0000E0-UN
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:02 -0400
Received: from mout.gmx.net ([212.227.17.22]:51629)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKk-0000AK-CQ
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233992;
bh=zHUhFXLhkleepxN3jx5nLi2MUSp6cMmL0F1wp/OIbW0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=cQqqxPVTblTEXyflcRKkHVZanwFRld3dmN4V++GN5xaMGwlkZkMJsx2ooiwFHZPv+
zm7gGT8Eu2B6+f1XRc2h5/RhAatPx7nTlv2bAYfZRM9o1JrA6G3dAg7GhOdJoQQ8wu
2BInpDtrME2zz+ijd33ALLrvBjjt35ML3693l4VQ=
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-1muB382LHa-00b0My; Sun, 29 Aug 2021 12:46:32 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 13/33] gnu: Add tree-sitter-cpp.
Date: Sun, 29 Aug 2021 11:45:48 +0100
Message-Id: <20210829104608.3103-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:JHYrQXP+GUSU0wu5CnIdPoUEKxAs/fscg0mrlLBPqx+xmHsEJ26
YaxOHPs1rjjOnwTXW53ASaJFZ20akoq9v/Trqukuq6VXt1CM1m+QG9Ln2QpcRzHorGwvL9f
LMt0d5UYjuD+MCCLE+jCBe0gSmwVe9xjIYrwbiOzjthELJzZeHQ8jiMx4BYs0sXr2QvA027
5vMKPtpzIosLxZ+92h5oQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:K8FHc6V5dbQ=:tgCykmi8HRTrWQyaobxCHB
RbIW0Yu2Zrg3zxEKX7WaMGpMRrs85nocqRn4N39Q3fJnTo63ecPiR1QKm+hZeIPdXxIAAaTgL
lcWnieN9skAJKCWwPLxp+3N0/DeGZRCfs+byslo4om6zBdCij+XWGGJyxpX86X0TRUypVEsdm
qapFmk5zy/43wF+jOoD9Ro/7MD3yzcGdgpnIsy2U9S0DCvlDOnSO+slY4qTi8D55cGDQ/Uu+S
EfGYBqKElGv0fD77EiwOg8gI5MCpJZ9FrE29j1UAz3NIjAcNOjY6iOGxcTrPwIiEg/30l0RD2
Mk4XkEAHAV/UotWjA+BhTZT46xiK4pQigsR5csBwIeALeLu+3GGNow9L1kMqd5EZ3tKvZEvpp
wFHILMSXNMBfJz2CEWrK5u3FcdcdUCpMXBv1gBm878mmts2bsioB2wQKn3YsMdWXFwxlpXEvF
Yp6Zh15aOda5qT6Jo6qfCSJl41hi+plWTbpzDgwth/4eTaFE6K1v2BdvveFqc6pV6IVp+X3PV
01SraiCp44W3jg/WMQn7bwtlGb1Bo1FE27m7V/SHKDhnkVBL6fka5U7z3dv/O3htri9GeATNv
V0qOSTJFYrZvFt6Va3Gg3+C/bRA2IjtALCv0EsIM4ESsO3B4jb0H2ec60gmpEculDQUQM8xLh
7RosN1xlRPYNiApqw3vvimJcJaroeov5kj0lC9Iuti0IfXDkpyXYwvBMFOzbMmGaOFnyDhZ+Z
jAC+m2qz/vLcPhGNu9ZzIURwdDgWCQaO0uvCE2b4jfowlX6E7R/+iVmYf/XKtBSb7/tbH5eKr
6SSNquDBzjJcgdujFQ62HxuykCaApdEqY2i5XvFmsGDpQSNuYNTu0gzyZzgycqvWQIrN+lCyC
EqQy7Hh17Y1IHe2l7YmZv5izBy9uD6C6eUf6LsElNKNWcAkT+BHVmjHDIjGbyK2ZIsZgawpFU
W+73lSSdsAuE45t/gU4uy1c0SOLiZtXvWv+gfLmlfbslRGX7DKo7qtM7LzNlr+U3P4NEdTctV
H3PmboG7tcN6AQWskGPw8AL0P5rD8wWBQmqPKX5afRyE4s8GrJFv4YQQhhsNtIQ2jfkujZdq1
aoQtm/oXIXhgegTSJBjyXuEW7bT7iJEVs9trn525RttW3xig4KovdXDug==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cpp): 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 bc04a4a5a7..07bdb54627 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -191,3 +191,27 @@ This package includes the @command{tree-sitter} comma=
nd-line tool.")
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-cpp")
+ (version "0.19.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
+ "08ywv6n80sa541rr08bqz4zyg7byvjcabp68lvxmcahjk8xzcgwk"))))
+ (native-inputs
+ `(("tree-sitter-cli" ,tree-sitter-cli)
+ ("tree-sitter-c" ,tree-sitter-c)
+ ("node-nan" ,node-nan)))
+ (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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:02 2021
Received: from localhost ([127.0.0.1]:55572 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL7-0000Dt-EJ
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:01 -0400
Received: from mout.gmx.net ([212.227.17.21]:56681)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKj-0000AG-HM
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233991;
bh=1nQawcoPpnQ/cWAQJ5aFPxfolfxLxPFqFzBtuzewkyU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=SCJ/ib5tsT93qIoZ3kSD86tWiqGIURASipNhpbfU8hBfBu44212uwCvJnJqtRsdb+
PHlO8U9TdJrtN7stfYFF2DbmbF+93ZWGqcvSh3td+CX/b0aGOmGfddO+4or577TLAs
aXGypzxfyD9SVcX4mprliLTkqdirgZo0X+mT6vHA=
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
1MIx3C-1mZ5OX2kyQ-00KRzI; Sun, 29 Aug 2021 12:46:31 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 10/33] guix: node-build-system: Support compiling addons
with node-gyp.
Date: Sun, 29 Aug 2021 11:45:45 +0100
Message-Id: <20210829104608.3103-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:V04dxS/jfa51YI1PGQrLluiANiNiGELvjQAN1xlG3qV87tsV4H1
PvrhPeX6Nq5AkZiZZItprJdVeUX1ywHZnE2smJ9YcfwnACrWiU8iB5dI/gFBglxMjT9eFkP
72RhOi3nYnniLuW0QLvuSvoECEhWUksZ+vmyhKrVkt3nhStOvXbz28B2o5vQfXUHdREc6fF
MUMt0g8PiGaAiGXfu7dfQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:qq1IjGjISEE=:IwWl2AzOSrIN+OsstozEx+
zGmdBEKF4ei7wNcAcgp3Fi2fAWnS3icRKmpJhdUG+ypNaOKb/nDDONbi0v5Ot/FYCur/6DxOd
JDhh+3TOZxayguXYycXQkWEE9n+oZNBZkQVxhfErtKUT0MAOBdXz/Ps1s1v/9Jpcbq5R668v6
phLzfTDnr9trFNfyuoSDPioyptBINz9hsNELQFcKpDnKF7DhPmVR7W/oQAQldtj38g/F+cjXa
+w6I4O9db36VMPVMDUsv9TWFr8k7qQG+/idV6dWDVxugkrWZJV93fAkiyt6aMkkiKwOH8hOlU
y7aSZHYF27cXHpu4rCeoQwKVXHaMeXVxLe0j/ZKUbyZRZneztzYzDKNG2s8fslLy7OdPXcmna
/4hhKocrKa4zgHd1ScnwNae8idqqD8IfxP/EaHM2uhr10R7C6i0QeLHLRpAR9HxY58Jetd+r/
MU9n8EoaVDJxKl4F+BIK0hexZuRmjbgJ8zUhe45AqgspFEQnn/eCZ6210Ooeng1LHagJY4D/Y
qWyL5vNhkZqS1i9U9Nqg752orROJHr1Lnpk6t9H0Bisf13dEN95maObAdh4dj43coj1WsxAv5
EvGApy658XlGA8v2ORE/iXDmzTbT+mh2GRjvF3Ns4R101Pc2YMPHsiNzyN2WgLkuSP9FUt9/s
6NxrY6W0gMciGjcUBgLziyDtCJGyYcnQO+gr6aIyqz+W+/oWI0dQXVzeOrAIyuRd1EaKy8U1F
vhqmdgGs/oTh6b2sCB+6clGgupjcsBnM1G9YVZVQn5kIw3J0VcxAUo5k+RcWyC5gbPIy3AmNU
e9sPkQs7zlU186MndUffpbl/KmpC/pj/tWEG7rMQoIKSGci4oNvXrTW2dWe7PAr0BI5767YKU
Jl/j7JNv84qosThbaa+RcNUVaTQy0TtDf2zNZNSjFvRaU92N+bbAJiC9gAYgWTDo9whFpzwrD
fAwNaNe8fhZLZSLmSsulog/6QdKCRLTYJ4QhgGoKYbIy2VfoOFKKZazpLGXZux5CATCcv0GWu
dLsMVqnV7xZmj52JuIl6R1k2T4NGraXW6/sjFC8o1nOeh98hZDZCRRbMIhvIKQYP/SbJeJbtF
VTFEFW0Jp6Td8ZJXUx7UP6OXh525PgAxnDFpv0L+F5fAx1CDyOW58mU8w==
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.0 (-)
* gnu/packages/node.scm (node-headers): New function.
* guix/build-system/node.scm (python): New function.
(node-headers): New function.
(lower): Add node-headers and python to build inputs.
* guix/build/node-build-system.scm (configure-gyp): New function.
(%standard-phases): Add 'configure-gyp after 'configure.
=2D--
gnu/packages/node.scm | 19 ++++++++++++++++++-
guix/build-system/node.scm | 16 ++++++++++++++++
guix/build/node-build-system.scm | 15 +++++++++++++++
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 530c04bc68..a6dab75309 100644
=2D-- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -48,7 +48,24 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (ice-9 match)
+ #:export (node-headers))
+
+(define (node-headers node)
+ "Return an <origin> object for a tarball with headers for the given nod=
e
+package version."
+ (let* ((version (package-version node))
+ (hash (match version
+ ("10.24.0"
+ "0h37zjwcpxjdqcxqjfj5zp1n5zjxaa0g8lsy83955afg5cca8p0n")
+ ("14.16.0"
+ "1vpdgq7kcw1a0w90lpvbvxbrc0n3pwjrs3sm42pjj7560clvji2b")=
)))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://nodejs.org/dist/v" version
+ "/node-v" version "-headers.tar.gz"))
+ (sha256 (base32 hash)))))
(define-public node
(package
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
index 98f63f87ef..7828582a9a 100644
=2D-- a/guix/build-system/node.scm
+++ b/guix/build-system/node.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright =C2=A9 2016 Jelle Licht <jlicht@HIDDEN>
;;; Copyright =C2=A9 2019 Timothy Sample <samplet@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,6 +42,19 @@
(let ((node (resolve-interface '(gnu packages node))))
(module-ref node 'node-lts)))
+(define (python)
+ "Return the python package."
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((module (resolve-interface '(gnu packages python))))
+ (module-ref module 'python-wrapper)))
+
+(define (node-headers node)
+ "Return a tarball with headers for the given node, needed for packages =
that
+need to build native bindings using node-gyp."
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((module (resolve-interface '(gnu packages node))))
+ ((module-ref module 'node-headers) node)))
+
(define* (lower name
#:key source inputs native-inputs outputs system target
(node (default-node))
@@ -62,6 +76,8 @@
;; Keep the standard inputs of 'gnu-build-system'=
.
,@(standard-packages)))
(build-inputs `(("node" ,node)
+ ("node-headers" ,(node-headers node))
+ ("python" ,(python))
,@native-inputs))
(outputs outputs)
(build node-build)
diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-syst=
em.scm
index 70a367618e..2993c49b2b 100644
=2D-- a/guix/build/node-build-system.scm
+++ b/guix/build/node-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright =C2=A9 2015 David Thompson <davet@HIDDEN>
;;; Copyright =C2=A9 2016, 2020 Jelle Licht <jlicht@HIDDEN>
;;; Copyright =C2=A9 2019, 2021 Timothy Sample <samplet@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -101,6 +102,19 @@
(invoke npm "--offline" "--ignore-scripts" "install")
#t))
+(define* (configure-gyp #:key inputs #:allow-other-keys)
+ "Run 'node-gyp configure' if we see a 'binding.gyp' file.
+
+By default, 'node-gyp' will try to download node headers from the interne=
t, we
+prevent this with the '--tarball' flag."
+ (let ((node-gyp (string-append (assoc-ref inputs "node")
+ "/lib/node_modules/npm/node_modules/node=
-gyp"
+ "/bin/node-gyp.js")))
+ (if (file-exists? "binding.gyp")
+ (invoke node-gyp "--tarball" (assoc-ref inputs "node-headers")
+ "configure"))
+ #t))
+
(define* (build #:key inputs #:allow-other-keys)
(let ((package-meta (call-with-input-file "package.json" read-json)))
(if (and=3D> (assoc-ref package-meta "scripts")
@@ -147,6 +161,7 @@
(add-after 'unpack 'set-home set-home)
(add-before 'configure 'patch-dependencies patch-dependencies)
(replace 'configure configure)
+ (add-after 'configure 'configure-gyp configure-gyp)
(replace 'build build)
(replace 'check check)
(add-before 'install 'repack repack)
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:01 2021
Received: from localhost ([127.0.0.1]:55570 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL6-0000Dl-E9
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:01 -0400
Received: from mout.gmx.net ([212.227.17.20]:39445)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKj-0000AI-Rb
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233992;
bh=Ochb53iWSM0vDFC9rgtvjnHn5lS2LSnrvcQweAQYi0E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=R7PrlQhMiILnAnBcZsU8nQ6kJ+u0bQyZbndlFmqcEiVwQnYK8m1AY2NfXyTKU4EBd
RYpRuaW4+huSUkiNh+PBibYdZopE7APAnmt+MDHnKWMLEazZdymHQT8J8RTycjgwsk
FMK3+9hWwVlU5P63JTWBJK1Urkdj+1qRBQxhX/w4=
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
1MYvcG-1mXPNf3xEu-00UuFC; Sun, 29 Aug 2021 12:46:32 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 11/33] gnu: Add node-nan.
Date: Sun, 29 Aug 2021 11:45:46 +0100
Message-Id: <20210829104608.3103-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:hMV6X6y7WRArcDPZax25v+zxi6/NnSnKLF/IgxE9uoXyFJR3+ia
izi8kpYKQ9P6G/BNRR7pGMEfghidJghQyImsxVWHesHtqJWpDYnJJTVLq3bl0q4d0dEQ9NO
8BuHNtF7j7YNEJCzVkFrwOF4jR+W3fR6djDAwr2HOf8x4Gy1DpHdb7QmqOI4gZWEnD/dT+G
Rf4fBpH6U/hFeJ6KHEIcQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:wLIw08lgSE8=:cF+ENPTwdm3WoxUd0pMOM6
3505PxNb4+cz8FrKoWcPn5Y7P7qFXBPkQTDYaB3benlp2N54Ft/oqTixfAu9yz3iR56Qp5+DD
fRMZCt3DPhGNWjJICZFv3LGOgbmb4+EBHSWnGZoAZ1YZM5eQNJ81b6R9VZSk7jBMAjdNRjzPR
KfG0wWkTIGlZaZ5HXLt34R9DEsH/8LBFlLE9KIShvNiFBVJVqnMpINBZnySQv5XKAtZlKO3I9
Mrm16/Iycv7wyo2t7TF8N3rXYHHV3s2WQ8AU1cSQEEcOIwot6Vs/WUfUGs7SJ6klxmHvobNmn
3zjkMSSATpH0Sptyz+g7G8Y/JPQ8kg9FL5EhY7kh6yAnbUpfZHSgS9NNHnrm8fAF9VrdSjqtX
iqnfhn9z3kC5b2anN3hwc9amHvsaxYDfTbQH5HH0VWBsLsO9TGaB3+13zrlXrJ2wHuJJD8Olv
NVio5/qCsmNIbiHnM/bie7AAh/BcsfsDM7Aa65ExvzxlGYuyDEDGhg8rdPOO/7hQ3kk9NrgBw
Y2YydTUFIcnx+hnEkeMLNWw2geh7dmifClWMy6qofr/0/cK8GIg8MyIHtBQYBAWwu212027Zf
jjIs5yXSM4WaBJeaoUFbw4kcee45VdRMCHZ01diTKOy4LrezD+OtiAk2oMFyrVVZb8zLbIZmw
WKpa83fZr/u0O8OPfZ1+DYMrrwi7QYEytUVM3/LY414Fxe7vIU2CvjB427+Oz3t22+Dw7ed97
+9v7lkmRT/L+qE/ndF86lFfa9runyP2cJjHn3T3rJELHcfESdE7/2NuOoh9umq/RtWJR4qHyU
d7OvQzFPBw5qsTTKCv8HTUsczPHEerV0k0YlSj1zDQzZkLTBYVMCVDaU7SAAgIKpR+Rfz4LQ7
plYgOZivnhMMQijTCD1Ubkl/TzJZM8bFntUABvayw6kaQvAj6r5iIEkEW/pEiJwIHuM8vmJPg
74TEfP7qmExiSGb8d1NC+XftXxnNIDoErudmQnbaUSeT/XdMdJPCHjaEzcWolDk/LVGaXRZNl
ORkFC6oxuwQA6gBfaSdpCsuY1Tcq2vDSWS7sWNCRelJyElD06wsbZov73E/t4eY+E8kuGPgSV
drNlPeBqPbiBKPmNrsbdW2t9cvltWjtVeOTc1CrapFO+cqknomNrO2Cag==
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.0 (-)
=2D--
gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index cbb68f77d6..eb4b59d1ab 100644
=2D-- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -3,6 +3,7 @@
;;; Copyright =C2=A9 2020 Giacomo Leidi <goodoldpaul@HIDDEN>
;;; Copyright =C2=A9 2021 Noisytoot <noisytoot@HIDDEN>
;;; Copyright =C2=A9 2021 Charles <charles.b.jackson@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -171,6 +172,35 @@ user-land JavaScript.")
random number generator.")
(license license:bsd-3)))
+(define-public node-nan
+ (package
+ (name "node-nan")
+ (version "2.15.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nodejs/nan")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18xslh9va5ld872scrp5y4251ax9s3c6qh0lnl1200lpzbsxy7yd"))))
+ (build-system node-build-system)
+ (arguments
+ '(#:tests? #f ; FIXME: tests depend on node-tap
+ #:phases
+ (modify-phases %standard-phases
+ ;; The default configure phase fails due to tap being missing, a=
s we do
+ ;; not have tap packaged yet. It is used only for tests. This =
package
+ ;; still works as a dependency of node-glob and node-inflight.
+ (delete 'configure))))
+ (home-page "https://github.com/nodejs/nan")
+ (synopsis "Native Abstractions for Node.js")
+ (description "This package provides header files filled with macros a=
nd
+utilities for making add-on development for Node.js easier across version=
s.")
+ (license license:bsd-3)))
+
(define-public node-oop
;; No releases, last commit was February 2013.
(let ((commit "f9d87cda0958886955c14a0a716e57021ed295dc")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:00 2021
Received: from localhost ([127.0.0.1]:55568 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL6-0000Dd-1D
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:00 -0400
Received: from mout.gmx.net ([212.227.17.22]:48379)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKj-0000AF-6X
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:38 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233991;
bh=42b5qx9L9D1T6tyD+X99xNIoTWXxU0Oz3k8IgJOnBB0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EjJEdAyKIJHSGVk7zLjPuOMNfoiAS4g3TFl4sMJActaIDF2YishrUGAwZ3acU6Tlr
FLBGyjCHygpE4G+MPb7CmPIVBDXIS6ZSF7G6g23tNu0272ysA52lh64CiWCGv4Y6hi
yLhPaaMwwfiIzSLLFsQHbvtZltFdpnnQh6RLvAe0=
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
1N8XPt-1n6T141HRh-014Vyh; Sun, 29 Aug 2021 12:46:31 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 09/33] gnu: node: Patch /usr/bin/env in node-gyp.
Date: Sun, 29 Aug 2021 11:45:44 +0100
Message-Id: <20210829104608.3103-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:YhwC86UAfuAgWFyDgFVCwdXzLZH0VoDhaF04W2M42AjFnRaV8Xb
jNnqb76RWHmrOnwmJbJh4lLglAoJUqfFqm9wZKByEGtV+bKQRXzTnQTC4suyAPCkU9WgqBH
2HKgqiDmOQ5Etx+QezazaZEagKQVAraDcl0ioB6qdPONcNXhODU9yeZBmtZHS61vY1vDl44
8sICuzPVReWagrOl3Wlmg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:XUkp05xqsNQ=:wM6qjRDEhbQE3yfCXYHQ4o
KO8Fv7jc0PdwjD8n8QMEgJ0VDqAG6lx8R5mgQ4czD4/Og+AlU6WEYCE1lyVel0zDT+W3nLsmF
u52LBMbuSwhUbmTQhUOpbUYWzkvw85hswRjnXmpTZgpsMPtMX8hp04+BMV0TA3/KlsK7VP9PP
5QBM+8eLYleeY02uSHYg9xxyL+MeIlu5g7X5mGjBiUtYXp96dtdSN9Oq+HgU6cHtcva3nbqNi
Osb5UAnNx3VSGTbRh8ArNVE9CXxcPkJHjhbmoSBVRTPGMQWzy0CmtfEEJr4dfLX1dORcmm7yU
uaWPJ04CkpfCL8zuAU0M5KXUDPV1lkrXFMiU/NqpDhaaFjtA+VwTfbXo9LU95mc5dwYirr3+I
9uP6w56DOg+W1OgcrCp6PwrnBQDqkG/hvJO54AOwcxgfkWJHRvmXP72xzvtYl3LImmJa7wKYk
gH9TX2ac3+5WEjaB1tCvxdmYhRVHkkHbbqHHAvmVB0XYBub56FmXG5InModxZZOCdAYiHbNd5
9FTMLufhwz2na8YnihzVU79VxMbK8Y6TgzTem9DF37zXGYCN588ITEb6f8snPXw1Ng9IgMc0I
m2oNhtIB9/VotFJFTFTsBoSFtHUjAttr0RftlKn6V75yrsee02KjM2abDPpxQ6YT3/1ZjouuX
ooNj/qNadSScC/XczzVxN25aubuoc8UZdgaAGRZVnhKMeSy4j9Wuft8X9duKduyL+kRy6dHPQ
atgPHs1zIZEqfxY5ZPyn+yypilS9alIsJzZGl0LVPg5jj+BiFxtZMYQBf+v0uZ2/ZVjmfxye0
K7aKrfJyTd7fygAJvQQILWdQ1W64XlfaIUw2F4MDVrCnaP4M6bZMLsWUuUjDkjx5ScvtNHbUt
Rvccy7nKKui6ltpNg2F+rvUhTn+dfeffZiVj2KdLmjyFLnFUTp6rItz0vfKhI2uz16opw20Dm
oXZ8iI8NMwzb9WrRO968nMNzXGMJLtsteyq0MBas6kqAmp76aJGr1GnvwKvmu4eebXXbd3FSq
Ar2yVIfiIjSjHaOEOUzijHUcMNic7NLmqkryPuADF+6cnVYwGSPyjZ4AOwEHciPRVV4yjDLki
qaeHemUVQjfhcJHXVBDBBuVBep3f2rj7kjJm431GUxyEEtvCfkhfpX1IA==
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.0 (-)
* gnu/packages/node.scm (node)[arguments]: Fix /usr/bin/env shebang in
node-gyp.js.
(node-lts)[arguments]: Ditto.
=2D--
gnu/packages/node.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 36c45e9c7a..530c04bc68 100644
=2D-- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -6,7 +6,7 @@
;;; Copyright =C2=A9 2017 Mike Gerwitz <mtg@HIDDEN>
;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice <me@HIDDEN>
;;; Copyright =C2=A9 2018, 2019, 2020, 2021 Marius Bakke <marius@HIDDEN>
-;;; Copyright =C2=A9 2020 Pierre Langlois <pierre.langlois@HIDDEN>
+;;; Copyright =C2=A9 2020, 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;; Copyright =C2=A9 2020 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright =C2=A9 2021 Simon Tournier <zimon.toutoune@HIDDEN>
;;;
@@ -120,6 +120,11 @@
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
+ ;; Fix /usr/bin/env shebang in node-gyp.
+ (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.js=
"
+ (("#!/usr/bin/env")
+ (string-append "#!" (assoc-ref inputs "coreutils") "/bin/=
env")))
+
;; FIXME: These tests fail in the build container, but they =
don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
@@ -661,6 +666,11 @@ source files.")
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
+ ;; Fix /usr/bin/env shebang in node-gyp.
+ (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.=
js"
+ (("#!/usr/bin/env")
+ (string-append "#!" (assoc-ref inputs "coreutils") "/bi=
n/env")))
+
;; FIXME: These tests fail in the build container, but the=
y don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:47:00 2021
Received: from localhost ([127.0.0.1]:55566 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL5-0000DW-LX
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:47:00 -0400
Received: from mout.gmx.net ([212.227.17.20]:52627)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKi-0000AD-UI
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:38 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233991;
bh=4i+AH3M0k9oKHKFs+3X1xwXbyLuH32/cVilwNPVNRQY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=e9Tv/uYIjU9g1ggu9OVghk2yRTjBIEQsCSDMdVhhB6AvAZAQs+V6b2CwtuFe4O+ia
maYGNnn6XFYcKAuqdx3nSB2TW2I/8RymOEwFnAO5J9Pkx8ckhFEDnNW6okgXu7iyo6
eb6afp/tckes61H/KdgzjE4cBRe1HsP1qDcZ92Mk=
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
1MatRT-1mqc9603AJ-00cOLV; Sun, 29 Aug 2021 12:46:31 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 08/33] gnu: Add tree-sitter-cli.
Date: Sun, 29 Aug 2021 11:45:43 +0100
Message-Id: <20210829104608.3103-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:zFJqB2rzgksW3azCwFl2gh8ycTv3deOr8rydpj3DhHT40e5Y3MZ
Vl+8woFMUECwH5pV9cz9oSkVXxFUbuc14KjRiEeCp/Ln3ZQQPBdo5exq8LbofFciWXPil2T
yCBXO0St5Y9lpPxacVtQVtPCwS3xJuyeF2vtV8X/Nq0wdpmD2pvTNSV1PEBZ2rdh6HykndR
IZKvw0w39BRgdmCj90lDQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:TTKHXMHE1HE=:mvo4JASSyrCHMBo9VFIwb/
hFSY6Y/yluoUbVHrSuToVeY4szWnCA3FuW2hTiHWOfbrpGvRXwvlqRBETuJIFDndaVydX8piv
mVgkKUzV0eHAxNeWvRSKf+LZWoTEPqhFiuQ4oaHjI91uVmPeLlc8oWtqql+fS1kRlcw7i4Ojh
S9qcTcj3YaVArOGzCe8F6NGft7sKcYHk4i2EtP+j5aSfLlh6rhD1+TG4juqj005FQGiMJS4Az
MlQukARUJrsSA6VFg6QAncmbcYQQshfi8r1kWCBDjh42TB9cLEhtDXxo1GxbI7+f4wiQ8hOmm
hlI4ZQURrDH058aZ8ruBWMvAZ2dATiBbBqiN2Lzu3krMggJUPZUdjU27O1FMbk1+M/Hc/m6FO
Www58up+QbqxGzCAoIAzqGs2+ydZj6MCUSoKHzCpG33offLLlDJNRbJqGIbcgmcVZnrM7dkUh
3WHFYG2MHmZmjb4zxnR5fk1SEA1kRNRJFqXV8qsTVBG3y1Vda7AruEDVwdhpr3frY/qaQxdvS
mr8v4cYX4PBrgmcRGTrIWLYr905oTPHmc7QmhtCtRBOJHoJBqUDXxKkaUh3RSAH6vZsCJ3cwP
uUGQRcYjaGPmUErmBztbbF1k0xcCuBvsyZ5Bt+RR+MzqMYG+PcySdp+imkLPV9DSIlXiqPoHI
XYtHYNzA5qCehn3E+30/Jn5wBjUntAsfYTXkFrBcJrojaniIyoCuvyRUkq05vJadhRSaRn7IW
ahvT/kA8WY+R83+vukY1hk1zIZS9flYaOVIukzF2YiKYyyvCvdRUkuzrMzYEkoMp4EiEf4AAH
aVsmEFCCoCSZZF5MK/ohK+7wrvLsjCDsMs5Eyjefnd9dgCaNwWCpXWbinEIzj4WKhay7R/SkO
63o//p7q2g07ugVVh9GYqOtvJ5L1EcovQ8JqooM37ue8pMQGHUtGUjLAxX9DW9bYpz8ySG+OL
fWXLEB4vJBpMEaBMxqz2EnUpxOwct9iAa/oEO54Mkk049WmJFUH0wbapcvv/9EPiiyffu0G4I
J0whSiWE/0qg7EGn15xhppaSZ6fX9EGDx0Tv043PnBcaWC44dbhdTwtH4+BPw8mCWKBCPWZnL
4+c8JPL4+p3mLddNZZTLl/UgFkRr9XPKN0APB5BtnsCiIrbGB+m390XxQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable.
=2D--
gnu/packages/tree-sitter.scm | 61 +++++++++++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e6e66cd447..d8d4a305da 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -18,10 +18,13 @@
(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 git-download)
#:use-module (guix packages)
- #:use-module (guix utils))
+ #:use-module (guix utils)
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages crates-io))
(define-public tree-sitter
(package
@@ -71,3 +74,59 @@ can be embedded in any application.
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")
+ (build-system cargo-build-system)
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; FIXME: Installing the sources for the tree-sitter Rust bindings
+ ;; doesn't work out of the box due to tree-sitter having multiple
+ ;; Rust packages in the same repository (bindings and CLI).
+ #:install-source? #f
+ #:cargo-inputs
+ (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("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-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-spin" ,rust-spin-0.7)
+ ("rust-tiny-http" ,rust-tiny-http-0.8)
+ ("rust-walkdir" ,rust-walkdir-2)
+ ("rust-webbrowser" ,rust-webbrowser-0.5)
+ ("rust-which" ,rust-which-4))
+ #: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.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:59 2021
Received: from localhost ([127.0.0.1]:55564 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL5-0000DP-Cb
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:59 -0400
Received: from mout.gmx.net ([212.227.17.22]:36851)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKi-0000AA-1X
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:38 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233990;
bh=VXLuCZXJqJ0e/hkhzHlaWoXTlTkybPUBR+0Ndjx+FWE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=b3dy5qaVC6LUGZICvSMIGR2r2FJVaNzUfMjj7vAl7wHYf7BQBPlWT3BQUXrKJubuJ
4czpVoeHkjrDgAj4D8hYp8B1HDSoxJyOHd79wVnkw4ZtdPpNBEYYKDlPkNLnInuyjb
DF/LWW717mMrkdaUWTgOe99kOGrYBUXy1Br0nGK8=
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
1M8hVB-1mOR4J0X2H-004gAB; Sun, 29 Aug 2021 12:46:30 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 05/33] gnu: rust-tiny-http: Update to 0.8.
Date: Sun, 29 Aug 2021 11:45:40 +0100
Message-Id: <20210829104608.3103-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:YwcOKAYAuUovrPV6QEY9UyULgcIkNzsP5wnPV7gQzE69TiBECc5
mkNJJn5uW9Kx+s4H68fwiq0e5v2aEqO0+4YxeYPXl16QP5U9pKEuhdY2TeVObuNpAANI+RA
4y6WVHzKb0Eepa/jeBT703Sx2eyEbTkQwnOIbTZmm96puSCTa22/CrJGCe+GMzci/Iol2X1
XC8+oP/avVD4EQbeolQyg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:+YuaVaJeRaI=:1E3fnYTbNU2I7JNP3DbiXv
3dYIm0s5pMmIwIY8ZkHl0PQuQvIIULMvpoGDGNxL+WRulGCWO6mH4JYxC2cfy257W+PfVFswM
4rrlNegcbOON9hQJIUmBLMrgYDXp63WTUXJ54l8aVMSs7Dsy0hfoUSDAR2dqgf8EkKYN8tDM3
6MPnXSY5DKhxVaU/Xe+fgz0Azi2VfOl/V0G1kGtQV/Ojqe7mtzMYEJT5CGVZo6soJDZDpfnm3
vsUsguOZV474RbRvHR34tHh9MiA0NKQlgfLjGIOcYDbUGOEXoexANOAYpsT0KaHbprkE2FYuV
KL09tHdiQQg7zuRXBtG7WogoVDcc3NfZDwGYA64nqmXPa685KTCH9G50WEwyRdbEKqZ4BbX6R
Sn85bTL+0cIKPZlxIYRvAdVzydq762F8E2LrOAOcOC7cI0wCEb1cugkcRL9rliRiegUS3wIAg
3bEXlpxBj54EPbDwTcYeZOe/e85tio+bA/KQf70f+3sEU7nMhbwJ7UMpOIe8jJYC0heYsu4cs
bumI8A+bLzGV5Wo4xv72ni72hlJUG5WM8G4+3B2x4O7kD/QfC5CU2bdFA4Dm+cJ7+Y9ZQSs1I
w4l5mbFBxQUGRRLfDUls6VQtvqjWhbP5r2jmIj4Dh1OWAccFS8VRKCL3A5UpfAchtskGVQLQS
7my5R9AnyGjno1f13gGUedkOEVuWoyl4NMpFl0GOYg3+RbNTSv5t6ZZK2JOGcIj83dQT7dI2g
gHdxpZYHmixvdpBIxaXdVNFei0ATCIKLWzd8RjomLZS+/GO9B5aGg+Nm6zcCrSUkfqhIlvvfT
BJvjZrsTU7cBtUEUNUOrUFGLen/wmVOKh8VAaI+nsMI0XIvFDwMaEjmlfg+S8IihvN1kRzsVY
WWYaww8hUyL2JcnXr1VoywQkciLaOO/SxP0Wyyuq7ei5sQo0CgszDDabJjtDlvHDptqu8WVjQ
sTj62T7b/M87xwBlEBgevYqthndj8EE5DHuU3jrzw4zpG/VyPuJ706vF2i8+US14nZrtlCXOk
Ow8UoDSwwnhnpqF6XWBdclJsvwoiU0mLw4PHzEW2nF5KlYaGaLUBH17Tx5ipIwrMIJCqMlSox
L6G9/FSWpvK6DbmChn0uN9dyzOiJKfLzQhpMSjO+fjDKir2qTV4t+b46A==
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.0 (-)
* gnu/packages/crates-io.scm (rust-tiny-http-0.8): New variable.
(rust-tiny-http-0.6): Inherit from rust-tiny-http-0.8.
=2D--
gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index de1b581cbd..07d0a7594e 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49152,8 +49152,39 @@ closures after a delay or at a given timestamp.")
manipulation in Rust.")
(license license:expat)))
-(define-public rust-tiny-http-0.6
+(define-public rust-tiny-http-0.8
(package
+ (name "rust-tiny-http")
+ (version "0.8.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tiny_http" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fcdwpb2ghk671qjjrk6048hs3yp7f681hxpr68gamk00181prcw"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ascii" ,rust-ascii-1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-chunked-transfer" ,rust-chunked-transfer-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-url" ,rust-url-2))
+ #:cargo-development-inputs
+ (("rust-fdlimit" ,rust-fdlimit-0.1)
+ ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+ ("rust-sha1" ,rust-sha1-0.6))))
+ (home-page "https://github.com/tiny-http/tiny-http")
+ (synopsis "Low level HTTP server library")
+ (description "This package provides a low level HTTP server library."=
)
+ (license license:asl2.0)))
+
+(define-public rust-tiny-http-0.6
+ (package (inherit rust-tiny-http-0.8)
(name "rust-tiny-http")
(version "0.6.2")
(source
@@ -49172,11 +49203,7 @@ manipulation in Rust.")
("rust-chunked-transfer" ,rust-chunked-transfer-0.3)
("rust-log" ,rust-log-0.4)
("rust-openssl" ,rust-openssl-0.10)
- ("rust-url" ,rust-url-1))))
- (home-page "https://github.com/tiny-http/tiny-http")
- (synopsis "Low level HTTP server library")
- (description "This package provides a low level HTTP server library."=
)
- (license license:asl2.0)))
+ ("rust-url" ,rust-url-1))))))
(define-public rust-tiny-keccak-2
(package
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:59 2021
Received: from localhost ([127.0.0.1]:55562 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL5-0000DI-2o
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:59 -0400
Received: from mout.gmx.net ([212.227.17.21]:53665)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKi-0000AB-AB
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233990;
bh=Pk8hbknbhAZhEy3Ad1EW1EmjTaPvBpYftNJqpGpNt9A=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=IgU0p5IzWhVMwHozX+YnPzeTvVDatJEhAk6Ik0jzBchAHRRDY6X3OLSgLE1AEruJj
vzJ0sai0oaogBA2DhLw+lqcFL862+QXXbkPOcss7AqwOWR9CM1HsbrakQv6MkdRhhn
PmFZN/JaxLs89WxNzr6LmqK9vtDqt7skxxS0GbJo=
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
1MPXhK-1mfh6S1kRO-00Mcmq; Sun, 29 Aug 2021 12:46:30 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 06/33] gnu: rust-spin: Update to 0.7.
Date: Sun, 29 Aug 2021 11:45:41 +0100
Message-Id: <20210829104608.3103-6-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:4ZnlhzDGzJfP5NygCJtisZ/+D9hBq4QUt/2K3aFmO/DdHSGGNnS
gC/M+0VJCwNMQ/QYrrjCLg+P6e2bmB1rFDGbtylWlTBPhMYslFtghZ0/xgX5pFVve7rCODn
tpH04Vmf8s6cRVoRQ8B9wKRvysHj+6qVlOuwXZYctrTLVMqqSCi7np8ZuSiR+QEu+W+o4pe
tgxl+ItBJMyO3eC49EIFw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:vIJJ3o/Q2iU=:j/6KEdkh6McFCtOF3jWu2+
yKBL2FHWJJq/7zN5yHfls1SgxGJpte/6FVym7GdH0FEeq9J6EwNv3baKJKdIiwvnFYP2sKGEJ
HjfYDkxvErvIuMYdluy7aR+NVTAUT8TTkiMep/GRHxBVYcd//lgrmr26wXbCClo2i3ZUM5+WS
m+qmuvmh5TEC3oDkI0fYEP+xtbOcyMG28qFc02xKpO9iAtY5UzqdJjijbvYq121jE20SYHW8P
CPlim6vd7wSIOBD66WVG4c5TjMcK1/Dc2PwsJJKC9NicBPNej9EVfnwdWz+Cilv71uGLgGw7S
vEZo1f+8Zs4uvIwv5g9bsEe4EDd3qLuiuEwN73o4BIsVurq/kBI2w1QNGUParERmAwc/pC/6h
97dHgJCgGXHRbaF9T7484eaNG2fohhRgqsj8yI+ePr6tcvzGnwWggHddf0P/TZd/HYI/OXILr
aM48LhsC+OlxN/cOVOztvuHIcAebVeZHmkk8advTEY7XzMmA8NZaoga57OtzMlC3rKGD3vqM1
ooImo5BmQU6e5aHEnI1sqy4p0oA82VjXpU1S+l8GEo2bDy97f8BCetvK+AwnE7Ee+2S4kt+TP
rVv1oYAuzAtELM0iW8sUSw7qQiymQoCWqWtMEnAvILIZp6fe68oTLzgyhBa7sCmcRBXNI7AUF
upszj6a7cLaGOc8/w5dsHKMnXrUR/Sxv9t5d8Ldk9ZMUhLfXb2toFRzWHw0oU5lcmrTOuePk/
ijFxMGpRWJ5a2XufagHYaSKpuF4lnVCpnHeDw5TvIvgMQzi1A7YoZ58KtQsWHH9emKF+1hS1E
1yvBZR5h6ZmktAt4YlHaTHUpxaxp63w9VYUPh0uzxim4vHtjIR19XoxwWGOzYt28R0zMK5In5
g5MFdfW5zpboMUnJDuM9No2E6SzPEK/suPSlb7nNg0DIBMaMm0o8g3qchdW4wbl/74+7+ebqN
hbO0wp9uYKHqNVVVwMNJ0fi1jLvnELx3nQJTaBYmMHGcu9QFwl9D/XLmTb7JevIvV+TGmYyob
s3deHzCn3n2nt8N6Tksqj7HGZdOjcDt6XyqjYI7OR6DLHAArq/TYk1dtK6I9KGqmRbGOZQmOi
GTnDTjzTxf2tITAMwG6+SAZ+IWpMkj9T0Rycy8DsjpFcTQ4/UEF5dzWPA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-spin-0.7): New variable.
(rust-spin-0.5): Inherit from rust-spin-0.7.
=2D--
gnu/packages/crates-io.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 07d0a7594e..476d35c241 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44838,10 +44838,10 @@ track of where each new file and line starts.")
"An RSpec inspired minimal testing framework for Rust.")
(license license:expat)))
-(define-public rust-spin-0.5
+(define-public rust-spin-0.7
(package
(name "rust-spin")
- (version "0.5.2")
+ (version "0.7.1")
(source
(origin
(method url-fetch)
@@ -44849,8 +44849,11 @@ track of where each new file and line starts.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf"))))
+ "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lock-api" ,rust-lock-api-0.4))))
(home-page "https://github.com/mvdnes/spin-rs")
(synopsis "Synchronization primitives based on spinning")
(description "This crate provides synchronization primitives based on
@@ -44858,6 +44861,21 @@ spinning. They may contain data, are usable with=
out @code{std},and static
initializers are available.")
(license license:expat)))
+(define-public rust-spin-0.5
+ (package
+ (inherit rust-spin-0.7)
+ (name "rust-spin")
+ (version "0.5.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "spin" version))
+ (file-name (string-append name "-" version ".crate"))
+ (sha256
+ (base32
+ "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf"))))
+ (arguments '(#:cargo-inputs ()))))
+
(define-public rust-spin-0.4
(package
(inherit rust-spin-0.5)
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:59 2021
Received: from localhost ([127.0.0.1]:55560 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIL4-0000DF-QQ
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:59 -0400
Received: from mout.gmx.net ([212.227.17.22]:50231)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKh-0000A9-Mk
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233990;
bh=F+4W/kiDc2TYDJz5FKD1ekKyq2/hO1sAeTgMpgS2gjA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=DWzGpWt3ZyYppDn/nzLIdD4mFQbygK5v93EMVy6LKe74RQtS9i/djpkSoobI0k9cj
Wydzg4UAVn0crmrlIOJ8f5XvJDUK5sIInsOO8l+9qCvv57tWe1PLHyJOC49OH/fwTr
ugH6EmTJfjRRyQyxQlWLapMk81cxlDr6+MqH8m2g=
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
1MPXhK-1mfh6V3UCA-00Mcmq; Sun, 29 Aug 2021 12:46:29 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 04/33] gnu: Add rust-smallbitvec.
Date: Sun, 29 Aug 2021 11:45:39 +0100
Message-Id: <20210829104608.3103-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:bOLk4vzr6W7OYrkTI8aNxXTjbv/1QKqPr/+Dfy3Y+Z3D81Ga3es
olxSZHNkfrxjVHRJa29v9KKPkeeedB2l/s8mY8UOAoOt9I+y3+LuNU4EsSg6X10uNWtGL3X
L4aqdUNIGHm5AIXOBndqL/0W5hhzjkrzgWxYBQzBqgk0VFWpNXooNqZMrloSOjJ3yv1N37g
z7YdtpQturZMLz8aTATVQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:2p1u0zvtIHA=:zK8eGrE6Yi34dI/SwT8m/I
2dW4gECNkP3wbaV/Rk6fzMfHpU3SP+3YmjPXq6uXe9VThqbUtQ6IUlUwPq+XerzTyPL2ZL+I/
pcm3lCRBuLagZ/ZFzZfxYOuoA3DbefW9fAGp7nolyDO7wd0Lx9w61xDhBZALMK8dUuEVguA3r
n8RLbxnVfXlhFls4cwI03EEcb/QkZSDlH/trQ+WdfL6IW3fGN3eIiS1EADfvfv/HoijfWpu29
/khHsf4T531SqNssaOZgm88T+RWJd6ugINM3PjklZT+MHf1vWQPqGPC3g8VRhMDjTvMMiQ+as
0V8xgIqBBCf8IV8SGWE0zf4GZxWDsfpvFtUsYCwWIf1nRST8xZu0aiA2Hg2s5A8wHPComdt4O
JVF6NK4n+gZMQ1AksUkBmuW3os5X4QedCgvdD6tkgsCkoR8g02bOM3pCRvrfp5GHLfMOLupLp
6d/sBt8vr4ARJqnVHHUhV2to1eN3rOBtAipogpf7PhhVLO1mnEobgHfNvjQx5JFWsUFz3u/nH
N3VFwd1ZkqxwTunOxsGvbog3FfyGujLOzI4ZDtFs/SYx0GmlpvkoBojVlX/usu1R0QjlS9nnN
6XLFVUzNACSc3LAi6JuYBvga4O3wnrdSj7ctmJQiZlLgwspKX1U/8iKdGkkQFWOhqVDf9rJLk
iZhg9fNvZtpcGDdmEKpKoLvAHt0fHkqcOEGtj6hRjHzEz2o+6hch93fysat8r+bb6rvRCnkdt
ruyKhVqKnp0jGXndCfyi4naOoCmB3p1haEW6uqQ90ZUQU4d7i646nBZac+YNFOgfpnE/luD+m
ec9gjGfiO1r06cef7taHcKeMYwgFr3u9JO8WXqszuict+ZYp382tuifN6grgYCSOB1pXt+aVl
fiJyDozpYWoWl2wlqsxfQBxH9AWso4TnJp96cSqaNCDXQfcp9fF3nNBL3Hr3c/0zvud5nrgRW
R9MK85tj3lkLyiW+rYOeciLaxrpldTxE5nYdLmrYqG+DrjZuKCDlDITVs5TXfyNRJK11jNP+v
pU2cm7Y+F64EgtV1HQsP6zfqS6fS+EVhVXlyBM2wucYDK3KPZArZnrPbzrOsru1R2MO8I12Cg
+3Tro0tjbcutyVXevHnLOrRN192kQJW/xXnOBux+5SO34sP8hMeA+QJPA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable.
=2D--
gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 31136a88e3..de1b581cbd 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44429,6 +44429,29 @@ I/O programming.")
("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
("rust-futures-io-preview" ,rust-futures-io-preview-0.3))))))
+(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 "A bit vector optimized for size and inline storage")
+ (description "This package provides a bit vector optimized for size a=
nd
+inline storage")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:41 2021
Received: from localhost ([127.0.0.1]:55554 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIKm-0000Bu-GR
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:41 -0400
Received: from mout.gmx.net ([212.227.17.22]:47489)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKh-0000A8-FF
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233989;
bh=QpcC6OHBzKjP6ZvVdR+Jv1AF5ZeIZZxhy2/B7IXGnW0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eIli3rPtOUw3tchBPTvi5oHqBjbbF43yWyrBmg+1Sis5wg+//8ivsp/MdaUxpxMxD
lflx84o9+BXcIr1hqndoY3dXSkFr0jcaRbho1Gpt1OOazBOSO3CZg6RavSqPJxnihS
s3DRdT6KTWcoRN8rIX/hFAxxbuOvXLwM0dBtmx9o=
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-1muB2x2Dl0-00b0My; Sun, 29 Aug 2021 12:46:29 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 03/33] gnu: Add rust-html-escape.
Date: Sun, 29 Aug 2021 11:45:38 +0100
Message-Id: <20210829104608.3103-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:sSFnyNhM89+kbwujXyaFjtFPKrnToEFXYxlxWY9PQmgw04jgF9U
pRvdh+WdYq7vd703qhaU5Gn4nDpD58s0xqBmhBKuSUzsP8+U/ko2bwWQRTrwzZgyW6TAvQa
7j4mbfQ2sh4zcT4ESpScKZaWx9aBFYXI6PqA3iASblTlTPt0SkrMNHE4MvsxhRRRWZQ4qEA
ToIVlW1B0EUqSxCtbe+sg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:+BEVZEW/4OY=:Nzr/91Jyyq3upFCYGF0iUH
d4qG/uMv8VzKeeH9RsyHVAGzYddZVrddjFLx2ow1djKEbOaGL6G6B5Cu9PkegMvbagvf36HV0
atJGMThdO9buLhCi7GUZWNPrll2hfJdwkGdY7bE7lormxhazcazccmavXs+/5lpHJqTywvTgc
fTPbiKp0BXzMLGbCT+wFaxscYvIg6kr8QBk89CSKeqbi443A0OIqX4VOygxnW8XXwRZxiaHvm
0x8Y5ZMOPsHp2cTJxY/nW8mD+Qfd035ntBVqFeFAw+Baup1JfGUncQCC45cXIKgOiOyBTTH24
aIYw35/LQ9CNuaquLuFL2ebuGGK0pj172N1jD/b8qTkLy2aArbCniHuK136tN37nywNHO7+/X
svDsUxHlbZMjWMiWUvnHAR0WIMUUL8emE5VgUGAKCMSoNBBOoBdt6eBZrUnO6OcFiQ2ypHDt9
XTIiPuOqBcfn1f09EGAAZApNNIaNWblZPZ30F5JAFw0oy7/HuaKHJnw4qw/HyP+dcqGPzqW/u
cEplEGJIFuQc3Hxpzh68VjBuOWtoYSmlPYfN1cWMpVH6q04QILQpmYniQW8TPpOC1z8DNd96u
wx3+yaMHFwVn99rfLbHZGh6Qv/e9leurmVxOjYxhlWhxxsFag+iYcbUBQ4ApITBmXeXJLtf5v
cHMXO4yWDla9GRRehRbSrxPG2shIIoKFiq73PnbidEOtLmvssSOrOB4Fv6bGM+BJ3sor0QmY4
nJx4Dzr7LNMS0NKwLdMet64NCsyBcQfI8GthQSLTA2qJ1Bxmx0iP0LQSPcYsG82aqzLr21PQU
LeXJYvBULNSDp4pnTISUswDydLI6TcAf1oVqTyRiJ72rm35wJWqgo2qf8cfo16FVuWoRGQlPC
sbyAEu7a3Xu7Ya7q3JUNnOGukjejofHzR3qdSf99TxePpuYUjePWUvm0VHl8TU2AGFV6jP2bt
e+bwlSGGxs9oO5p042RPncXM67nbvDRuR+o2SAtrNUwgY2T1SY+DK7HjsAOqXd6gMkcEsWOfo
1xxgm7lXQQEKEu5EWzZY/J2XcgVz65I7lB4ee2jI966oNoCEpWfm1LJHd6KfpHXZhuOynonk+
dTi31/sMvtzfdjNo4DgjFCWqx8j+7AufeLkDTJfAVZqWZpSSE9O5zAqsw==
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.0 (-)
* gnu/packages/crates-io.scm (rust-html-escape-0.2): New variable.
=2D--
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bfa14d5297..31136a88e3 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20921,6 +20921,32 @@ Hash-based Message Authentication Code algorithm}=
for SHA1.")
"This package provides a library for HTML entity encoding and decodi=
ng.")
(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.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "html-escape" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1dxw9lpckrqzzqgbkw64ckbajr4b7xxnjdn8adgzqf2mm40shvl1"))))
+ (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 HT=
ML")
+ (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-http-0.2
(package
(name "rust-http")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:40 2021
Received: from localhost ([127.0.0.1]:55546 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIKl-0000BI-0x
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:40 -0400
Received: from mout.gmx.net ([212.227.17.22]:39977)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKh-0000A5-7g
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233989;
bh=vOb7MtUA+4BpsonuFHUfq+/6qbatkB54dEaxa+UGkcE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=iFukxZ6iCYUBQIWD42SufkDqCkOY+gISFJpW2lYORAVRRiCrdl1eV4w9AqVP4PHuI
XQNkPnJsyP2XXPgXBPi8i1hd66eSHLsVyhHE5DsYVAQMRUTZa1qoa9F9v2FriCy6+l
G6QtiMu9BO8pPLM0i054tae3OBU7tLHv6JtGZxGc=
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-1m8zfh3rIH-00BL3H; Sun, 29 Aug 2021 12:46:29 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 01/33] gnu: rust-chunked-transfer: Update to 1.4.0.
Date: Sun, 29 Aug 2021 11:45:36 +0100
Message-Id: <20210829104608.3103-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <87czpwzg9e.fsf@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:OOw6aXm4A6CkZ3ocoYbyNn0hv8E7LAeDSLSCopC5E+J+FEYr16N
uQnu+IOgU52xCRwwqy8E0fS4GP8TW/xBNyrmpCi81Uv575ndyByeOyIshosGMsM+t8JLHMl
7s+ZVCLSF2cv2VfEiVocxxV7dCyu1RcBcqDmKAIFI43YqRHqL3ThJYz5rjjae9rg/BNVxMR
p8aVb16raLuyZARZe7Umg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:7wtIdVJ5y7w=:j9j6Vv+vy0SEIHXgU+BGkg
0fc82qW2aJrSKOeN2dmzIbLVBVxZczbFYnNGRsvHZ513qf7ueiZjCz9GHaAjXj0wyqFJa0yR/
IlxI2DNB4bFNmsWfdQp5qJjor64VYPQIit+Q+pglqC1XJEXzI/yBjSZI8e/dNsZUlnJJpC6SW
pbHhBFJ8vpB5f6V9MTfDubTLMPsUhazTafu5cXexKnbGMl/RD+EirHmSO/WH3N9th/p0QBVG9
HwWM8rBN5Sm+ROTYbNLS3BYlKELWXPFKkEzxxohHfp69KguAKEdVunltgfoFaTcQIo5t0xMJD
SiVvHb/+GMqFyHzOQ5Q1dIiRdfiQ8jFDVfuIB1eNqJxBJFrucXRDJSW3HP/LtYOHScGJhwHx3
jXr6UBsvizotfhfqsw4Yw6KvJEl5JuO0A96YjmVXQgiCcJfcCDlgW0/bfJeASDT4yDZ9qxcPK
ggtgvBxpcppaZSeOfv4npdOFY1VV1eCIU0h+hP0ecKfJodX2GRHfelKO3sTZHIbMaiz6IrJTV
yQv6xYxUFlzp7lSSO5VAkEu5g3AH3ixg6yAsNhEDlOsQToxmcAkV9KCEodaFsL7CUw8RSD/7K
isuGBDER2/D9fqJPUkD6vfdZfO29WQmFRwDVYFdZZA2IRRFafpnK2zV5jwyw+77MX0CTTqsc4
uwxzxv5k7DbL2f3GoOSTujTylm9g2u0OZPduQcV6eEul+fp2DEZ9GY+Yujh0veyfOa2OqbKqf
D6yirR6EA99IfiHiAXmhoRBkv86gNFwkwjqroCJ1UtLauwkmQ0RCE5u3mO3Ya7fvwk4H15HuP
ns2gWRmGypW3Je9aVE1PJ55CV/F1AxezFaFy5wWHEdSUzl+uR6HlOVmKW2XIRUiE7z5BFHhtM
fs+vljpTDLr0f+k0Kjpk1/9+EHaEAGSaLWdI8rI83abLihu/Ce0FYCv+uppf5nmLKqIi2MRav
jhJk+lFZEtN4H1eydWPiCkmpRjDIZeiZbZGionTKL5DDN+UQaeRO7AYIwiC6J9m3xlnMkMLP8
KCAolBSSnhMygqLUAupDCpuf49AEktAjEg3NqSWyDSj7pYJV7zHzz7c1bdcssvKIdcHK10Sww
I0Lr/gbr5PLD18JQu4JFG+FCCE80I4dLz7sRjzKGrMIaJvYdnIchOURFQ==
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.0 (-)
* gnu/packages/crates-io.scm (rust-chunked-transfer-1): New variable.
(rust-chunked-transfer-0.3): Inherit from rust-chunked-transfer-1.
=2D--
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 087ffa1d27..3e93db1879 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18,6 +18,7 @@
;;; Copyright =C2=A9 2021 Antero Mejr <antero@HIDDEN>
;;; Copyright =C2=A9 2021 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright =C2=A9 2021 Vinicius Monego <monego@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -7884,19 +7885,21 @@ Python arrow.humanize.")
TimeZone trait for @code{rust-chrono}.")
(license (list license:expat license:asl2.0))))
-(define-public rust-chunked-transfer-0.3
+(define-public rust-chunked-transfer-1
(package
(name "rust-chunked-transfer")
- (version "0.3.1")
+ (version "1.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "chunked_transfer" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))=
)
+ (base32 "0bkdlsrszfcscw3j6yhs7kj6jbp8id47jjk6h9k58px47na5gy7z")))=
)
(build-system cargo-build-system)
- (arguments `(#:skip-build? #t))
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3))))
(home-page "https://github.com/frewsxcv/rust-chunked-transfer")
(synopsis "Encoder and decoder for HTTP chunked transfer coding")
(description
@@ -7904,6 +7907,19 @@ TimeZone trait for @code{rust-chrono}.")
coding.")
(license license:asl2.0)))
+(define-public rust-chunked-transfer-0.3
+ (package (inherit rust-chunked-transfer-1)
+ (name "rust-chunked-transfer")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "chunked_transfer" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))=
)
+ (arguments `(#:skip-build? #t))))
+
(define-public rust-ci-info-0.3
(package
(name "rust-ci-info")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:46:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:46:39 2021
Received: from localhost ([127.0.0.1]:55542 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mKIKk-0000BE-EN
for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:38 -0400
Received: from mout.gmx.net ([212.227.17.21]:54001)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mKIKh-0000A7-Ee
for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:46:36 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1630233989;
bh=D9U6XmczKxpVrZ53yWi9lSSmnm578DGi4xk2UiTszso=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=S/JzoFublhV4CjbZOn584Jn+T5S9u2aBkiAfIwhuB0uZBqtfIGbIQSWTKDX216Gtm
VoLln207GrNfkKqI+koCDd/+Jl55eXkv8Vw+GxDFI3ICQfc4J92RP7Ow1VI0owvkDm
1BszDtl0DZdWFSThOqA8z0DTrSgoPfpcB0rdcpLw=
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
1MD9T7-1mBBWm0u9J-009887; Sun, 29 Aug 2021 12:46:29 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH v2 02/33] gnu: Add rust-fdlimit.
Date: Sun, 29 Aug 2021 11:45:37 +0100
Message-Id: <20210829104608.3103-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20210829104608.3103-1-pierre.langlois@HIDDEN>
References: <87czpwzg9e.fsf@HIDDEN>
<20210829104608.3103-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:a1vmTxBc3wu+vtHFkEcAKCvkijZ655kME/MrZRxsaILhg0e5ua3
FHA65B6plYSAv/lN6oB/ZhSB0PMkbzZzlndeSzgQAvl9aph5UgQ/1iQoFKlaPa02WUtzC/H
9WPrKZw8oIOnebwLnXMGlWkLmSr8LQGDXGbqOhKcSgxMwdeY3M5ppdw2HwgQyxGmBZSSrwa
XWoS+rU1IIyRnDcO3iZNA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:+9Hqjxg9jt4=:0hQBMyy6T0oyLGAlkDiQZO
Z5SFcvh0LLHcsSJ1dMC45wow97in2e3gfDaI7319+k/X0MVV90Fu3klOKAT/BletlXKHPNsTM
tvHoOl5lFL+UpPI9BcmCzGbKr0NZPKRNaxGbopOedOLOWDd4sXvcBgdH5/bROxryiRRpbyrci
YUSJAR26WXSdMBv5clTsIg7Ub2NWXKJB6kwP9O4dl13gywZNMjdW0cmJsBlB/pEQti+rG1R82
64l45ioKlWptx56caLjSwE+AMb0As+vHjGUsFaxGsK9XdFMSxMnKcEOq1YiOtGRn/HLvsk8+G
TETdg+H6G3yFWOTNmhUlTizW8MvghuqBekuDSHKObC0IPW4HySN/l/8fOLwxT5Fcf7xhIGL9G
ryO37EkFEUZ33tyr14UhDAm8CEqFnw7J9K2I3AYa21sZJRRJPo1j3tVgmwYbxpv/q+jdIwoB9
pQrfLFduqa7Ccbm3j+5vLkLSjWjU5+GH/8fZyXGT+Lx7ju9aWwwQW64ro1HhwaoLkAdouCqzn
NgLs3oTKNxSg07u3Q6xDijl215/xkFKLq08f1c2h3dzjPguM40JBygLbGVRUHyDd4XzSMnH0C
/+igIii7OuihugyNQo3y/fPSPrGQRZb8ukz+jjGeyrvMpGhkM2sE78q+i/GV+Wv3fd87RUNkn
XWlYwyKQacqns9oMCDQk/mbniTNoaXmLK5p6j15tXLbb+tvP9TZ4DwK686n1M0LKwoV1tHQ6E
pTiDvyQsR0SfMYI7xMDdq6uY2Hqd4tjePQoMDJTC/ogmD6qYI1doD3GRkEjjrA1S0YbX1pEZC
BjPBvvfOoTxI9ne1GyNCYWInSKeCQvu2XIsq6U7CmgGcslSNN8yMSbIAgwLTpPcukoyR91ifV
u5PONVVLg0/mtcDTpZ5Z6Savki+pAHXWcdW4OEoK6EWju4BXmKR+2hJzA7NBlGEg2mBzQI4Yl
inQ+JP/lVb6UaHiBFy2m13+dm4GOeYf+CihkoYb0rTO2IghSCz9jEs3qyZdvspKbKbLXj8GvG
ZIB32AHa+gGtbiv4ptfO8t8duFocyp1NpVlpbhYZRa0vUp0PFEV9tFUlT+kDW9OF39cZYgAnK
md2SU5Wru5DO5rNtIkBww9f71MlmPkmp+Apgrl/hsab8aqSLj/gHywefA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-fdlimit-0.1): New variable.
=2D--
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 3e93db1879..bfa14d5297 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16008,6 +16008,28 @@ it.")
(("rust-libc" ,rust-libc-0.2)
("rust-winapi" ,rust-winapi-0.3))))))
+(define-public rust-fdlimit-0.1
+ (package
+ (name "rust-fdlimit")
+ (version "0.1.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fdlimit" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0g30d6gqkrwy8ylwdy7pqm443iq0p5dmnpz4ks41pirl7dclm98d"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/paritytech/fdlimit")
+ (synopsis "Raise the open file descriptors limit")
+ (description "Utility crate for raising file descriptors limit.")
+ (license license:asl2.0)))
+
(define-public rust-femme-2
(package
(name "rust-femme")
=2D-
2.33.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:40:01 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 29 06:40:00 2021 Received: from localhost ([127.0.0.1]:55528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mKIEG-0008Ri-RG for submit <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:40:00 -0400 Received: from mout.gmx.net ([212.227.17.21]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pierre.langlois@HIDDEN>) id 1mKIEB-0008RS-Mz for 49946 <at> debbugs.gnu.org; Sun, 29 Aug 2021 06:39:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630233585; bh=d6sM9CA+ixlfv4mOcGvkhe3BMXjgVnmxZu6iQci90k8=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=SPI43OvL5OZkA1ZHAxyTD5WgA+JYPTxat06xicybad2m9W7qFBAAzts6mFdDAo0hn MWbbiPW/HbqbGph1xbr9QnL5J0697WLjW8Xx9ilsabTTZJjharYBDeRgB2aJ4TRmR0 KDi1e1MP+kr+GD401zlTqFBPrX2ApWz91EzPJvOk= 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 1MJmKX-1mZM6a2byz-00K6rN; Sun, 29 Aug 2021 12:39:45 +0200 References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-7-pierre.langlois@HIDDEN> User-agent: mu4e 1.6.3; emacs 27.2 From: Pierre Langlois <pierre.langlois@HIDDEN> To: 49946 <at> debbugs.gnu.org Subject: [PATCH v2 00/33] gnu: Add tree-sitter. Date: Sun, 29 Aug 2021 11:34:24 +0100 In-reply-to: <20210808233354.6745-7-pierre.langlois@HIDDEN> Message-ID: <87czpwzg9e.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:f1UKKTCBowMrrwNN/DKSXe9tbKXbyfSHwMIC8BlThuk6I12atNn 7YhHbUodt4eF0YUmzaWopfNgftvacWoPgRdklEoMrnKtZ6fZcFcQp5Ec/qWOkvWXSgVxJ/4 m7UAq01MbmKsoWr+yf/21STeytFmak2FW3lCqKTDhtU1OS6/+4kknLFGJFb0HQFY7FoBxw8 HpoRjhAfKyxOVQrUTX7iw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Niv5FTA9VGw=:5t42oNu5KNzjKun/lbz1QQ z/wc7cgM+XX99CrgcrBZtTssvQtgw+pBwmLGuko3ZTGPz3r77rQ8RyNKJy2wKMFqA0/61Us+b uPf70p9bsAiYqI6EoBfuPSEp+x/Hor6lf9pj822398rYXqZJwZuCXgbu8AA+sbEzSNseWuPNt TT58ZGEo9jP7dDeKn8s/DlxrZJT3H6rcw2PXkRpLB2ipZgWfh3Ss8Ho/KzDJjcXmrbJjQytIw 33shmJlXvFkGV6egdObcoepjSSpK74Ea81jsHBR28nTnqPHds+AyROz3GVXSHpJGe/wYNfLOf lGadqWmhnSzBVGmniKhOGEjvkZkePEOqsZu8L0t/WdYBJd7KyaPKUPyn598j1kB8D96Ont8qH Zq6wt6Qlnl315syWfGiARXuOdM9EKe3M3uTu1ACkBdoUCK/37mlkYTS7o2bmSOFGDoSavk5Cu Lp0pGtbDabhATJCsZoTNjrGzJ+gi83e78qXog8xb5foIgnDHZhaA+tBcE9qqCz9qAn8WEKO0d 0+1XbPmsaTUTSwQ4ipmH1gCGeE8CUTqZD8Zi5d1W9IcWEKqiOrM1/EUAhPbCwFCn/aIu2K8Jx 3OBQ6NQRE1Aqr7Dkx912ruwpJJtp6HxCAIp9I5ltqWOhp7bTAl/yCqoV2neefM52Dc3JoT6Wr 2trt9bZfquy6LiqgLgJnGfaeACk7duUTjuE+iKALEbmatGy4hrVMIWBcjzMokhRMSlPiGMys8 0VUFJYSUZ2Y8M+78Hq2bOhHsPQjCWMJNzvuWmyS9xlAleXdKRZ0W6RKtU0vwn+HikrlcD+WiD J9EO7PvbbeEEe1gtl47szN4N+vE1gtebH1CY4FmegSSNqI5m5LipneRKFM70EESx9X3B/I4bA 7VQvEBVjeSeLGqjrZ01ikX75+Eg+gRY8ll0q2+TNqCctdDaVjVGNwUhkxvaMousDTFgOfxb5U /EenQLRhSvHqCNcLVIpzSUL0jI7+Z8n445Oi3tb8woBQuI5F6ytqb2Qw9LrPbWppDzYFTxnip LHHL4jIyKn7QqAjI5VBt1SMCfhMHMReN4cdmhshg08b0ID2Gqf0vqQyZguUIUDPzSkKeHFrtY KJZlcxFR5Hn8x+fIvfFn4ZsLncDxs6OIpvved6eR1mah+/S0W4UGE5fLg== 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.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Guix! Here's a V2 of the tree-sitter patch series. Changes: =2D Split tree-sitter into tree-sitter enacs tree-sitter-cli. This way applications can link against the tree-sitter runtime without depending on rust. Emacs may do that in the future :-). =2D Fix the node build system changes to work with cross-compilation in the future. =2D Use cc-for-target in tree-sitter-c. =2D Add tree-sitter-bash, figured out how to package that one. Thanks, Pierre Pierre Langlois (33): gnu: rust-chunked-transfer: Update to 1.4.0. gnu: Add rust-fdlimit. gnu: Add rust-html-escape. gnu: Add rust-smallbitvec. gnu: rust-tiny-http: Update to 0.8. gnu: rust-spin: Update to 0.7. gnu: Add tree-sitter. gnu: Add tree-sitter-cli. gnu: node: Patch /usr/bin/env in node-gyp. guix: node-build-system: Support compiling addons with node-gyp. gnu: Add node-nan. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-bash. gnu: Add tree-sitter-css. 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-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. 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. gnu/local.mk | 1 + gnu/packages/crates-io.scm | 290 +++++++++-- gnu/packages/node-xyz.scm | 30 ++ gnu/packages/node.scm | 31 +- gnu/packages/tree-sitter.scm | 791 +++++++++++++++++++++++++++++++ guix/build-system/node.scm | 16 + guix/build/node-build-system.scm | 15 + 7 files changed, 1141 insertions(+), 33 deletions(-) create mode 100644 gnu/packages/tree-sitter.scm =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmErY+0YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UtlUH/iGlSOaAWq3oU/Sx2zTpmC/5 cgzSwm0XmUaWSZNHTk30WbflF3HwqoqpBV5g92xpk4vfZbyDyXaqcr5YO6ueJhpc ga60DiP+GD6edx053mzg+/A7/JdCoVQGag+QXhk3brrO95DNQwq7St+DjhKPvdEa +9EE9/ePmIJ30cPxWk7zziVMyivD8YqcBc7z5bRpn/jjTh647+98aZ+yzgtTXHyF +wsG7EBSUNRNoMT9cyqnER0werOVXluSkjvhn6RNKdRJHqSR90QBGYim/jxoIMZH ZZUavwb4JzfwArS44c/j49h0OoaWIoX8cLZL3fQuPKSYkCX71+NMdB/GgXi6GvA= =z5lI -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 13 Aug 2021 13:29:54 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Aug 13 09:29:54 2021 Received: from localhost ([127.0.0.1]:40907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mEXFt-0007yd-Vv for submit <at> debbugs.gnu.org; Fri, 13 Aug 2021 09:29:54 -0400 Received: from mout.gmx.net ([212.227.17.22]:32911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pierre.langlois@HIDDEN>) id 1mEXFn-0007yJ-P4 for 49946 <at> debbugs.gnu.org; Fri, 13 Aug 2021 09:29:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628861377; bh=rut1xBNsP20UzKa7f1cV/TybAuAVKWDX/YbHU4iS28U=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=Q+w3jXKBfbfAPb6j/w9w5fxJbY7ExUipKNa+oF3YKJl+GHTAmQ8bImtUydi0QFpEV dXfgBrQWRSE0064h2+lM5oGj4yOXb3N05S0dQIz6oGmLOTZEy+AfNAjLEJ+gs7FC73 ts7Mmhk3wA8ZoIU9vJdLD0IXzkwe0Lg0LXzrokQQ= 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 1MJE27-1mXzmU0l6R-00KhFj; Fri, 13 Aug 2021 15:29:37 +0200 References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-7-pierre.langlois@HIDDEN> User-agent: mu4e 1.6.2; emacs 27.2 From: Pierre Langlois <pierre.langlois@HIDDEN> To: 49946 <at> debbugs.gnu.org Subject: Re: [PATCH 07/31] gnu: Add tree-sitter. Date: Fri, 13 Aug 2021 14:17:17 +0100 In-reply-to: <20210808233354.6745-7-pierre.langlois@HIDDEN> Message-ID: <87zgtla2x0.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:kMMAkOASWTi9YcP/+yUCA/NB+Gw/qnmog2NjDNh5H/RjsFOPFm7 5AR05jl7Ke7bfLQViXpq1bf2PTEStOwcn8FOH/W+Pnlcx3Q47fMCftRf5Uh88emjs+ffG+X O+7+SdJDqVVxTI8vSt/gpO6LdBVeFKr5/nZh+yysQNlzFrXBtia22HKB3PJTf5XATtLvLM8 ku6r62+/YJTRjMo+P5mag== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:XrGJofsdRkk=:/g8ZDRmD2FbJs9YK20yrfH bmqmZG3ZzVgRi1SsAEnbxTrMXMWGYBTa8EvZ/GMi6a46G2b2D7Tr+5YFPRVCag2C54jgLE5iT rVzieXYVFWiaLTkj6NF+6COrFWHCq3wMnCJMoK4KoH7ZkwRohEbYsFmtZVCG8KoDq+TAADTPY t8EqfdXqpIJcqKpjmMbhaV/rUp2UjU8EWhTAC8m3c+59QgtphtYwyxM15YGbCanIeyUd8QowM jw3UayEwh/VnWfgFoRaQO0P7hVPATkQpL/7KViY5YI/p02xeUfFEfFO5tfQASgfR4tePQlPOI nKstHOyoqUlwoLI96G4nEl29gI4NhzEQTJxXVkn0uZG/lcwXnQMhMRy0dr73PpHDa6R+L8kLP 60emo6H2fGTOml57VKltTQzC3N7p5Q55HGPaYUv40H5v8srxpM05ogUBIe3geh8xxfhMDA0ef D0SXPLvFtXC4Sa60DZP6od9KjYB0ZL1tVvIAO7mL4QXtvrwDcO1SNBt9eKo/KBDTAHQ24EV27 YCe6okFyZIA2nYCZkYfy4wZAZ9YKUZ4W+nYZf0S9ayg+U5xl6fXv9/g8gO55IEjuCys17yd20 +ENdQmGwtqXzf0j4dOAqlF9r+0zpbUdhnrft4nLsMGLBG3k/oME22YEUG1DLLfclihCA/t5D5 oJZWdblZKIVAhd+R4zqPYMxAdOQMJw5ERUwdD8N1jwCrBBEuZE+jsOXrZkX3JxzSPwbOtWULH 1Gvnhm2MsyMNygh7V+oNxJpfBgnPLtyZ4jf1fTklpsh3xI2zFsW6wHNBbWYKibrutY7uh52Rr 24CUhyep91Fg/oKoWMqpXwyPRFQa5YzcRcynsgviKcaQxuSdFSurxD+bqd6ryigSyBJfDhJeG G2BcdeWa+/fWwpqvsokGls7mVa2jwBW57C8EfcflXgzNaqAkMCgeEIkUcXmZ/tvOtvyTM4AQI ZUEa+feXQPIzxjfH8haALI1QW9ihDbmTzGW7ImuVEKY3EYyXJdwxgmIzNFGjRP1/D4W9mA44A X6vPgEqBtU1d1uQLsMgM3FWF1rMEOO4XEFuodLXBzCPXAfmiLdSvTlIMXFylrEi+HEjpGXX6o RZO5WvkHonh18vkeHDR6M64euWX54eJ3wMdoqH9kdXqxTamwv1mE124sA== 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.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre Langlois <pierre.langlois@HIDDEN> writes: > * gnu/packages/tree-sitter.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Register it. > --- > gnu/local.mk | 1 + > gnu/packages/tree-sitter.scm | 98 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 99 insertions(+) > create mode 100644 gnu/packages/tree-sitter.scm > > diff --git a/gnu/local.mk b/gnu/local.mk > index 3f09b167b1..3763df0821 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -559,6 +559,7 @@ GNU_SYSTEM_MODULES =3D \ > %D%/packages/tls.scm \ > %D%/packages/tmux.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/tree-sitter.scm b/gnu/packages/tree-sitter.scm > new file mode 100644 > index 0000000000..2c749dc0a8 > --- /dev/null > +++ b/gnu/packages/tree-sitter.scm > @@ -0,0 +1,98 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2021 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 licenses) #:prefix license:) > + #:use-module (guix build-system cargo) > + #:use-module (guix git-download) > + #:use-module (guix packages) > + #:use-module (gnu packages crates-io) > + #:use-module (gnu packages crates-graphics)) > + > +(define-public tree-sitter > + (package > + (name "tree-sitter") > + (version "0.19.5") > + (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 > + "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn")))) > + (build-system cargo-build-system) The tree-sitter package here both ships the `tree-sitter' command-line program, written in Rust, and the runtime library, written in C. I think it would be better to split this into two packages, `tree-sitter' for the runtime and `tree-sitter-cli` for the Rust program. That way, a potential future Emacs will be able to link against libtree-sitter *without* bringing in Rust as a hard dependency. I saw that native tree-sitter support was being worked on on emacs-devel list. One would still need Rust to actually use it, but at least it remains an optional dependency. Thanks, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmEWc7sYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31ULTwH/R+uDT5j6mrUlYW6Q39UKilQ WzzPPUVLns8eSZmvDX4hJOxO6+qG3X1lprUOVNgRC4DKncMVW36ntYLqJDin+eFo Smh87p+1K0itjMuriiOU+foMfUxPlZ7oeHbrQD6y3cBmfUAy8J7G/UtZ+ZBb677b jycusQGkWXaahi6Llh81g+pZuFAp0+pYo33fhlsabAgI1HzuEUsHDXEWUgfJM2Zx G+vuyAmGyX3jpA/RXHtXXifB+dnhD4NbUsSb+edCLWUG2OcoW9PNakBhloo3O82O eHibETllS3pAV66m7gFrZ0pM5V3LdW7o4x0qzQXtYgFAbtPiJjNOqf2Gc4y+Zig= =hY4u -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 11 Aug 2021 15:41:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 11 11:41:29 2021
Received: from localhost ([127.0.0.1]:36341 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mDqMD-0002ev-4e
for submit <at> debbugs.gnu.org; Wed, 11 Aug 2021 11:41:29 -0400
Received: from mout.gmx.net ([212.227.15.15]:49193)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mDqMA-0002ea-VE
for 49946 <at> debbugs.gnu.org; Wed, 11 Aug 2021 11:41:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628696480;
bh=Lsrv4b6mBynTuyJNjjgkxmDKkXH5vvuYvTaacJ3lKt8=;
h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to;
b=MPI4SYAnopJFcpmTnGhtBTQBjZuSIOM9fz3ybWS2gFy94tT/SIPsV1cjqPdtAHuNR
KYN3IhmfJGLM2fQmKg/k6lVOeX5Il0xWXED2NMwX4l0uMGUCaGuEvNuGWyuEhzb3wC
JBVXYwTi6xyuYkei4YmLEWHjQwWU5Qu4X9l2Ewpg=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004
[212.227.17.184]) with ESMTPSA (Nemesis) id 1MhD2O-1mhy780Sjy-00eLqb; Wed, 11
Aug 2021 17:41:20 +0200
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
<42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
User-agent: mu4e 1.6.2; emacs 27.2
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
Date: Wed, 11 Aug 2021 16:36:11 +0100
In-reply-to: <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
Message-ID: <87czqkng4k.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:hN6Z+7K84/ahH5ttBuqycrLwlP6XDiUA9Pt3PVnv2EvGvcPHGVM
vBbD9sr2PkVuzFf51cTr+nEP0wGeVLdVWXLF560VH86hdD6gBse5lfA3JaHkjemXVu/18/r
r0abEo2rT0+ScsxWf/O8Ziwy8/Jbf7Fu1HoT2gXWIZyDSGw5zRIaolTu/dun76ABCQnH7TO
l3/BDTTHN3z9bSdqLidNg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Hqif4NCGYdc=:+hxaBvrkMUKAzvyTsBnjwv
fcIO9Ej9NK3JMugWcN8czT3+9BXfKiErIgo+qcUcozYED2Nw+w3CsuW3o9TZA++RkjrHnyWvf
y9vDg+wf7krnkRhoxRGTLd/75+7kdulZ9zV+ETrDDnyS2zz6mH4r3ihjxlB3yeT/ubQ0NX1YA
Jd7/VTeaCIs9tYPSoaG/Y6lLvBN2AZqcUqv9ALuqZKxC290NQndPBqIyvYCcg+X9IHHXXV/2F
aFZHr+OWJcywHn22D/g+Bsoc1u/mcM2WxkYdCS+dHeYZjCGZ1LQPRs+iHKeuB7EUHvn4vJLsG
y3T7ZyghWbYmi7zOapqZ0vPICE31/5fzOIMuf3nv3naXCOG31Gk4JI5ZLxfIcnNHcVarvB2l1
EDVJboLUfJg9Xz6FgPhTDlARhjc6PtAV9glxK7GUWETNKw2+grTgUJW/8wkc7C6PjWoL2Lrez
D+r3FQAb+B2ZBDbupw7hTTBuFvCka0yNjVwFjOptS35Ktm79cIppqZHtV77U42hK78ACg54+B
yQgZH0v/cvBo/xoC9IN5bcR029AvwUztKPfqFt4F9WK9GpK1U/KjP2lAWiR0nWwbf7BXvHj8A
+dvhenIaHlZ2qgLG/wKXbKStYpX6CguTjmzjmYd/tlkQ5AUQyN+0W/IAKCjf8v8vi5crlaIUI
Kh7UYl4pId07PVnt5Gmc/XxMmWYM/y+l7icIR03UFyXN2dtXeQ59BykkxGlqISEucVxQIzHOM
UK7iZhS37gJTxv41DE/3O/ECG409PjhEAU1702KzJK87/LecBztVZNTk/u0D/9rOrxbEIEehi
3QVwGpje9+ab3rvTH8TvT0bZ3xhCHCcUcX8LGKxedhR/Eg7YMxlgE2Lj6Th/PJcvihITAFOtA
ZQhUIevp0ZnSemVsyCKVJRXrzuwsQgQ6kyt95SZX6vFdmpDcQL49MmFaayAMwv/o0raXE2jL5
sxZ3j9X8Vfx30yahGFzV3Bd/NbiMdlJY9nITCFF1Gbc5bjHQEJqAMZB9VwIF0phTAXT+QkE0c
83Cut9Xz44JzYgT/xgJLk1xjuk6Wi4VKFS0Sw8mFSJlC3t2B3VQVRIZTHHC8jAsJ+Es/+Hv0h
Ae36uD//V94R9JHbh9esd7lpmAeiNnhTgW+ne1xWTskPN7ML+SOyJozKw==
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
Hi Maxime,
Maxime Devos <maximedevos@HIDDEN> writes:
> [[PGP Signed Part:Undecided]]
> Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]:
>> @@ -120,6 +120,10 @@
>> (("'/usr/bin/env'")
>> (string-append "'" (which "env") "'")))
>>=20
>> + ;; Fix /usr/bin/env shebang in node-gyp.
>> + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.=
js"
>> + (("#!/usr/bin/env") (string-append "#!" (which "env"))))
>
> For cross-compilation, this should most likely be
> (string-append (assoc-ref inputs "coreutils") "/bin/env")
> or something like that instead. Likewise in other places.
> The old code uses (which "env") in some cases, but those
> are probably wrong (except where it is patched in tests).
Good point, I didn't consider cross-compilation. Actually, trying it,
it looks like our node package doesn't currently cross-compile
correctly. I just managed to get it to cross-compile though, I'll
submit another patch for it! In the meantime, with this series I agree
it's better for the new code to be correct from the begining though.
Thanks for taking a look!
Pierre
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmET75sYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U65EH/1viouDCu3YEBTff3X725srp
+kf8oKFE4Vl/cE2uR8Gqolj4ldjYKYiYrf/Mhz5oM4+N2LqaJjaxcs+3dRXV8NrS
51CYHzWmhPu4kMf3LaetK3s/kjauDME80EHaOYDiH9aZn2h6D4QOmHbA/Xs7Oct+
2Ntoz356uMaD6jzluK1ljCmLQyew4TnlnaOzzF4MzJ6mE98noT6MAiMZyWmf7aXv
ax6Zr6f+hJc83TiUAN6hKX4hc/sIGv8c9MwCepNeZZGQHeJvAiw223bIfClXlIPJ
2NPTab5FQ0ypbpDhmmhoZ787yS3SRp18mJuC/PblI9l5WZHd+GR2Bue7kXdl1vY=
=YsOg
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at 49946) by debbugs.gnu.org; 10 Aug 2021 18:30:34 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 10 14:30:34 2021 Received: from localhost ([127.0.0.1]:60819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mDWWI-0004rd-5e for submit <at> debbugs.gnu.org; Tue, 10 Aug 2021 14:30:34 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maximedevos@HIDDEN>) id 1mDWWG-0004rR-Th for 49946 <at> debbugs.gnu.org; Tue, 10 Aug 2021 14:30:33 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id fuWY250070mfAB401uWY3K; Tue, 10 Aug 2021 20:30:32 +0200 Message-ID: <fd74360c5ce59c7800d1ee528036d43a4a9fec32.camel@HIDDEN> Subject: Re: [bug#49946] [PATCH 11/31] gnu: Add tree-sitter-c. From: Maxime Devos <maximedevos@HIDDEN> To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org Date: Tue, 10 Aug 2021 20:30:31 +0200 In-Reply-To: <20210808233354.6745-11-pierre.langlois@HIDDEN> References: <87h7fztt60.fsf@HIDDEN> <20210808233354.6745-1-pierre.langlois@HIDDEN> <20210808233354.6745-11-pierre.langlois@HIDDEN> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-P+EkIv4mzcoF9ka6m7DS" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1628620232; bh=Vytc8oZ8zt9ND8Z0uGp4OpxdKvMUmfJyc8HCZmJ96B4=; h=Subject:From:To:Date:In-Reply-To:References; b=N5QCQCKi7Fc5OzwDvHx4p3iRO7TO+twdKl/4cYePvvYTvT1+7UFjuXiPo+ZtDlZaI /GtFV3yN6w66mCV+KhEGU2xmh5AfwwniMTQFFv77u76lEU/LwsgOWTS07YxmUB9iCR xDEDFOVPSFl997MFijqcMVZ6tVYPzrIUQ359psgHnsZYVYrYpnG2Enn52Oqz5RT8it KEcy6/wNtt4vMKH+y7M3Mty6KUR1kW/bCRJzGhO/s72AreCgbYFONSZ8QmRP14SPa9 6xBgv3ThJ458Mxfn1DFAUeW2r5QNhnUzkFQbfWRrRnCrxO+zBrzoxBU3dN6I+v9VNY g/BCSgssksN4w== 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 (-) --=-P+EkIv4mzcoF9ka6m7DS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]: > + (setenv "CC" "gcc"))) Use (setenv "CC" ,(cc-for-target)) instead, such that the cross-compiler TARGET-gcc is used when cross-compiling. reetings, Maxime. --=-P+EkIv4mzcoF9ka6m7DS 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+4iGRcl7gUCYRLFxxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pqsAP93DYjd22Jnvq86nV9t/Fc0ePrv JFHBVxHk0H3v68M7VAD9Fo4kKgqsuDWUqyiahLhV81pHRrSIMHEGpAIMVxqp8Q0= =uvuY -----END PGP SIGNATURE----- --=-P+EkIv4mzcoF9ka6m7DS--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 10 Aug 2021 18:29:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 10 14:29:00 2021
Received: from localhost ([127.0.0.1]:60813 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mDWUl-0004nO-Qu
for submit <at> debbugs.gnu.org; Tue, 10 Aug 2021 14:28:59 -0400
Received: from baptiste.telenet-ops.be ([195.130.132.51]:59564)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1mDWUl-0004nF-3w
for 49946 <at> debbugs.gnu.org; Tue, 10 Aug 2021 14:28:59 -0400
Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d])
by baptiste.telenet-ops.be with bizsmtp
id fuUx250090mfAB401uUxe4; Tue, 10 Aug 2021 20:28:57 +0200
Message-ID: <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@HIDDEN>
Subject: Re: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in
node-gyp.
From: Maxime Devos <maximedevos@HIDDEN>
To: Pierre Langlois <pierre.langlois@HIDDEN>, 49946 <at> debbugs.gnu.org
Date: Tue, 10 Aug 2021 20:28:56 +0200
In-Reply-To: <20210808233354.6745-8-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
<20210808233354.6745-8-pierre.langlois@HIDDEN>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-CyIgvPAPhMZfPTaU/NLl"
User-Agent: Evolution 3.34.2
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21;
t=1628620137; bh=ZqzBSV581QQKxdRohSUvKqvtaosDOLPl4td/N8hEtZE=;
h=Subject:From:To:Date:In-Reply-To:References;
b=ny5ceS+sV+1umwUB7+1COxE0fWdMqjLnK/YwM1PXZbkpW5xuC9jgMmV5Z1hp+yozv
6/dz42ZMp8U+2QHZGpUEzfivP1Twk+lHQRs/CgeF3OTu7hnO6sp//rEIzUZ9KlFgIO
jd6CDmaqu/fi2AdshWe8XzN6MhacnOi//PlFyQRjaRn+erxs6CJd+B8HsmG8bKzXnT
8atThDYnvJd2xzdLiz4/9rcfCSeUc8g0svcQgoVm6nHIRbBlBkeblocx8BorsQwJ9D
YAycNkyS73nMUQqQtJUjI1u6UbtA7BkqTHriYPPBxnDhVLd2bS9Pf0ZxZ4AmM64CSx
OVq1TCUFQn10Q==
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 (-)
--=-CyIgvPAPhMZfPTaU/NLl
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]:
> @@ -120,6 +120,10 @@
> (("'/usr/bin/env'")
> (string-append "'" (which "env") "'")))
>=20
> + ;; Fix /usr/bin/env shebang in node-gyp.
> + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.j=
s"
> + (("#!/usr/bin/env") (string-append "#!" (which "env"))))
For cross-compilation, this should most likely be
(string-append (assoc-ref inputs "coreutils") "/bin/env")
or something like that instead. Likewise in other places.
The old code uses (which "env") in some cases, but those
are probably wrong (except where it is patched in tests).
Greetings,
Maxime.
--=-CyIgvPAPhMZfPTaU/NLl
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+4iGRcl7gUCYRLFaRccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jcOAQCV9XqauiR9WpI550tltw8xH4Wv
lvGKYPnUb14G5U/W3gEA6sDJnEtt6s7Ag/t6AerN4qI28JQeCxQ0LkrLhz4nzQ0=
=80uq
-----END PGP SIGNATURE-----
--=-CyIgvPAPhMZfPTaU/NLl--
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:26 2021
Received: from localhost ([127.0.0.1]:55056 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSw-0001Ct-BH
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400
Received: from mout.gmx.net ([212.227.17.21]:45871)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSo-0001Ak-Vl
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466253;
bh=cJ+smkilZ5hVatxqW5W1zs286emB7Qdg404pjqMfrdg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Nq0OjMAhS4cHAuCluJ1f+3ZV/TAANCOVGZfpwRlyM/yv/j1yZRi4Gyxz5wN4p0+2z
tk/69Q0g2LvCqHbe7sytpCXt/m8nBIlny2lpw7bQYdfmKO04KELtajuQtwWJb1rNzp
o/zio4pzlOxvFLKYuZvnK9mNoXhzELHcI7oh1v10=
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
1N5mKJ-1nB9420Utn-017AOh; Mon, 09 Aug 2021 01:44:13 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 31/31] gnu: Add emacs-tree-sitter-langs.
Date: Mon, 9 Aug 2021 00:43:58 +0100
Message-Id: <20210808234358.7241-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:HcJDJDroOU3k8IpXLDc3hMMoSPMnAXN/w8o8rBUaUOwFX32CAT0
h6LvwyXgSSDLsSxPtTDyuusc7krSeZQ5k/J6YWEBjhxiacGvbMpf//gd9LD0zksR0I5NjTC
ymb7crQhAQU8CxbWFELhnCqDKcPWQmXAit+9STLGaAb6v+RTyuVf42Gze59Yho3fNAox/Md
NcU8VBd4IvWXhebhnLAoQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:AW+t8HPvARs=:0Jmm7daJpNw3v8/k/5OUGj
4YYhYTFW2DKv2g3BkOhyyE4gKh9sNR73UCRE+/3RmyJynpzX8yFxahPYIwZYJi3yfB6f0NfO5
1DCHYKU5LeABOriDD0rtYg1be2zIJ6uvqcCyNC0p9nEigfs1Ss8Pb+7rEgXmsn+pYWu7y/jvd
ZyJWo3jBos+5f0PaYFdF/9M01qh/gQpn3Yn6WZaJS3c4xDbnWnpzbkXApbdeelgwHIAh7lt/G
g9OCi9zmmMp/L5V5aRExYUmUErpp1hnAEa7Yp3fICF4L2BkL2r4Mqazz/wLzgFVsHxhpAMoFH
7JJJVMya2ja9iHPmVjDYO75KUxQ/xF9Ti8soe07uqqVoLvhCNCAvvUNfz1/nEgQmNpvHppRzo
4xoWpG6+zd48cfFwZl214AXD9SEKhq27gq6R1wMbu0aL5OHK7tf6I26ra7LnQMZMrC7ObMl3g
iIR+BjXNPHSaF34wnTDmqufz44I+cHIkd98L7JrCPreIG5JTXoHWqjK2VQxuBE87JWhEqiB9P
330mr4Wedh9r2uoXjR8G1DLwxSTN8I6COcLsfY8fawiITukH5GI7K8JPWcbTJvQviMEncbPy8
LajLh2PprMEGlfa65cCyVXC+6XrA7gmeWsybpfWrHsw8ptQXNVSUS9SsDLhrthNTGlDrrZYaB
aNnAA0UKkCoLIwgo3T0f8JNzux59zuflVYIOHao6MXcawB0ya5sxSRzNSLyFjEvLvIIda2rv0
CxdxGrMgGhXGUrMZ8ga0iy5mTExwknSAGeAV71EDWkB93uAwJiGDhY8yR5G8pY1RfJ8akMOf3
JEtxZrO0MyZrMMVojQM+diQ0T0xeAmZ7NngM9eFxaP5YlBNSf9ETxQUQH8AZEcCm3GzLKhfcu
LxLXWxqfXZTPyHMxXSyn8mnPWWa2fzB9QJRHiC/XvPSet06qckZh/G4lhhfkGlvpxb/cWAHHM
cTBKkOMtZq5yZryDMdPgBkNX5H5hFsMHgCrV07nlTurpqIfs3Gf6VTr8oXHBVvfv0YAF1D1v5
qjVUM0EStXB2LLSs3TI0PmyfgUsvyzX54xphb8ePpxRP1dED2RwVv01HsQYxCVhrh4HqUuHmL
UNLwTkdk9/V/efYSCwNnxO4zLxwadbVw5AW8JiyFAoumCPnJ+8rWiDLCg==
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.0 (-)
* gnu/packages/tree-sitter.scm (emacs-tree-sitter-langs): 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 22551d4482..bfdfacf122 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -635,3 +635,82 @@ Emacs packages that understand code structurally. Fo=
r example:
@item More informative indexing for imenu.
@end enumerate")
(license license:expat)))
+
+(define-public emacs-tree-sitter-langs
+ (package
+ (name "emacs-tree-sitter-langs")
+ (version "0.10.2")
+ (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
+ "0lym09jnlb7kvqkwkjbrqpc24fkpv99f8r9139sw8g537yj5f8rq")))=
)
+ (build-system emacs-build-system)
+ ;; FIXME: Support for some languages, such as bash, is still missing =
from
+ ;; the bundle.
+ (inputs
+ `(("tree-sitter-c" ,tree-sitter-c)
+ ("tree-sitter-cpp" ,tree-sitter-cpp)
+ ("tree-sitter-css" ,tree-sitter-css)
+ ("tree-sitter-go" ,tree-sitter-go)
+ ("tree-sitter-html" ,tree-sitter-html)
+ ("tree-sitter-java" ,tree-sitter-java)
+ ("tree-sitter-javascript" ,tree-sitter-javascript)
+ ("tree-sitter-json" ,tree-sitter-json)
+ ("tree-sitter-julia" ,tree-sitter-julia)
+ ("tree-sitter-php" ,tree-sitter-php)
+ ("tree-sitter-python" ,tree-sitter-python)
+ ("tree-sitter-rust" ,tree-sitter-rust)
+ ("tree-sitter-typescript" ,tree-sitter-typescript)))
+ (propagated-inputs
+ `(("emacs-tree-sitter" ,emacs-tree-sitter)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fake-bundle
+ (lambda _
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file "bin/BUNDLE-VERSION"
+ (lambda (port) (display ,version port)))))
+ (add-after 'install 'install-libs
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let ((elpa (elpa-directory (assoc-ref outputs "out"))))
+ (define (install-lib lang)
+ (let ((input (assoc-ref inputs (string-append "tree-sitt=
er-" lang))))
+ (copy-file (string-append input "/lib/tree-sitter/" la=
ng ".so")
+ (string-append elpa "/bin/" lang ".so"))))
+ (mkdir-p (string-append elpa "/bin"))
+ ;; The BUNDLE-VERSION file prevents the package from
+ ;; downloading libraries at load time.
+ (call-with-output-file (string-append elpa "/bin/BUNDLE-VE=
RSION")
+ (lambda (port) (display ,version port)))
+ (for-each (lambda (input)
+ (use-modules (ice-9 regex))
+ (cond
+ ((string-match "^tree-sitter-(.*)$" (car inpu=
t))
+ =3D> (lambda (m)
+ (install-lib (match:substring m 1))))))
+ inputs))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:26 2021
Received: from localhost ([127.0.0.1]:55054 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSw-0001Cm-1n
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400
Received: from mout.gmx.net ([212.227.17.21]:49817)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSo-0001Aj-Mc
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466253;
bh=MxIIl6QtYgn2aURnCx6u80YepVwj/NjskypHsa1zeGM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=R09uuqvcxyvEfAB96JGyQg7MEnqh3pMeoudFN7Uy0DoICq+sEhqwYUFOCVrCtLh5O
mE2FGlXMkLei4qXlo6xnTQU/5xo/hniQvPhVddVHijgkQnRRyvLZs/PiO33VTnarfK
rZUqVpJh1croOdMdMZ6eNqXJsTeBl88KyvwOek5k=
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
1N1Obb-1nFWmF3VV5-012mfz; Mon, 09 Aug 2021 01:44:12 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 30/31] gnu: Add emacs-tree-sitter.
Date: Mon, 9 Aug 2021 00:43:57 +0100
Message-Id: <20210808234358.7241-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:b2/wn25vpd2Iyu+JYoHbQxJllVEJmT2BJRn4lZjErwZldMAbWjt
A3affZXBHz0imNJR3r0nWHp5Lg3i0tocd+wsA3A8mROl+OkOPLftQQ4EX0iJZvrXacU7ped
02XWJzV40w6ka2jDL9CjCWXk55/7+8odlxQB1C/0c6A0ihUTvICGkhe67FCq05vwC//spOM
TZkhVMuCfalNSQYdppCig==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ARNq+sFm4vE=:zjBVzJi7Z22juyfiX+TgZb
tMiqzhawF7AxgZtJeQeuQSP+3MoQyoT9NvpxFfsyqzaHuOefHZ7ZjuG3uM8iQDJsGahpJ8wj5
7t1KRCffRftMl+lEK7TSXIvgt9gu/I2ljg1K0wcGJVKAkjQ8E2oHhw6Nfcs00FvB/tdekdlLg
i7AHlVoXuaH4jbHKpKjodM45afULUAyjYnh9q46WPWHGIA5YiAETlfbKSW2MAbxEZA99Fkdwz
VDtAVjOI0ByAUgatVeeNDTbk1KCqBcm7TN3es2TZYXsikvS3ej58G7FtcHTsVCggz9ga6T5JE
GcPdf+tarHPnOagVntVXgW4/8Cs7AA0wKbgJ6u9sy3i3Ql1K+jf05bqcnZ8d2ZvQt+S/sZILx
MXHCZuRcgAyW3B6TaJA8jsw9jp9QQTEkp9JvID/Xr9z0rcje+Ohkk5gMLAXwZuae6S37wFaue
WF0CqMe6OuqyEytXw55S3fTzFJv5PVars38MKk4T4C/7IfzAYXv0NmCU9RFCTknhZDn0kvTuk
zBgslpkhm2kRk7mQfc67FVcq2euYA1uj/0+v1wSHo1bwZtbPrYXyRcA2T9bJXrJ+bsIE8+YPJ
Y5B7IhyiZVhBppMofUySTCE6idi2ABI+05gAk6bi0nqd4bWm6K+Pq3H5j4AxMqNCpIXZcnbAm
0Y39l84ZKeYpimgKZMzK8XuzoP5qwfXg9j8ndmCEGFWGTt8K7lRXZxCnF8aRJLf2pBxV7oc3U
GxaXP+8nvjSMNv+kqnyAD2REvr8nkd9IWE+6BSOKpLzdalV9hCewNK4t8Vmjgj8veiU3MkuYv
bga8766A6ck882kjtcdhk0oMNybvUau/GDdQEvQTCemMIdfkX4Qkrn5tS7Utfnlb2T/oWdwQ5
NC9WxeNLdut5xl0Og2WRZqyQbcgyAFeSVJ7x+/uSxLTXHRIwClr39GShw7P4r3D5bR4ks3kJ4
4a9oflSp9mRWGnokArjXeteQNbBhSfGVfOeR67y04+95yuRjBGQHuycHdZqVqre6Ek6+dY++r
I2jqHkAz2gRSu8SK/O0UnxLMreLtt6mFZ4yu0I7VszCLzdCvbn2WwwrIZnK7srjoKltpsK1Zm
+jT9dZR9DwzwIU0bIxKRYYqAV/wwXOuiMviS4C4nULDZCGezYkQxcePuw==
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.0 (-)
* 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 a9c1714936..22551d4482 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -608,3 +608,30 @@ library.")
(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
+ `(("emacs-tree-sitter-core" ,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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:26 2021
Received: from localhost ([127.0.0.1]:55052 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSv-0001Ce-LW
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400
Received: from mout.gmx.net ([212.227.17.22]:45303)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSo-0001Ad-DT
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466252;
bh=shRZoDOWrmuUCP0eFRbx/3IRBHzxDu5IwQ8E55n4Tg8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=U5Qp3d+MTZKQCtLvd79sRSbuXr1PORDYFQJUO1D1AcX7gqA2yMCpANUoO2v8TqjP+
QYn+y9Pu20hD3Qzj9mHbJ7imBB3InX42fTbDzK4vpR+RS55R3a0VWbK4eErPMv4jQN
ZacGeo125sISYHxxFlT3ojlKyVVeA+C1Cz805V+U=
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
1MeU0q-1mnJCy2KU0-00aYwG; Mon, 09 Aug 2021 01:44:12 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 29/31] gnu: Add emacs-tree-sitter-core.
Date: Mon, 9 Aug 2021 00:43:56 +0100
Message-Id: <20210808234358.7241-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:JdM6uC038OvSgOPmM1gDwlmz6yWgeQvE9cOTcODMbzDuHVgY6gi
N5W7jcmySGY2WTMnGGVA7ForejX1PG68KZ3oFYHSyGy8BZ/LeorzpA/ArMbTFQJZOHqMkRf
hWRsiX2DpvX6dH5SB+gqRleIjeJCQcqs5qu5r3SXmGRR6xY/TZfXFfxbMXmX3c8RulkuR2D
eY6yanlTQaZ9wsxLsf4bQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:z1HbeflHH54=:5zxr7ZL3RwBOo7uBCch5qp
/iXR7UP/eaLjsqgkRCvccGlpc3GMP3qkjb953vz03q8SWqMzdPTXb17nRgpiqc6V9MTmobg31
A8CynvEBRN50z5RxFDEbdte7AdX9nGezF21yjwC9hMwRZSpimNPNtpbIfLAYDwgIvsfmVAFcT
pRrJHujx3oHC5psBl4HM336vfdqOr7dn5B4lFT5Yg3ESWjKEMVuM10kdsWsMNSU+5glQqCYQL
xXRlY4g7XS4Fils1TkZUYmght5QtGRfwx2QZYQmb5hFqZjKcnDByHB7RJ7Y7Rcpqu/S4R2sMY
3jtjJNnIGUxv0kANYl4WnHLxWuAWHZDxw0XyQZoj4D/uNRWQqJhPAQmvLrGxwIXgbjgrslmSX
mhzpCSC4o5DhZol9laN+1cR4Q44ok5CRVQP/FmOtoClEXHYmK/xAyQmgIcbs56V/LuCCq3JjF
jIQ2ZFSuERQ1w6Y3epXHdijDmjJl/kiVA0adNjA+3+E7TBLmXxrHZDPZvBCxzcvOItr3CWvQy
SSyxSrPebEqb0VKBYwYM3k31AqsvO6ruVhF/wNSGm3uNa9oiZAoJXt9I1oUgFGVG1MgLg07My
dvxQ9bokX0pHUpSpsFuhZKHl648ZeJUS3AWsYco7Ys9tuM9CX/IRp/3eSBoOEcYyj32/MgQk5
Uo83zK4qmywJx9VNHZQmmI+pZ58m4ST9oCDK9lkpzjLmu3MH0q9CBOSF+aVoK54NCKkxVUgvP
bt1U8u5h05QBDA5Ik1pCGqjXdqxjkAvRqf96+NG/qtE9kx/UirKp5tleJCPhU6E4A4PzSiyLe
PE1P5LkPguBNTwFO6KhcInTqUFaddFDuXNckpktGr5sUCxt8ks6lrBeZWqxuSDMhW1DCtbjjB
wPa5i2Cn3lJ7gWXgz1wX6flWTtJM33w4noxL1sQY/PzHN2BsRnftMHv1BJ0VainZhnpbVK/qr
Ecvcb4AsFeEOwapYlwu9jFIbjrA9iiOuyI3gagq2FQATFWflCYSbsy34dBpsfjosuq++E0xAV
CjCAqSnP1gfZ/fGL4q0V5fPGythBdkActNAB9+jsg+bvkSI6nA6bhQvkgiYzehIJMoevIVqbV
r2lZkVLB3Xzf8/RzT0OwertU+Heg9h35XVRkZyCJwsnq5mVj/7xMhNCKg==
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.0 (-)
* 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 | 79 ++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 4817b293ce..a9c1714936 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages tree-sitter)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system emacs)
#:use-module (guix build-system node)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -27,6 +28,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages node-xyz))
(define-public tree-sitter
@@ -529,3 +531,80 @@ library.")
"This package provides Typescript and TSX grammars for the Tree-sit=
ter
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.15.1")
+ (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
+ "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as")))=
)
+ (build-system cargo-build-system)
+ (inputs
+ `(("clang" ,clang)))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-emacs" ,rust-emacs-0.17)
+ ("rust-libloading" ,rust-libloading-0.7)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tree-sitter" ,rust-tree-sitter-0.19))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack '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 .*") ""))))
+ (add-after 'do-not-fetch-from-github 'chdir
+ (lambda _ (chdir "core")))
+ (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
+ `(("tree-sitter-emacs-module" ,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 "LOCAL" 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 "LOCAL" 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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:25 2021
Received: from localhost ([127.0.0.1]:55050 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSv-0001CX-BA
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:25 -0400
Received: from mout.gmx.net ([212.227.17.21]:51033)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSo-0001Ac-4g
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466252;
bh=1QxP862Oy5nDbaMcN+nZ2PhUZn56ZAT1wUK15ZkZI6E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=JKqtj1BmDALdpu1OeDqn6VroYl1vPRm7A4wr1cMfYKMC7JkoGlnt6zJ/rJ4rwVXuy
traguOeoz0i/vu4jkLFtJVIZXk6kn9Wfpi5EXRzQQfTh8LpYus51j+jMsMV7QV/GN8
zbDkQpFglaHQhxPwB4JXhuIQUIKbphuJFHl64fXI=
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
1MdvmY-1mnrRK19cs-00b6u6; Mon, 09 Aug 2021 01:44:12 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 28/31] gnu: rust-emacs: Update to 0.17.
Date: Mon, 9 Aug 2021 00:43:55 +0100
Message-Id: <20210808234358.7241-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:EdO1Z/T/05l5vhQ0Q7mLdhswL2TeQf/iiPx0rGm5GIQCJ2uy8+Y
PZqiPYEOcyWBbFPfsACtnlZ9vw6Xytuyz7lJZZfmu5DdbIKfuqEgjDxeku1HlalzQeTcx6a
csWUe536Wb9cMfZZ0KO3hikI9CGqdSoen5S6AJzO6h8mjReMQNjRQn3xqkhaVUg9+5Fany/
xnZj2wjosZIRTPJB6k+sg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:iAMdqVlrQjg=:7V49QE5WhMH/06pwZtiA92
QBymNrZ6t0w0iQFWhxTKRTQlNqqxi+3RjmHOdZuT/l7hv1rjWibkrTqdw7YBoxx0FXSWz9Tk3
W/V2uD1D7hL5SQV7Fvi/OVecnkn2Mp4pfbyheU2meNJtGQR3atoRo9GNPGmKYTIlaizRaIWxJ
1kgvMx6FAKoBALCn74iOFA35PMt9qsCA7j7EPr84/BQLCCy7bUWdHvV4P1+1PAkpjNTyJ4tK9
7U3mKPrNJe9BjWWpxXl6SB1XjGQTXxsZRxbJoUpdXHNsHlyHxC8CX+FgQMnRWbxuBPftVQxRs
+xVbwC7OvbLMzFkCjRWeseLv2se6GwtIKPCn/uti0prqUIx4FpObZv6umyisFZj/EvAEHrh2Y
lxHAU/h+P039IStH6aB36ORqE5GCGBvXjr4NROw0iDP6eCWPc33PnYi3vj/h+5zLGLOob+DgZ
PFthvHAbyFaZcrx9fNtBwsHN5cn77NcOjJ7atbJ8QqYOza0WRLKIVkSQnLct8HH0luYAH5F7q
ItaNizCIsoxAArLTPuDT24NohdJZZ0ZJvM6+z8dFxWOdEgnphJXR9G4Npatg0FdHCtXdnPZN6
L+EP7cORkIGhn4Tr0Lz+CUHaunAAxGghh4MWY/zYB59U6JftimQoHIk3aXx4AIidw+LlV1cjX
fWRvq793oB8+/tVNJkXjuUcslkeq5NLnBrtCM5jZnaz2JLqkmMWsilSbqaEW/K3T9Pw6HreJi
pusQtII1FSwM3KS2u41ZDNRiNLP/JhsB34pogYoTytwelqQIhhnwA/DYiIqZxARQ7JcjSUrUT
xtei78A+UFjqIqHTL6L5DxYqj2cQApzoRPMmHAYYrWPV7ao29VndOQfTBmdxfh+7xGOfTd03m
Q7zTZs9XCwZHpEv67hjzjWJF2BDh3RRrGc8Xne1xiTlepZ5W4NS3OT0zYD5Hs2D+wuJW0s9t4
pD3b3ukeN+Dl7SQr0De4hK9r/1OmmhSGhOtbEvUf1j425Cy9qweoxBEHArynToKx/YERdJgVe
DxpeVpjqUdpgF3zSHpjAbnpZ4bu8Fo5lbu+yrIy4vz+JYs31ieuUT+hYfUHU8wKHQP6LJaqUe
g4DE9Sel72Vc0sBvDsnyHBrODMMyXX/ffqR57ECW9yUdHTujqfNzrejlA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-0.17): New variable.
(rust-emacs-0.11): Inherit from rust-emacs-0.17.
=2D--
gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 365cd6dcb1..6b7dbe689c 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14583,10 +14583,10 @@ signing, and verification in pure Rust.")
@code{Right} is a general purpose sum type with two cases.")
(license (list license:expat license:asl2.0))))
-(define-public rust-emacs-0.11
+(define-public rust-emacs-0.17
(package
(name "rust-emacs")
- (version "0.11.0")
+ (version "0.17.0")
(source
(origin
(method url-fetch)
@@ -14595,16 +14595,18 @@ signing, and verification in pure Rust.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ "02f31apvz03dr0dwn5wyirdmqkk2d635iki0kmsh291xr6dysy2q"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-ctor" ,rust-ctor-0.1)
- ("rust-emacs-macros" ,rust-emacs-macros-0.11)
- ("rust-emacs-module" ,rust-emacs-module-0.10)
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.17)
+ ("rust-emacs-module" ,rust-emacs-module-0.16)
("rust-failure" ,rust-failure-0.1)
("rust-failure-derive" ,rust-failure-derive-0.1)
- ("rust-lazy-static" ,rust-lazy-static-1))))
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-thiserror" ,rust-thiserror-1))))
(inputs
`(("clang" ,clang)))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -14614,6 +14616,28 @@ signing, and verification in pure Rust.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-0.11
+ (package (inherit rust-emacs-0.17)
+ (name "rust-emacs")
+ (version "0.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ctor" ,rust-ctor-0.1)
+ ("rust-emacs-macros" ,rust-emacs-macros-0.11)
+ ("rust-emacs-module" ,rust-emacs-module-0.10)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-failure-derive" ,rust-failure-derive-0.1)
+ ("rust-lazy-static" ,rust-lazy-static-1))))))
+
(define-public rust-emacs-macros-0.17
(package
(name "rust-emacs-macros")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:25 2021
Received: from localhost ([127.0.0.1]:55048 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSu-0001CV-VK
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:25 -0400
Received: from mout.gmx.net ([212.227.17.21]:46273)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSn-0001Aa-Qp
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466252;
bh=wRfOA4cMk7OH1KhCIk4ifbmDuSWPpVGnU+0i5CBhz70=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Vkviyd5N0KO3fJiyCNaIXVXsKRc3oQ60PEvX1NfsEkuV8qX9OcG828onpTEJ9yO2g
z/xVIKLGNm3oChAy9NPyeWc0EkAY/qRyE5eGLWcVRI9OIPW0MrBu62dA/4v+ytg5Cy
c2V5Mdl1DKRGHuk9Tc4wHgS5VxmC9tSnNllQqcbY=
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
1MjjCF-1mxzvM4AF1-00lFn9; Mon, 09 Aug 2021 01:44:12 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 27/31] gnu: rust-emacs-macros: Update to 0.17.
Date: Mon, 9 Aug 2021 00:43:54 +0100
Message-Id: <20210808234358.7241-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:CQ0RCG+nWDasW9M1J3XOREl6P+LMD0+8IzbTmt6Tv68nmD9ie4n
Rn0sJT28fdujFcXRfootwS8JbSe/6KvUCMtYuUjaNVeJxL7kiViq0+jKAyOeQh/NeWA6KQn
7Kur67n5GSynmhhaAkBo/n3w5QWwt7TljoIBMkVLw8fEYK79NiscHHMGI35FcPIarK6ZDgd
hdy79kyZAbAiH3y0O6xog==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jtChantIrqY=:XdBDKUwqdDluHSJwPXnpOO
Q5AgnnJ/z3AJfcUI5AakEXLHbpoonvhUvqiOmEU2BB/dO3Wuuf9207UeYGxYspi9qbJj1cel0
6HpXa9Uuo3WAarpWTuXQZ7m7e1BbyLaZkiHooGVjvbgHMHXR3Adh9beiiOaSp4onlE3AqGKYy
23vBQedjCJ2+y61oZBx6nQ/UENup90v2Ad2ZcDKi8LGUsKoI7GHfqzwaLI8JeV8vD8Z0WfwMz
dvm/LxmBOBlx2MHBwF6DgAJSVQHBgOYSurEiKGci1JXOwtkUg2rmo1Kay1J0jPIewGWS4Fxu8
7eBMkzcec+LPHTlPdfuinhS07UFfrtXefILmBDy3IYA5MKt4jZYzDlZNfX7o3HV7oKqgpeioY
/RLcI/Df0MHBvesU+qDW55DhmB23ltV7/NGQDzINBmDVDyXxepOCkM9C3PYyaa/cuOojjqhqy
ucVjlLXLtR2fRZTBjN1Cg60NDOFUAlQHsEj/JJEo7QH+LldtPXGIcgdCbIORf7tzAvhpi0tpY
t94KOAjO3KRI+/pZj1uU6KYsOK+ybHCUrAMcjFgivWKblGX2zBOKgQ8cUE+beQdZL2gSmU81b
HQ4tfewWHMTQ4cWcU7S/r23Pf5HhDzOj9zeHsZ1lC3rO+EDPr3qdJN/774NJGBnb4YOaSnM1x
2jK002cf29Ow2WxiVbUbCBoraQPivI2OdnWYsv/eUzlcFqCgHvIfndtNIvcpLlUqhHHlQXIlo
9pSqv0KhuwYz7bowAvgfGrmzHtCkQQmmLL1DLZEyNwZUQ2A8HLiSmeiXnW0vnfBwAw9cXO3gD
XjCFNcA6F5NS2TmOcg/jbuJ+9aEXONIkQaNEHXizTBi99VpnJjtIRE1EHr3s2Cyjj4x0UBaYD
On4buTotvApjRLRQG42ZI2LJBAj0995lF423p0AD25+6Qabp7VhtTgisCapebbxtaRPZfK/Vy
eng0T0biIm/Vaf07RZEiGLaR4/FtWJHPt844klhXs6X+WR3OdZWB4Byx3VAEhPcbhZfjL68Hg
d86eID1qkPfHMerJl0Lp4FmsHhLn3XbHNNzHQbK/rEf3WqJazhJlU/0v17OSt5KDcOaW4FbRF
a74BslErs8D684rg7us0cd1M8OhJaXx9EFjc7Wz4uWXj/hpq4aSfuxdMg==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-macros-0.17): New variable.
(rust-emacs-macros-0.11): Inherit from rust-emacs-macros-0.17.
=2D--
gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57a287c5d2..365cd6dcb1 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14614,8 +14614,31 @@ signing, and verification in pure Rust.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
-(define-public rust-emacs-macros-0.11
+(define-public rust-emacs-macros-0.17
(package
+ (name "rust-emacs-macros")
+ (version "0.17.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0qg1dcn5acbirq617qq2fgg9adswif2dnr292s3qnq62wzgnyrb9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-darling" ,rust-darling-0.10)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/ubolonton/emacs-module-rs")
+ (synopsis "Proc macros for Emacs modules")
+ (description "This package provides proc macros for Emacs modules.")
+ (license license:bsd-3)))
+
+(define-public rust-emacs-macros-0.11
+ (package (inherit rust-emacs-macros-0.17)
(name "rust-emacs-macros")
(version "0.11.0")
(source
@@ -14627,16 +14650,11 @@ Emacs' support for dynamic modules.")
(sha256
(base32
"0390y8vafxdi334hhgrzvcqjq3n5ckcmvilqcfp8vajjq8irrly6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-darling" ,rust-darling-0.9)
("rust-quote" ,rust-quote-0.6)
- ("rust-syn" ,rust-syn-0.15))))
- (home-page "https://github.com/ubolonton/emacs-module-rs")
- (synopsis "Proc macros for Emacs modules")
- (description "This package provides proc macros for Emacs modules.")
- (license license:bsd-3)))
+ ("rust-syn" ,rust-syn-0.15))))))
(define-public rust-emacs-module-0.16
(package
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:20 2021
Received: from localhost ([127.0.0.1]:55046 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSq-0001CF-KU
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400
Received: from mout.gmx.net ([212.227.17.22]:33013)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSn-0001AY-7Y
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466251;
bh=2gRDpeP3TIggo76wJJgVfCISnS6/NKTnCc1jl0L0k4E=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=j1OCGimTIyggE7z7vlth9ULpSca+lq302ftRFDAXBAgeYew66q4122/7hSUSNW6NA
9lmXXuAC28fdKoewidcykyXZ3/FfynVf379YFLqreyDECnW1u4jIloVCLEwNWSTg7L
zmvUZiffP9Pe4upoILd5VD6MQvL8t3T73Ej3y0SY=
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
1MIdif-1mIdEk1dAr-00EeGb; Mon, 09 Aug 2021 01:44:11 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 25/31] gnu: Add rust-tree-sitter.
Date: Mon, 9 Aug 2021 00:43:52 +0100
Message-Id: <20210808234358.7241-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:X1hd2F1V1cH6AR8HFZTxdTtkbfsjAo1cQlwaBe/dR6ljAP29bew
yqapIL88k8tE039jhOFAfxlnvS05uSZEHZlxGJGVvhEhuqshfp9dyILlZ7MpXypUIOKuhFF
L2GxXE+JYO+v6IDlasqSaZ0LQQvHurFNxNqE3uAmfm9N92QjZ4skCqwruwuCm//4/4Vedfc
mNR+XYogO781rvSj6eCnw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:7b6E1Kwcrs8=:TpUexEkAjjo4k85MQ9QET/
wJEM0Rf2VWBbzVt5WRkCVb06+TRpEw/r3eg/i0tSNZkCdmgARfxB2o29FfiUGxcvODIlBjtI+
NR27+aYZTNNzQE/bdYSclTVOTklkaeZmfDCU96PTIwKGMztGspgP9x7Q0Z9e4X2gaozdwI7/B
xnnNJC30sT6tjr/uhFuA2RrVbrdsjCXrsXFv20fQcqGs28w5pWyxeRT74EhD/nVKzg2edIees
jvMfpUlK0MKLmevCZZczxqkL5+DTi/1zNCFcyf8uBleHshcSUWoNl82mRqeWQ1kPIZ+zg3kJu
wSy/TK/XpJKjcBoCXiS27tDoYQUdOQaAAWh2qmq2ZddDp0+6PD+AG/larT6CNRmICzafiTsHB
DJv9Vb7Xbf6rcThPzha9XcLYE/SDnwI2nLw2qckYE3Sf4N4VqCaU8vOIXNtK5pzWy2asLwuru
LsVstTdle1hs1SfDLLKqaJA2G2xE5NMXMnIgEDbIow5AAKCG49xgt/PezSo/gqSctGuX9/wDL
x4w9qx4pebvDwP8kJbTKK30YF54SPhQPjW0rA92DLO2UqX79srYC4VL6CY2X0ZSjw1gYZ2za4
P5qSaCBWM/gufHiGUSEMCNorWbSuxNNc6jWjfosRT6kq+SCESqI3413YgzCxLYcukFJSOTXnl
bmQliTRCoSZwHurgvCJeTpSDbqRL49QTntQWxjL+7ZBFhoJNv3fp3Hy8isBYISj1y/rTq9psG
iK7lzjW4C400VlaehffUdHHgW14/6TBJjxagQH3luLKMk126t6HjhVyk3OxvJvWwV0Ms+lAC7
AgfY5l0j3W+FmMrAjgfHandxFM52rvRNviPHy8M64L5KV1RDM/yZKjr78XQXGQAIoUTqcbP3B
c8mxc/FEW0BfabLCadzeGwVsUGPxuLAi6vGAAQ3Lecg4CyBGWjXgadT5pdEKtKcRO4fINB21q
bi5oi2fiyvL30lAF3ct3M0LgZY/BUOmrYkCEJCjKFSDqp3GG+whJY/X7Q/h6uNPO6moX+n1x/
oYSIT3Av07ROLKRBSNzOBfnFZrjBx/Zk2E0giw7VvtVdge/G2CS99KVINli8TfvgCJmRuQa7B
SXBf3xW74PIZ4kgxOGn9tQ9x/guKU9FuyCOx0EyOFKrS4U5ceuxMGKP8A==
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.0 (-)
* gnu/packages/tree-sitter.scm (rust-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 0f1946a77e..4817b293ce 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -20,6 +20,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system node)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -101,6 +102,32 @@ This package includes the @command{tree-sitter} tool =
as well as the runtime
library.")
(license license:expat)))
+(define-public rust-tree-sitter-0.19
+ (package
+ (name "rust-tree-sitter")
+ (version "0.19.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tree-sitter" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1h6adq5kqf4izzsklch5lfxx2aisxga463zz7w44rgwnck16wwmd"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;; Running tests misinterprets comments as doc-tests.
+ #: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-public tree-sitter-c
(package
(name "tree-sitter-c")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:20 2021
Received: from localhost ([127.0.0.1]:55044 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSq-0001C7-AQ
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400
Received: from mout.gmx.net ([212.227.17.20]:52195)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSn-0001AZ-G3
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466251;
bh=OweyIdFpOsej25eRG7LiMOr2qN2MdLkbjhox/0X0Wlg=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=RZ0WsuYhFa6mbcEsINUqixCkLrAZ1qdRLVEp06Bo4PNftvI8lwaQoEXz9zryZN4Uj
M1Blm0wNqy1tCLEyI0A9mKWL6hxKw7T4tqMaHQaiToy0ps/XgsyoRCxtHQrteXLYTh
XTe0oHjy8BGQbl1LnY/vw7vQ/epiDApiFJKA/6VY=
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
1MaJ81-1maA5W2oVx-00WB9R; Mon, 09 Aug 2021 01:44:11 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 26/31] gnu: rust-emacs-module: Update to 0.16.
Date: Mon, 9 Aug 2021 00:43:53 +0100
Message-Id: <20210808234358.7241-6-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:GdlYNjb43xyA1t+ARUU8kdc/yTAc4T9Z2BvqzXk3FppjMHVee0J
eH+JVkC1/JlypM2OqCpDO9g1fkYvCRZ7ik8Mtcw4WTIzd0D9tpYgNk7XSEcJOwymh2l7xhT
LjuRNrTMV9wFcLqMCHSJybB2vxi+nQtwX3EOjGdHwizQCKktEF11Yr3kNRW+nJi2Xjsn7/9
pKHFeQIlh2W/gnjHdpIdA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:iP8VSFFYCvQ=:yOb3lD31rdr/Y4mH4VoawI
fx1dG6PNNqDsSz0qimlSpiDokF660zcZYwUJWR/Msoui+4BDdztTwiGVuxhT83Cjhrqi9uoF8
4atKMZWtoln8n6qLPlzBWzqQafQu8LylW72jqv2w3+WoYgPTOMs5sCRjKu8MEgdgY7XecB7Bh
o+rbeSaG2QOAInJvz1SR+r7EQ4CsmqckXfTm91epoIpcTZxkSQ7cFuvwPjZ6PDZdH1fCdzu+r
Xi1CUEgOyqWguJfo2eO3Wl5mApnibag4Ye+Ra1pROjxuCS3vldRk0MA6u9pRI+44xYP6kRa3M
LsvVJKVh9JiaictlK4vb60FDGtc/xVvn1XhM9AsOnStf41omG72wpDIzqTeouWh8QuThJwk4m
LckT1z0UUv9i9McbW/+5SI7lV3mxfU3Q1+QnOrvRX0ZCOt7Ik/SOBADQwCyQw5xQnf7XApO1R
y5o0EOYdF3hp+mcrq4wk+tQeAGpoicDLZvoS0y5QPb/I3RbARBVg7BMu6HfAjYwcAs2KWQasC
/M1WsB7u7mJs6iNnJYe/RUuGu6xqpCd16I9Z7XYx9ldEdZX4mrFZ8aypPQToWnKGvhigRM2cE
w3ZxjjjidPb5GcTRoqnXceMj9U4FhDvvHCFT9EGe8Zm9WjGf/WP1CiySZCXXbJyBhMSOWRq/e
ZIRIyhjXSOC4w1aoLeGXMpuprEuoJNixvX+IcaG1+o8xwIr+TvcqnfR++TcfuBsWD8z+J03oL
I7vbf+Oa5TLhceYEpjQB5XlllTX5Wu3/m46s7KBlfJwumToxHlaH2/kUAf434Iqd+LrasGYwp
2zhfsAw4gD1Ik9aEkAN5S8cWvbUj2mbY6d0ZWLDXIuN3/cEXK8vVFPWLhmFMQWphfPXS+MY8N
WmK+IIm9LK558c4oIyBSwtAKyDNQ/pCzlg6lCsIZujyETstEkMjhr3iZymhKOLRmIIMnlE0F/
zGKbpViSTNZh4mipKokSC2CZqXes+g4CNNQ+ZIfB0NpQJZ1Vx00LtNEzbyC3dLiux7kz9g4Xq
iSSNjsE9QEMpioxFWlB5FRSPbC59e6uCCaipgKs/8IM+FqQzO5XNqwSBYaUG+kWRXqCKKFUoC
Cky+5IMmodMWpDnv9J7KX9d26AvNTMeixoBkXQ6G+YUFlZDEzfVeK3Rsw==
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.0 (-)
* gnu/packages/crates-io.scm (rust-emacs-module-0.16): New variable.
(rust-emacs-module-0.10): Inherit from rust-emacs-module-0.10.
=2D--
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 44f8885adb..57a287c5d2 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14638,10 +14638,10 @@ Emacs' support for dynamic modules.")
(description "This package provides proc macros for Emacs modules.")
(license license:bsd-3)))
-(define-public rust-emacs-module-0.10
+(define-public rust-emacs-module-0.16
(package
(name "rust-emacs-module")
- (version "0.10.0")
+ (version "0.16.2")
(source
(origin
(method url-fetch)
@@ -14650,11 +14650,11 @@ Emacs' support for dynamic modules.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ "0s8qrh0ggjmqr04zkcf7s4ijmpd44rjcag78npnq64jv10lxvsry"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bindgen" ,rust-bindgen-0.48))))
+ (("rust-bindgen" ,rust-bindgen-0.56))))
(inputs
`(("clang" ,clang)))
(home-page "https://github.com/ubolonton/emacs-module-rs")
@@ -14663,6 +14663,23 @@ Emacs' support for dynamic modules.")
Emacs' support for dynamic modules.")
(license license:bsd-3)))
+(define-public rust-emacs-module-0.10
+ (package (inherit rust-emacs-module-0.16)
+ (name "rust-emacs-module")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "emacs_module" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.48))))))
+
(define-public rust-embed-resource-1
(package
(name "rust-embed-resource")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:20 2021
Received: from localhost ([127.0.0.1]:55042 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSp-0001Bk-Gh
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400
Received: from mout.gmx.net ([212.227.17.21]:55573)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSn-0001AX-4e
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466251;
bh=ogMCDOZpYhgYne+HPX4ONUD/1czl+21nGVgXy7G7p20=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=LENjyUMHfJLtJVXXqCsuc15Lqsdfwde1TEagJvW/9/t8Hhrb0YcMwRvWHO5NDftCe
buzv8gtmRWyGDt7Aa3hOGzhZSAtebUBoKJNXDzESb+gVlQPC4/ahmJpAzQJB+itqjm
LbtmxG5ApRsq5VKuXASo+qNh1yjwjAQY5zgv7dWw=
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
1MXp5Q-1mc4pS3So8-00Y75w; Mon, 09 Aug 2021 01:44:10 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 23/31] gnu: Add tree-sitter-typescript.
Date: Mon, 9 Aug 2021 00:43:50 +0100
Message-Id: <20210808234358.7241-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:vC9FtyYfrjya7jZswpZOIvP8rsY5RrAA4lIK6069yqZQDCawY92
OV60shhcpblqUFgNRDcx822dk9jw8N6uzb34v1RtAh/A2At+R0+Kz6c0+AK7LRpYmwKjoHB
VcWy9RhifpjS6Evrmw38ZdlA2m/O3gRpQWRO75uYia39YrgtEINyeJVmts2a/x1Nu7ZxibZ
i33boqfGXEI4ZAI0i4mfA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:oghJLTr4wr4=:72bnKL10kh1OWXAwY/OyrR
OYxLE7Lej/AYjR23q2aKnDMKK47ygRLC5cr7d8BsaN6cB3E2CcSUQ/6Suot0ghY/y/iXtfG1V
c9iyUWNoyfPQqjg08VY89UN2jZzD/GdNuLFx06f/TGROi8kD7TEH50DcHHuGHC6r9l2JnwLKO
dpoXQ+ydNEe24hGKaRwGpDLqzkopXfsVby4KuPCXjE4j3LzBcJRzTqxdy3PkzXqn8hxkK7da9
2RUyFzCEeAUdcMmaj2ZVcVVBCRit73ntPSDzrHkBBHYZRCSzMRkbuOSlPZP5Mh+XzHTTX2GtJ
isofWjfFi8jdB7pFN+AzvP7+6/6fQH72qIv9ihYsVhq5GXWoOjQ33ZOSesDE/o9AnoFeAFthB
j+3eQBOR32Ngy4XKm98oFEJU+wdf/EciOeEkfMWInT+HsqRpl7rr1omFU1kPcun3kbl+LkfOL
dny8RnfXIHNhaKCZptaUSiQojPPAWeP0p3GlgEYUs2ZfUesX6hStOmp5cjIKTdHuxiISQAV6C
Gl3ugABlsxl/7k/HtxNcrOv0PIc06UYAJ6sRnGcI5LIW7dNBrP7L79YLFKDudVqh/tGHddenc
uHYc4hGlfbBgbtqxeiD6qeeEBlg4ClzAQwrTmL6xfENPh/JQdyqppPxoP61CxE5SufFACG5Vq
heg+/4J8yS65d8DKIHjaVnvM2xEr1D1b4UMKqRmuASpZNQnh49BUXz79tOE9M5b2elM8aPdJh
mU/y7UH2ZCsh+o6NdFH2uKPFxjDX81AQlF1NcEnqhoopw7NHSbkSHjL8NoXHwgypWc4+MEJYE
TmRfUalJ/z7ozGv2n7RUWVDxZ5oIS0B+54k+/nhBUwPm8OzokOFY+7ZgmqjD1Ayd6DtjqAP8B
5fErA1os+ZPyP1RXs2l1813DPtgmEGAkC4NGN6LOABOHoNJbAkeSDl461xvfPVYQp4fziJlfS
in2MkYK4Rs2wRebxorDNWbEgHl8Csy2tqqLXBk2qSfWs8tkjpknu0xv0C9MZo7+Hm9j1sm8R8
nWKYuhoq4F7zq9LpHXUm+RjvbaCiqeSEVo+iADD+lI+n3i0wRdiQep6vIhwoQCqbYCCf3KaTN
VwfsaOeSg5QpglDsD2kAthED0/kpadqKyEKp07ZvuIPU/rT0XHnkFI07g==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable.
=2D--
gnu/packages/tree-sitter.scm | 60 ++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 6c2b2e7577..0f1946a77e 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -442,3 +442,63 @@ library.")
(description
"This package provides a Rust grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-typescript
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-typescript")
+ (version "0.19.0")
+ (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
+ "01pkmwwmbv6kxda0n6g4cfg72ldmpi9gmp11a5gygn472vhrh2xw"))))
+ (native-inputs
+ `(("tree-sitter" ,tree-sitter)
+ ("tree-sitter-javascript" ,tree-sitter-javascript)
+ ("node-nan" ,node-nan)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))
+ (add-after 'build 'build-gyp
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((node (assoc-ref inputs "node")))
+ (invoke (string-append node "/lib/node_modules/npm/node_mo=
dules"
+ "/node-gyp/bin/node-gyp.js")
+ "build"))))
+ (replace 'make-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files "typescript" ".*"))
+ (for-each make-file-writable
+ (find-files "tsx" ".*"))))
+ (replace 'install-native-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ ;; Invoking `tree-sitter test' loads the grammar which
+ ;; compiles it to a .so binary that we install.
+ (with-directory-excursion "typescript"
+ (invoke "tree-sitter" "test"))
+ (with-directory-excursion "tsx"
+ (invoke "tree-sitter" "test"))
+ (mkdir-p lib)
+ (copy-recursively (string-append (getenv "HOME")
+ "/.tree-sitter/bin")
+ lib))))))))
+ (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-sit=
ter
+library.")
+ (license license:expat)))
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:19 2021
Received: from localhost ([127.0.0.1]:55038 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSo-0001BV-NK
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400
Received: from mout.gmx.net ([212.227.17.20]:32935)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSm-0001AW-Ue
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466251;
bh=o3irwUCbEz4zUeaCJSf4r1PEJq28Tnb5USfkM2LeYfE=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=lfDWC/kaulXKKDrXgctUY252yI6A08ElnOA1u7z6W7cCoCRNxcIPENCs2hMXm4goq
OtF149JXYmDHB9OvkJJhtImygfxyVzx25pqI5Bv3QCplMg9BaNOxXofBF8RkCN0LxV
Kuyz7RgJpz0eHYeXTTYx1mAPgKP339Cmsyn++HmE=
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
1MirjY-1mivUt0UPE-00ewey; Mon, 09 Aug 2021 01:44:11 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 24/31] gnu: Add rust-bindgen@HIDDEN
Date: Mon, 9 Aug 2021 00:43:51 +0100
Message-Id: <20210808234358.7241-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:VUf6p0VN5Va2EddHNTLqpJ/GqeXeCdY0bouET7Vdxt2GnATgs0s
JuyflBvQYFndXgRf8jWgwB08FlolraJbM9FLV9vm0JXckOPuNYJp0upflFCXfCAi6OeZWLR
exgcmqJg869IhEme2Sbq6WibsEBaXzZMRvOjb0dwOMI06wyX8IFth92Wnoa7E8Y8fRJIKiv
k4YiYJ+0faTpTZSKMyqKA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:EJszgW+FGos=:jT5VyG36ukT0TLdUVWqU58
254xuyfMQCfxhjWkHzHRxdglNXtUW6RRomHendP420DDrhue6iwa6ZECl4DYpTWaAmNJCC43w
0fNZ33dUhu9nChb7zLeRc4vlN7jYJH5u3XZqm19l+726GtwyEvpeb1mwMa4EZ/fJaWPbSW0wm
N8W6d/kJKu+9cJKAIjCaxCtfFYBWqadqfcrKgExfyTlpgDyrL3JeSLuHiV3uS38FDIcdecvQ1
/TbuNJBeD1tUGuvKs9OEgQRpxO+rcYxyt5Ap2AR/lwBLN9X5LZHL1oo0eNY8V6pCwjJCesjAf
zMQDtL+j/qnLTK4T/eukSVCGN6h8ForHoSgSVLu1+CxQtnEsSJoL46kRdxwmwDTSj14YPtpHf
gsXjFdkp22yT16YffmeMW7O/JJong4ApltsJI22gVvi18EI0GczDqOVnkplobs3/OBBs5U0+t
oiXaFzb11+xfjtg2N5onVdYpRsMWgDMiy8sj0lHwL4QK30uNU9bbSoIhg/5tO7XgLDrnh9bEz
OVeRA9rJ1HtQgQl7mRTyuRP0jCJqizFBnhIms33wzOGxMqvKoLbPmE22iC/VUo1b7C0W1GJam
EQ5ti3rFtPOjgqhEf5T7XXwEPFVnSz2BUe3AAK6GP0HnA7v9iLzLIAvAN5NAsxkpvNWnWimi0
gfgQdszr8bxlvuQBnlhyJ103WpOuUE0D6YRH7/Gu9cqLusaaJA2NIvC6V6CXrEVRAfqu69qnj
QMy9V1NnrP4hDhjE8QJXz5wyAeOt53WJzLgmoW6bclTDy+1ZfE7Zqpsu0cdzBocPmkdeLRyrG
h2u7W+z2MWLa9QV66SpkwaqEld+IZaU20BW29IejhemwxyBhNaInz63RJ0zAyxUn0SliYzLiN
6V11mG0jQ1qkHWWzhmA8H/gNjT9aV2JZaNYjFRbvhCD7GNP73FYZNAGVKK7xHIXULfpyl5lXy
tUYcFnxxesI2IrXfcdKGAPPvZjI5DLjg4D1vBY3nq4XV1ZrS9ExG6P2IOhGX5zvTVok9PPos/
qqpyOd5+56GSsRyx+DzUP/P+EaH/6SQHWhrqLKAcGQpqfp8VK2yc9e07XeMK8v+uad1pkn73h
VtX3Mgo07e+pnSoegHwikJ/NKQ3EG5t7kfSVeQPaGtLEzMDzudUWm1doA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-bindgen-0.56): New variable.
=2D--
gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b551e6921d..44f8885adb 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4482,6 +4482,43 @@ bindings to C and C++ libraries.")
("rust-shlex" ,rust-shlex-0.1)
("rust-which" ,rust-which-3))))))
+(define-public rust-bindgen-0.56
+ (package
+ (inherit rust-bindgen-0.57)
+ (name "rust-bindgen")
+ (version "0.56.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fajmgk2064ca1z9iq1jjkji63qwwz38z3d67kv6xdy0xgdpk8rd"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-cexpr" ,rust-cexpr-0.4)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-clang-sys" ,rust-clang-sys-1)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-env-logger" ,rust-env-logger-0.8)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-lazycell" ,rust-lazycell-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rustc-hash" ,rust-rustc-hash-1)
+ ("rust-shlex" ,rust-shlex-0.1)
+ ("rust-which" ,rust-which-3))
+ #:cargo-development-inputs
+ (("rust-clap" ,rust-clap-2)
+ ("rust-diff" ,rust-diff-0.1)
+ ("rust-shlex" ,rust-shlex-0.1))))))
+
(define-public rust-bindgen-0.55
(package
(inherit rust-bindgen-0.57)
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:18 2021
Received: from localhost ([127.0.0.1]:55035 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSo-0001BT-Bv
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400
Received: from mout.gmx.net ([212.227.17.22]:59061)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSm-0001AU-HD
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:16 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466250;
bh=KWXxqbkkWjv4NWExqMuWMs0uYdyhLyDXMG9fPaI1Wug=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=TGkC4bl4zJO1dsLSWHflN4+HBV0VJUrad4AGJey5q8Y9STU2Ffr06BWR3uTjt7dxk
Zj64+JOpMt++nXGkZZ+IKWD+YWDX4QlLMeRglB0+2C0xB2C4O+GXd1/Whsj1JHW3Xh
3sMxaWtxAPVcFn7PInaREXvrqE+ZOIMfv3ftc/Js=
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
1MhlGq-1mhpZC1yuO-00dqCG; Mon, 09 Aug 2021 01:44:10 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 22/31] gnu: Add tree-sitter-rust.
Date: Mon, 9 Aug 2021 00:43:49 +0100
Message-Id: <20210808234358.7241-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808234358.7241-1-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
<20210808234358.7241-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:7nWXM/xzsT0H1dlyY2SGw4mvoj2TQoNR4Qzy/4qN2n6TKweRTky
Mh07MWT3vWrk5nJjdBqKS2hQc+B2wrIsfSaEsHavei3iGB0YyFXqASsabRFLw5pciZZa2gw
VBbRJFtNCaOt8LKkECm8R7mPuDk8Ub0VNTsI5B0FJJmbZQ7m4DBa1OWWo3z1aBGkKGWKNfO
4DHKW5JlS91Ofqa3w3PUw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:eGKMR3EEHOA=:NhmfjGgJ24HpVejdQoelf5
mZBaafbENaqVY50Df8iOwEAkywrGSDOszsZlI4aD0jpBFqKXEoPFRZ/2xB4sHPyl3K2ZLL2Ud
FVedTQwf+pEilO1FhBfX0n3Jew46VXUc0fTGHUt/6lpZb9MkATXCIEjmbCZxDh0bEXXi+phZc
IpQDOzfHjt+LAbdNLCWJ2041GUev4upNENpqoLVIn6EW1x0/19ODRFgEy3j+v8fJWIf/fvWE2
jimnu/TPIvrLI8a7OFFcB1lkn949RlejdjISUoxcgWQvNvwLwoC/8+9Dz79ootEO5zjHOm9L5
WQXqn91DMcgGks/FpqkFz/j5/9qTZloYFBDgqvdYLyxnZGWGjJ4oMs7AQ+vyneENGXjhd/2zB
1UKyDODfkdvFdVb95oGSTsqUyT8oQPBysuBhnXUQbnvD092DUIcgSinS09Mapp+TNf6zcQpUE
uUvG8nxptm/3FkCh/mDIcSMVMEdhhWByY8JYxWUpOAxKUdc7rqu0WEh2CwJOtD2nwFamLdri1
IBQW3lkUNmQ90uuHLsKRF2up+YGeL9gld7TRbgHLx1tiK4j8/i05m5Q53Crj/4WKZrSstYLnk
/ZZuEJepNwuMZTCF/5FeRAGa0uhDn0L/7btljyj/n8lof9VTsa0xRHSCZ1aa1rvwvVtc2FzcE
KMHlC9aD1uFjWWvp/mWEcMWECgYYyJ3Me1E4tnVUviag1tcGW83MT/0ml3hzCS4KWQpRjqT+z
c2BVLOBf+jYANa3bKTGOAdLMygcI2m/Oq8n4AWS38GnHA9JLFKwZYO1Iu3M0rqOU/vjTwA+QN
bJ7ln9ZAhoUiNZWSYMoEr0x04aBKf7iSASdLYVPxTJFyvZjOwHgjcKwRE83nBliv6S+4Tq+U9
OQG99ySb+rJqVzQdTxT+xvp0Oec/cTzjVkNVtP5D67MTHFdtu0+3glg5dDUBboJMYnXUpmQna
LVfFgDafOBeX1JLyUd5P9inU7INoalKulXVwItOS55zHR0slYHMEXtTFCc5pv3GQAcGKIvq0/
rhqjdUyKXgU6UKT1eV33lNcpiu3mFXf1VzFevKr4iIo+GMqHUi0rIncoVJXFaD3kw2L9B1f/Z
rzoczQOtxowmPbNP6pakgreEf3iKaC94YnOe/JroMYl9vPOTryvJaJqig==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable.
=2D--
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 d7c3468035..6c2b2e7577 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -23,6 +23,7 @@
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages node-xyz))
@@ -417,3 +418,27 @@ library.")
(description
"This package provides a Python grammar for the Tree-sitter library=
.")
(license license:expat)))
+
+(define-public tree-sitter-rust
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-rust")
+ (version "0.19.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
+ "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l"))))
+ (native-inputs
+ `(("bc" ,bc)
+ ("tree-sitter" ,tree-sitter)
+ ("node-nan" ,node-nan)))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:44:14 2021
Received: from localhost ([127.0.0.1]:55026 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsSk-0001Am-44
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:14 -0400
Received: from mout.gmx.net ([212.227.17.20]:47821)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsSi-0001AQ-IN
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:44:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628466246;
bh=qHHF39rTjj3zOe5sEZGdsbFzOYpiNvenpM1cDgLUslM=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=ek02yG5mwzz/qw2R/fEC4DcBZk724D9gRKe4Tnu1MFL6OKeOBEmKOCwX198EJq9iW
jsrR828Z8KpnPBpAWNmTLQqHuCChNB5pclkB8edALIXO2bu3n0V5uwxn9LklhWNqax
h4Ks8FpwxQVdqhgB8PUEnHRItj+QzaPkJuASmBLg=
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
1MDysm-1mMjpa1F3s-009zYy; Mon, 09 Aug 2021 01:44:06 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 21/31] gnu: Add tree-sitter-python.
Date: Mon, 9 Aug 2021 00:43:48 +0100
Message-Id: <20210808234358.7241-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-20-pierre.langlois@HIDDEN>
References: <20210808233354.6745-20-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:+u1Odu3fK1NDlUMEaRmxOdq3NfCIdXIsNf+6S6Wx96XVsYUcccF
8iY8VtCDlPm4aG4V/gJsA7dqlz4wve2kMZ6lMpAElczXMmCVAw9rprmzz+nMbPVkgUs6rMj
tvysStl1aARb3C22v66vLI8s4/S+ancYVzc2rnavPycD0jrXPvcNIwywtjkC76TYG/4mT7M
rA0737s/df95oHeU27Vbg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:WmcXWCWC3YI=:c1n+pxYRuQeqPsc78Jnfsn
NeY/JC4CDKtvLzKlcvhwvIXqngkeu/6KeMII6d4zEdLf7sxh3yKvjBQ7YxgkEao+kh18y8qcj
Cjvk6SI02H8srRc6AuB4Ikvrr5sgVzgdVAQcf21ekBS82rxLc8c0vtLQMGHlvLGvju0I+T+vE
hrDkyyn35g0zk1UJUydatBeO6er2/7tLUTjjQeBtjvSfejP0HmVumTcPdoKIPoabyMNco4rpR
weR3V4Lvz/Z5JJnESInDiLxp8n70H1P7GIidkEdLVKt2gi1vNTQjKl/7zBwIqgHMf6+C+jm+1
FbYCPitKRAEVel8FlflEVolDx9hFRIWUXjgwHPvrvZNFbHHdxx8DtX/vyTu7xSOWjyL5A2aI8
YLKc/Ab+ab19bYi71yHLX9X/iTmbnqUJ6uyhoKrfynjlpxG6ica05WD7E+YSDNaWzIsTMOITK
15YnhqHoRjPq50hSRW30/yugjoaJKq85qtU8zt9LQTIy9cvn/zhYdJEqX6nbuZWxvUnqxXxWB
nSgqurxP8GYUWvAyepzvdBeOgon/lN2SBH2YZr5WznY/PPo3dh6iJKD/+4H7GS9LNFG0RFYGC
XQeEvLa4useiPIcsOa7iBEdhxF1j0tgKfsCqHBJDfLmaBsQN4QzPVNwau5BDfrbhtap/33Ebv
hxCtwmr1z8Fe8E4z4PRlwWy0PWLkRgAS1gL9dARGZq3grIdCWYGFvkTK7vVOkyX+6lEOxT7O/
2hYPSeHpkHpW+Hx/49zRljmJ5dh3rG94m0rSGF7dSnNZNCWK86WWYh4ZJBf8HFGWibZLT396u
Ki7a190Fc0X4AGsKZl4A7RkE6eltLC8QE8tOOS00iG7oEhEKKi2zzyOl5rUFl393rKxC8eIX8
z80bp1m3rLHiDkdvBLtezEisIdJsamKtjkJwm/vTfmV1tv7SOIFSPgHvV5EL6dobXHdpxppdJ
8S/QieufMnJseM69k/q5GWPc84GGkMVK1v6kjfvT9vjUwVBqrEqhWltYaZMIU8AR5nvlVjlOD
TUR9MJVSHROlECVrs4fz/iDbk0/ssqPOIMikJiAM3tMB1JNyWuUBMUBKfWtXQTO1E4RlI/eNh
Z+U3ASICAfOOk6FTKH4zXhffByYXEvvaeaauqwsYRsqFL5PIPK19rCUjg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-python): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 9f1a30f0cc..d7c3468035 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -388,3 +388,32 @@ library.")
(description
"This package provides a PHP grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-python
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-python")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-python")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "04b85qxqs64x6nhbpcgrzkbilxaiwvr9yd3h065rynv7rsdg0hii"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:38 2021
Received: from localhost ([127.0.0.1]:55003 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJS-0000tE-08
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:38 -0400
Received: from mout.gmx.net ([212.227.17.20]:42259)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJJ-0000pG-1n
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465663;
bh=HIuREUXccOePMjT9OqhVPTxopis0xRHmbRRnDLfjqTQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=g7xrGVX87aQ/a1X1NRback8R7jjywVXlK/JOfTTrzlFVNTAlqDfN7btCILO6mVU6V
r7h89/eRyQwzjwZRm7/X6qCy9TpLL22wKjzd30o46JdDoSaoD7GTRMLX1ScMsm5Low
9FXkuqIah+MCv59lxDaHMjMDImCygWuttHEW+9iI=
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
1MZCbB-1mZ3qY0rZZ-00VBfg; Mon, 09 Aug 2021 01:34:23 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 20/31] gnu: Add tree-sitter-php.
Date: Mon, 9 Aug 2021 00:33:43 +0100
Message-Id: <20210808233354.6745-20-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ZiKBOJXS6F1/DbpS3r70AIZ3YzijgmPv1zZvCg0Fk1vV+XpIxFx
EMJHqDPFXbFCeRTY530PildZ3vaB0kbfNbA36NOAd+CVcxU8+OL/Rr8u7E94vDaVDsq57EB
23nvPZTU6W12lc6MBilbQ6Ps9xmVdGhSIWqon9rAy1G/yshKic31hJZYMKBOEvdg7k8Pedw
PMnNhRLO0ijCCvrgMnpTQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:inhUW15/L+8=:ujJtj5Ph3fL+n9f0THDLTO
wCaZv2JOhiJoHwoiEyMpEvtQGaV0DjC2hf5XaMTGs3VgGyJRKY6LlzQgzEjQij6EbrqP/Ekjm
PL1+yHzFC9ScZSnUGZ7Cqt7HbB/8mYn7ToFMRZu1n3xTmKdlYFQu9x0selRLuqd1qOof4MV+w
VabzrJpFIkpXJAUNQlcex/DSNUUOHrOKpA6hLVsFZKUr+xVrp5jN7A5ghyNAPxhEZuGSgphrx
5xZNORNAz0F/F5uankqH+cZpEXohLNYUL5OEGxKhKFZ1hOiXq5hdgEfUjfxM4RLTPGmpSw+kO
PeAFKQSX3uoQHe0h0Th+jqOEwdE0pTi3CF8Z2LlVbKhidbJLxeJsUQ3WbBgSUif9SobNdfMOY
36MJyveg5mUrD6j6781TjD2R2wJgj6O8mNCMQ0C5g/hpBVCawfKGNOCz+pKbTzIzlbLLX7Ngk
Sfzx3lYAq5fNBweJK7MIJ5+oxhHG40PqNAgxgZihddIEQZz6RTWwmjW0DRa62pFTmFxb4I26L
kdi6v0VxFZhoDgYj4BTr9pkG5HYvchlpy7s1MxAG+Ns6Qyxxrs8ypbKYUtZyol+xDSXExkSqi
eutrfOK7mnwEcNenqJ8je0BoTYPggCxce6oZFYeTD1RFy5y6VyfzrSVsNSXTToYfzpa8CupGe
UWdI53hu9GIyR4fQFStibiz9XE5EZ6SEdvmWhOv0vibKbyICpFtqjLl8rcfWNDg2V+Flda99l
42kTYiKkkpWnbUhxXhX21TilfsJjh5Xzx5ZPwYfG5ZFuZGCtWGFlrTO1I5zBgWCZSvfsCuPmg
FrnsZ+lat3VMNAWxBUqF3jyspl+u6xws2rK8XgUTBRmERjduwGGwkVYpDHXx6qLlMtiqILPed
h/9n+uO6cthptYyCLuKch94sGCfD30yXL0CRAKeFkJNDtn5eA1lunr9JETd5q9bFZczfCvEr4
iJ3qVMg1iYgik9Dw7m0WZsZDTbpmqVX/iMpTf4zcQAb3dpHuE1ZZit3wbLS0rEzQ1AuOADeAy
2GoVbsrU3lgS4zvmKERLkBk+0AgKufIUGHl23ynyvG5Kjkn/TMuV8lmTqius3bkCSJFSAnEWx
VANEOICOSvj4/wdD0YAmAVHQTFOop7l+zDUuXk/gHxoIodqmIm7bB8v3A==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-php): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index aa72348347..9f1a30f0cc 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -359,3 +359,32 @@ library.")
(description
"This package provides a Julia grammar for the Tree-sitter library.=
")
(license license:expat)))
+
+(define-public tree-sitter-php
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-php")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-php")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17cmybgpprw7w9d2v7lmc6zmr90d70g0jqq279gzg0mpwfzla53s"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:38 2021
Received: from localhost ([127.0.0.1]:55001 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJR-0000t7-Kp
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:37 -0400
Received: from mout.gmx.net ([212.227.17.22]:59095)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJI-0000pE-Ob
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465663;
bh=vKeYFCWp/cYBMLFexVMI5QkBmBrQcR2RaXRms6dXETk=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=D2wm5e6Ar2RduOoLOaKxmFa0gUzA/q6OObhBMuRtkpAkXD5xOd4sDfm1ozY5MkDpA
5Se4gJ0je4M26XBqyszEMO2qu1xkjmRYJSMUovniS3aRd6dRyJlwbscv9t7KPQVg0i
rhT2Oy0v2zk+HwRWAz7nY3AdyEKsGzeeGTMj8BHM=
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
1MS3il-1mgBef3syZ-00TXmQ; Mon, 09 Aug 2021 01:34:23 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 19/31] gnu: Add tree-sitter-julia.
Date: Mon, 9 Aug 2021 00:33:42 +0100
Message-Id: <20210808233354.6745-19-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:UT/xcKu3oICv9xmu1NPWfhSpvAb35k8Vg2qhhNtrqwEMJZMOUCB
1MEDVG7uAPwfgiHcu/xmvdGxAlH7wxebHHfJUw5CHF/+eA8dR38HfznHjtasTB2SrLcnUY2
S0S7UhaRSypHJpYref/G/EtEAmkrfopftMPlNJ4QmKyBqkkK0xD9XRl5bfkM8Jy49q4RXpV
4GoT0rcX4bE4rCJvvt2HQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:mgRBHL3QE6g=:cmrZmGw5/SSZYDcYKPSaEv
YGcCnHagBF0Xfa+1v5AJhvzAZ1sPU+iOAtx+p9O+n7EXmzeFB+Rwj2QhjiTMamVphBm/AGkUu
k3uYASsVW1sqyK9Io71CIGiwFeDvi1YpN2DbmRoVc1bT0YAGNJHy9PlfbvWhwZidXmMS2Uw/v
KYLCCDEqPBwmPFSMUHI8nkPOYaAHwvSe7PwdzXUZYVCH9LEeFlbiOAUStmV92f9AQpdW3ivRZ
+liFi6wmjeP8YfOTy4rzvbfRSLtwxVE4BZXqM9/6dK/+Ki4m2awpaLmCuXvXlRpIlMZsvPZZg
ymZ+et0cqV3/LnZD1NQ18oer0iISNazWdYpvhtprJCs0PXATz18Ecgs5KVm6oxtxrXGi0wJ3O
eizehwrFwEuS1CzKh83tktT9K6zlqukFiSFXXGltpV1NjwRFT8C2xC1TjC9Q1TWbahBtHr4Bw
e9f3I5uwMOFWTZUFIb057z92eY0tB3utypRjPkqq5jPZVqTx3WBd7UrBTTOIwxxwXZUNL7TaF
CMhcjr4EL5Em8YDKYmS/5fWw/6SkcjWM+gAwluSFUp8+vO4MZARPOdKAXRcv9KonE6x0M64z/
7rz3ecgZY1yKNirekpqZ+5aCw5zwEeb3MWFgS8ouC4ovIXZ18OXbDSR//ieMyehL7Bp9jQ034
FgxORSzjcMFlcSxxcHN6QrBfSXDGfZDylow7MD4kYiH0x8whePCPhNdKAhepG0tM+Bdq7EzAO
2vTk4C/MNuz/+AFIfwBmH3NA68fkeO9eMowiKMgoISyfmc2imo57CEXQ5Wh6Bx6WAyQvkrkL6
yiUBG7VvPJNmidTz6b0t7lLXyihivJWtVK5xn/ghy++omi6T3+ICmG+a8sxqm0zihOqCsR9SA
/uJUiCOpeecdZkcDQcQfTwEJNnDjDC8QYmn0wOQh/f2W0OceCnYVIhx1q6rtNtElTIKjkR7X4
1euJWCQjiwSgjw6AtmtC6zTCAFIM5wr28hCtASMVwO9J3UM3Xt9voaF7cz8cvk/uApXobpZ57
5JGGjeBB8oEgZzaZjipqVnjp6l5KqRBySN0Gjv55ZXbRteNXXRGvS7gr7P3DPmTXFKygjIPk6
OyDhup7YboVYpzz8bial7AABVjTuhDYORgq8pQG81CrJrBEUt6vFLHVVw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d6214de2ec..aa72348347 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -330,3 +330,32 @@ library.")
(description
"This package provides a JSON grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-julia
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:37 2021
Received: from localhost ([127.0.0.1]:54999 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJR-0000t0-Ct
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:37 -0400
Received: from mout.gmx.net ([212.227.17.20]:46057)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJI-0000pD-LP
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465663;
bh=eqqUVA8VshVOntsIjgB+gexgYU/YfVXc8VH8mkhOX3A=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=h3eQocb98WZZnAWxQZEkIYNswZWi/hlp+u3CPYuKgPYBtQSnY/BRl2U7aSPclrFJF
RdVKumn5795imsy70WBjrkyzv+RfxEkfIaGvnHjdGo/1+2wTpeXh3DW7wiUhL0Y/JC
Qk4tM8EvlK40zMrcG3j0u3ws29ZijjyGG71NckZc=
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
1M4b1y-1mEX042iUY-001gAl; Mon, 09 Aug 2021 01:34:22 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 18/31] gnu: Add tree-sitter-json.
Date: Mon, 9 Aug 2021 00:33:41 +0100
Message-Id: <20210808233354.6745-18-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:RG+sG7STBF0xIalwmShI3tI3sB6ikTeqalpoLr832VAjFsyLZUT
y53pX6TnYs7Q0tAJewpZj2hOjBTKGMJoqlCLy1mvBFj6oO+tfZMAiZNVx1uHUE61nH+RuIo
hwjPPD97lLiMuGx8yPQnxckhcLIiZgwox2bpjUhqNESIUIuIiNgSn4KcJvgu7j4p99xUtir
Qr5/vywiCBO8Gt16b3UPw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:3Mxm/b+qcKg=:hH9CzvK79BlZK9/QQhd+uE
uu52VvON25mNaZ1KY0T9TmaBSyQjEieZLZwXvtIoLXRTujn0UU25b0gj8vRq2kmAgV61Ec5NE
Tm/mRzmM1boivGgBUQW6etY5YJp0JcmxCQZvUxKHDd6TtFrLlk42nqy4CLBHc7JSB5C0BZ1FY
2z9Plvpzo1n6P498DgXL5qvaE3PYsHrWw3yREhwkRGs4ir4/90uVRyNDFopR++JhVU4isxldm
Uegb0mcirJolxGZFU9hO9NhBffWEl+ZfsEvEV51mWVAKPh8gn/3TQKH3MChSZuL9mbagSs1vT
6/m3taW3IGZZ28XgCtvUYOkNtNRT4FZ7FVgZUUGtxDph3hgoVwhbtnX3Lwi27qPD7pjNAb379
2tUtEaXtQdSKmBxwmblnagxdJYQlG5nwv74hz9jPIOaU+qmHjVfVQcabTq5Qa6BAtEig+FFHZ
Pjxj96wLwbauPM/i7zWCjzktirjhibyaWkPw5qPzLFOuVaBb0WADPHLwp2U70QBRvZ1agpzy8
1trPtzapqbS3yJB/PiZTFHzSoUEyIKerDhnjpRsy1/LXFUxr/Ufujr+N9ZvTzy0WWhvB9QfWb
iu/1lsmaPgUf+h3Bt7koUR2PgnGp1SjQRPTpk91tIXFneuL7vIU2Lh4eYZP11U2XNKyBXspHA
TPwDuIcjA+rR2Ed+swWv/B+D8kvT/1Hd2LoGkPCw7EZw3gkV7E/z17UW/sgScMB6xhcQ8y7Nj
AgoSGzU0DdGoAtJJ4GlSeF/ysoqWid1R+j0pevDa/lf7W7TbjPDOPV3Hj3LZTYTv3xWc0DBhO
iwF0nMWGalkFYuH/MdpwGNsCUn8LTK62TOExi3xGUo8gwmXsMuOwLKwW2CUBaybidDWSibnUb
ASVKHetJ+2ABt89z2deo0clHT+cU/KBKYDjnwAiNyMBmWn/BeIYZc6Hpksd3nb71X/1yBhu3d
iq9oYDa9zpD0h1ODsdhIv/bBIKVjLRlZtFSB7gWCHm3D1hbw53zRTPg0h5qoZggK8yBqI2cUf
BeFnGnV2qMYCrSzUbN84ycH/VrvaC2UIPhrjh8OMCNfYDx/NmIgTGq3VN1gGasDiPQ+Ce3E6b
0GcfYNATjsHSTObbSzrwoqih2t7og7TH9Pkq1F1CsL3VK4OztA0GwxZQA==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-json): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index e59a44c521..d6214de2ec 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -310,3 +310,23 @@ library.")
"This package provides a Javascript grammar for the Tree-sitter
library.")
(license license:expat)))
+
+(define-public tree-sitter-json
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:37 2021
Received: from localhost ([127.0.0.1]:54997 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJR-0000ss-3w
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:37 -0400
Received: from mout.gmx.net ([212.227.17.21]:42067)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJI-0000pC-6J
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465662;
bh=9ewappmlgti0sg1K9XgMKD0NXH7D6akk0AZA0trlDp0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EOs8GFQ44AtMYKGBT9teJVqXpF4Cr4lkqAiEzpOIOt0pYSUmCTKmjh5qIF2bWoU3K
btGl5QZiQWKjDO8PwNxpuJZ50xOCK3TNDWocsC45QjEBNY1rI0c+hPVph03mXLVbry
C49OlfpxHf05lejvZ1KLBs9c3SjnIBrZ6EaNPBuo=
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
1McH9Y-1mpVNS1Rfw-00cesj; Mon, 09 Aug 2021 01:34:22 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 17/31] gnu: Add tree-sitter-javascript.
Date: Mon, 9 Aug 2021 00:33:40 +0100
Message-Id: <20210808233354.6745-17-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Bi8kDg+xCxdO7Al3NtjuRdm0HeyZan8VV+pMOFBMu6yWcsO9tgr
mchXun6lnLQJTa/sOvXpRsWfK7i+jy8qL+eGMoGGHvpwobiKypBsvmZzvZ8A6sjVrKuNGkt
QVG1kq5/T43ZhBhq845ZgWjWgMmco7aruhyvgwk/Sfws/Tk7swv22Sz76rWCKLoIN8Y9rFg
Lh7DIGi5Gn2iaJREU1nJA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:rjLxZpxXJEA=:iZS72hy+yrvEHByZqM+bZ8
4eob7r/caxq2P5dshWMLFpJsYqOYBWJWoyEJKc5y3CsVwwJesrJXiRP5ZHkjAi4is7jX/NbQA
S6FTQ+RWNEyIZC1RUl3Y/eZuGtq4JIJZeiE5Gk/4UIFLBm2hHN4IHXaY2U1GxX4DoyKGEhsi7
U8tfCmfY+2hwiAelID5uL1w8E0Ofm1fi4Y8MWz1Z+QwK0qtBQIwUJFgUvRvRuzzmEokiMVcn/
/lbwjrUxnzujXnfyCSxHsE8eN/UZVc4NqlkCeLB774Uojd0E18Z2H0ZOJqhnS6ETnGYIR9Sdv
0xdPkwOBfjMGXpJK0ASKWxabjCsHXdKXet3Gy/NnDzcAsU+KX1RzrEAIMbo4VWG9x5+AeRMaX
W0EYCNdv7z/5EzIMlXm3/g1zXMhtsaZkqqcc1G+41RrH2xVonRszLv+c6PN3rimV/zTov7dER
KzA4AzSSoHPA/H14RbrtpBebxciGS2lSJaIPUJFVons/EQnrlJOSFbDvmAtlz75xS7focUmql
RMRGalr2xxu2HJgjtdfj7505oDhfM+zKH5mq9ByoGtUwYpSRDaIdk8zvGkyDnoci5eD/bjmSn
qHwf85M12Hi1m02FCGG64Tcxt8z4LZ9nzQEShuDJmxtohzaOIV4WDM6CP+Dn5eqLFmM9XJ8Hz
3gyL8zK2+oUUONC8svbxLqLhX+28WXvdIqVJJ0q0uCK82ZYpIoM5wPW4lw2caxqk79BWdF5dX
DDL9D8xhENbdrqI06fHGr3gr1CxMMuNpNBSvE44cW/2YcCFup9+8JzbWHKMVavab1lqmmZT9Q
amceFs7Oyan3xfqWqVeDTcZV63u84/yMQreehqv36KfVprzltMAaBHd8m5Earf0OH/27H+9+Z
ucLLV1OVHcrKNCrjN1h9zhK4lVycxrToiQNSOe+ZVtqqOGOfZqeAElgXKR4rR91vxc4GPxk29
F8gfFBERzDhw4vLZBfRCC6zcA8XaU1prWauFCr87DGpnKJhsQN/InzEJzrvicPAVqCyeHyFCI
BwDwSNNPcI11c7enrTg8CZS0yma6QTEaV4YkEP0JhO8EpthkzPeD1D1YtwC6uu4gSPojM5Exq
aEVvXSzgO3gJPiqxz77sdbg2yIsKJyuYbnA9nRHP+OPaU+jiogkihx4fg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-javascript): 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 e671c3fbf9..e59a44c521 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -280,3 +280,33 @@ library.")
(description
"This package provides a Java grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-javascript
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-javascript")
+ (version "0.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter-javascript=
")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "063va0s727yzhy1cz04fipzwwbq4af6fhgka6g970hk9yf7ggmnj"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (home-page "https://github.com/tree-sitter/tree-sitter-javascript")
+ (synopsis "Tree-sitter Javascript grammar")
+ (description
+ "This package provides a Javascript grammar for the Tree-sitter
+library.")
+ (license license:expat)))
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:37 2021
Received: from localhost ([127.0.0.1]:54995 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJQ-0000sl-Q4
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:37 -0400
Received: from mout.gmx.net ([212.227.17.21]:60323)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJH-0000pA-OW
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465662;
bh=mBOJGm9JsV8arZvjDwt2lse4nTgdGqucvRss1PwYtYI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=h8Zhi7FfYiKxtwVVC3Or1gySB+nCpSY5O6hO0gS51D1RfdNKescOvaaYj2FIcPELA
mx4jyimCyYgH1DPsf1HRNbL2/cde6II+VHaygHzrdZjjfV8ze8u4t3QNueijgN4Hv+
oLUGSheiW9qpG5Uf0Jz8tTlP8lK++AM+Qb3VmIlE=
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-1mDQXX3bhS-000ZiB; Mon, 09 Aug 2021 01:34:21 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 16/31] gnu: Add tree-sitter-java.
Date: Mon, 9 Aug 2021 00:33:39 +0100
Message-Id: <20210808233354.6745-16-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:2snYmM0kTzSfYbPFvmgvv/F/3vpuwihIBGNKrGMP21JTTvCU37e
4DluRnvRdqZT8AEIDsYkebMNmOnn9BYfyis3yShlETGIyXZ3xdWi7iyX9NEb/d4928JQibz
os0zVHCKogLv/d7MmppAtskW9AF1IZJU7F5fFhub23nz20OaRCsv8jKUAX4QhM6czeDL/I6
ZwkYFO4MrKNS2NC+J882w==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:q+L8LlTNt+M=:vup5puxGOTDpt90pQcb/9u
551EUcAOvNqw5ZFqSnwIHqpl52o3Lc/GMGFpJYY6XeJKtD6/p3yYLAOMbBAHWaP4LiaBIQhzd
z9juD9dS5VLmQr9jEd78tfJPoOKr0UtewXd0luuvHQ14k5MLPh1Tvx7XLcX181SkKLm42c62i
MHj8ok9p1nf8aVc/j8g0dMDtM6DKPUjg5RrfnsFKNsrl4FPZrtn9zf/kKT4KCn5nKvakFapVe
muvOc8Xvt3kcZyXXKe9wrduB8sQl/0gA9YgKwe+drSqLsMwDDamq657z/mxjrnZB0Lue6AwaC
5lRIz+EhX5bRMLaEwhAX8YeVw145jZLB+3p4DwoC/lF9Syx02wNJa25j3YhCRVbahjviVM/9U
iFP4q4G4QmLtXiZwA6MRd2StNJPUMOyRCVthMSCncv1K1FUT7gfE/YQkpB1t9vBUmyogLrX50
SFQHB1zhz/Wp1PTFyPNxxHtIZ8ClUZnP1v/YwLwahkR91nwTjapW1sfpyCKlkA8dvRxg+H1nF
gHCvU9lRbCzuBrMbAk0kNWNlCBcTOE2P60coPQXhMGKwseb9vJybo+KWtizWxqXGiwo9tFW0N
4aunlL5tWhm8U9su3D9iluKMwRsUpucEaMmGar2O91XAGK5WomZJxVLf01ygWTSt45l932CmM
6V4gyzK+5SBVOw/YxbVA0jKRQWyKOZ2+u/AJ6loffAIxXa22zFHmaXkhrJsrBi0urc5kmkI9t
0VOMgZ80xx3yS2+U+MCCwA+ptllAarglSYXyS8YVt9w+mKMmHVHJRH07SstWvOUneYKIql3m6
Fisn0dyqevRpziSyFvyixMd//uA2jPAvL05OQTo6j+AQnPiV/Hw7y3xZgfSigk5ocbwQl8Ycz
XcB9Np2objeyJfWisXVEcpZmCQmJG5e0FL6wY/XFIUChOOmBvBQ196e9toSDb4lHAmdV6Bcdg
TcyXGo+5iijN76NS9mGJDyhDOAsl/rs0TZXdMEJLwx0h4dT3Y/kSIlaBHbIOoke4Y3LTc9obq
80ncrFurqQwxYlAFdI7V0KB5ZTCiS1bOVwBTO4Y7kLnLIcEQsfeg6H+7+WOLz8GZkAivBCdwA
+mHs4VEUXelJ46OhVUL2MttrSgJkuJa8TaLFscXPSiGgYb/YdMg+6PJaw==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-java): New variable.
=2D--
gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index c2ca5a842a..e671c3fbf9 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -251,3 +251,32 @@ library.")
(description
"This package provides a HTML grammar for the Tree-sitter library."=
)
(license license:expat)))
+
+(define-public tree-sitter-java
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:36 2021
Received: from localhost ([127.0.0.1]:54993 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJQ-0000se-GS
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:36 -0400
Received: from mout.gmx.net ([212.227.17.20]:50621)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJH-0000p9-Dt
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465661;
bh=iQwdcZMb/NpVzhuKGmrJKX4i0UfZ6b4zIcg+VesPckc=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=eM4nZWCIufzwvUX9Kl+EKeqlRkAM9kt+iehMuGda2rnx3QqvIkWoKClK2myaIANBC
yXFvvwYRcMe0vIAzjoGgDRJCSrZH9QDJjckaLzqIF9desUuuXu8U7AdFtJdE6h0qy9
OPP3eQd33792+WaL4aL393b9YbmUWCyGSQp8CMME=
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
1MZkpb-1maiXS2QXX-00Wq66; Mon, 09 Aug 2021 01:34:21 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 15/31] gnu: Add tree-sitter-html.
Date: Mon, 9 Aug 2021 00:33:38 +0100
Message-Id: <20210808233354.6745-15-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:jciSUl6QKxWBUr+zHyPwjhHi+2rkL9dFG2c3IF//u8zLJMWNd0c
1zlhYvjjMpYAvYKzz3vyGLxu04R06DH4rLOK4KEqmKIujvD5f02xxGj+4UBOIJreHgRLJBQ
LYEOr9DYCvi9Rl4NdspSgHUuFNhRRfousse2u5NscxO+GDDeLgkQCbi0cZ23fYUKQAoqvdY
nTHLXTRxMqjYE8d3ShxPA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:j0ECIDONeFQ=:FxgDXxUhbKZSLa0opuNsBr
G4tI9ZNEphVglML3UePGV5UWkJH00AfqLNbXsoXhUwo23jYYUbXiIVIY3irOGme3yzPezUP4+
ZbEndWnXw1dN5UnA+T8de8F84ROBiRIgv/8rHLv9ksub2bFB5VucXVVSs66CN2aovfs94vvV2
cRdEnQxDrrIHqzQjRKnkqK+Y2JRT/s19/t5ZTS28Ctp4KhRdamc7FRWsQKVmQOAFYKE1D8k2d
rFCcGaa8YyP7dSWmtCNseBbFQredeOA2xCM7IhU5LlZX+UWrXLRn8guRTq+KVLsF/dGn0rXFd
sBZG0v2/2Ro2bH8j2nvcKa0MsKxhub/+FH+kAl3NOy3mRRfsatZyGXjw1uuWch0GmG4Vd/pG3
XyT6BdPVsDiVCWtqxi5AsGLsaZpoOkt+8iKNh5Xbsf44BnTo9YszC/VDDTnIzrIPGqOqN1WrF
KALj7ZrXh0kdrjDrfpBJ3bGGNR/b72iJMZDMMzVKfrKZH2Vek4l5oKQPLWMIioqTA0irebnN7
E8EFuzqmdrofp2whl0/ezmCmbyynfJkOZ/jIwYPPezmPHEgh/JaG1HvVtwLnVdHiFpGiVasv1
l6dLSB+qCAwWEpUj+HQuK1BZ69nPyYN6COF1zmaSIPwreJh+3MRQ7ckLMlNQytYYIm7cz26n7
WIt2QfyeWYCUJcPM63pxcmkOj1FWYD/Hhu17v21eyY4EmW0gaYLWdpyjMMk7D6b+Qz8BShCti
uI4jHnj9kc76HkbxH3dSkrXpQVHQXd9bP45Mp3sFX5sTXvxs05sNzpoVROMz+2ziL6TYIYznV
Mq6wIyQy6DOIuZAzl8SgUUcN+HowC8+juc+89FykYsc3tLurCjKQpgz+QLUl4b3k1vE5izVmm
cIoaJfO5w3nJtTSFrmHjQ8L8clrGnNLNikgFfSCqiXnsYr7R2792Z3YrtESOVxJKylBt6nNI7
d7XMGKKGGDF6fHP/6SAAC/O8GyrPrvHW/8Q+Eue+xcLt9WVOFjYjCsbOkRQAzdSkrTDym6a9T
s1bq053AIZs0s9UzqRggrUG4xFkvcxzxyKDLhrMxw7wwxw1L4BP2B3YgG44o7QlgUAYhXNtsT
fcICFB2jwqnwV7D9I35qahm0NFLSEbroxd+XWV7mKhbWtbvu2Hr3zGPqg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-html): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f163efd7a3..c2ca5a842a 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -231,3 +231,23 @@ library.")
(description
"This package provides a Golang grammar for the Tree-sitter library=
.")
(license license:expat)))
+
+(define-public tree-sitter-html
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:36 2021
Received: from localhost ([127.0.0.1]:54991 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJQ-0000sX-5r
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:36 -0400
Received: from mout.gmx.net ([212.227.17.22]:36043)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJH-0000p6-4c
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465661;
bh=shc3G15aBuqHcjbBPqIaaR+aL+PuHYSEPtpOJfktdvI=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=K3309ZimQrR5hPpBJrrvPwyXyngkZz69i6P0d0tV4GMXHSDNSNc88HC+oEQYYLaYp
Bo+cp1eqSW6mhQoXdvx89R8E1XlCL0kn+zTR5SBRovJUyr7QpR2rklblKY05tyO/tA
rfdUN2qtys5DAr5TNJAMmQk6M5Dw9cCfLrz11cdg=
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
1MpDJX-1muiIM1G6J-00qhMY; Mon, 09 Aug 2021 01:34:21 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 14/31] gnu: Add tree-sitter-go.
Date: Mon, 9 Aug 2021 00:33:37 +0100
Message-Id: <20210808233354.6745-14-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:jHb9Bj4Vp3C+rTnFWx+YiX0QqLPRQXKT5oDUkfXNeA2S1rMb7eN
iZD55zwfSuDA4bfNmbJzu7TY1FAadauseZjQJN+1qbxjOxwpSOogbMOTS2kYJ3wG5Jjc/9f
hOjbAs6EaSIl1J9Kqkc9W0naTDsL3CfNL6lFsMZTDgtU8wWoTlzRR7a0aatuCK1k/p1SeFn
iGdQhcj32jNhbfK7FXxtg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Bl9o7EKe/gE=:jLUCV9WrsJxZJminIQPofK
l6flhEMI/BAV/hu7ReQHPUHd1N8Mglx33tAyP7vpya74693nrLttUMfLPQKH0UNZfOX0DE8sU
9eg2bkJ1/LuMPyNoDgUTGCOyi2QKjo0OgDW2S1vZ+UsBv3ywfQONk99pk+l8HUM6y/HBY6ITx
qk7vpFTnKgzPGlXD6KKhwwxYX1v31xjnApOBObG3mGslqXlfFy69WOs8yPGtxxiEk/TCbAtt5
vRxHgHMJgvvs75PqmNqO5i8gBMl0I2aoPAC2dSPMhdURJCMpL7Kje2mbZsfgRl2A6Jfr4QHDJ
Wsv1yG/1eXtxg/iWwW4I8pzCR0enP6RSgm/Y39wlmR4RWRtEQuztW7mtRjkaljkL+ljt24XWK
92qOCWV2I1R4DxC12315FEcRKhIQPAaHoOB6N5dQPEOL2Y/ehLws91/ARLcVBlqSWXGPByqkS
eURJmeqNh1RMHFKvm2y5UoW35ESsqGQff0A3llIxEWc/Gl3PZJSrPwrhxjRNnsUhdSnCSTrGt
9uZpixIhVe+TAnMFzjBlQLg7V/82T2CxCNsziKybMiPnHhWacO/mdPadVF1tj2Gv6rpMVhb+k
2tdJRzQ3/9YeS5L4LqT4EonkOOgnbdc3ik1Fx573qLocygsMFfDIuk8voVVj3tAk8JcfD7mFL
J2uYaKkf0eTVF4ddDTUB+yFoBp6DMobaluzR4Nl0QrowJTjk8b6bU+OS/tMBoKFL0vee9PpNF
yKD7qFGBQHnAMa+m5lF7L6C625N8TVMLknY1Cty2CpyCbZAeUy6606gqybDNOfBJAFZLgofCH
7zBrgVRX4HLs2DcaRAQjk8ZGp3OnMw3t87wOohO0iYg5o59hJNWsA71z3UJAjePt0H3FsxWMK
VHYyjfhAZnTkQ3LAKVeqKedSNYHnO4WPhNjD4/dpNcD6D5A9VTbST+QTl3MZ07+iMM7YH3ie2
Fx7rOK9ieGqT/UXrN4NcK7qMN+3zGyo7lDnpnVNmSH7qbSis2NOTb0aKtiaVJmmgwR8Z65gW/
mGWN/mzaiRwIjvedwUJSFAcv+PI8yg6CLDgBuLSr9WJVKJPHCPN3Y0EjHI75RC46F5s1vJwhg
T0qUuTbV76eMeJNWnQq8QWJyYY+iIHCZw5e6j95++OxghP+He8G5lDvDQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-go): 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 05929a9062..f163efd7a3 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -22,6 +22,7 @@
#:use-module (guix build-system node)
#:use-module (guix git-download)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages node-xyz))
@@ -201,3 +202,32 @@ library.")
(description
"This package provides a CSS grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-go
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments tree-sitter-c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The parse-example script tries to clone git repositories.
+ (add-after 'unpack 'remove-parse-example
+ (lambda _
+ (substitute* "package.json"
+ ((" && script\\/parse-examples") ""))))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:36 2021
Received: from localhost ([127.0.0.1]:54989 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJP-0000sO-LM
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:36 -0400
Received: from mout.gmx.net ([212.227.17.22]:37737)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJF-0000p0-T7
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465660;
bh=1xHFwHs/B9bMJbdZRUu95p2LlUPYOA3r7DmpcaCtJQw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=OmwezAhC7KG+YCwzW7wtEyldGekH3JBCRJLFzgesK6RqH8CZLr9ke4c4MikWajSQA
OIBGc6C097Imn7QsHi5I0eH4Y9kAILu9HRhP2a5jWfj/tTuDkHytTt1ypHxybLnSRL
eFgpWDdrmEmKJGFjD2iTNiUqx7fi27J6609Ueayo=
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
1Mg6dy-1mlft73gru-00haYl; Mon, 09 Aug 2021 01:34:20 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 09/31] guix: node-build-system: Support compiling addons with
node-gyp.
Date: Mon, 9 Aug 2021 00:33:32 +0100
Message-Id: <20210808233354.6745-9-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:T39g12904tKuBJm22lsb1ZoTAvE4YclYsMGjo3W5opsmB043u09
90M4+6NliZYp8iaxw0qQbJuSYFCYFdlkeknB7KSe87O0kbRPpgNgqJeaAnuZA03XcV4kaVm
tMGUn7XNEJ2ogtPRPAdjVi+m7iBMBvc5iKpJo0dihCBRHYku2LEefh3pZ2qF/E9HFIqui4K
CYU7qsl+z0p6k5cORda4g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NsV2pfxMuro=:5dBrhS8W7bBFpULhpK1Q1W
yR3ukIX6hUo0LDSGhsM8fMcVp0mSw1S8LpCkKeXweBcqmwmxPx1Ao0Pa6xXg/EQQ+XkkBDuK+
XsgVzslvaA1UMeOBK/T0xRiT9sJnB8RoPAAMePpNTm/HxjTQzZ3HF9jXzVr8xM981PATt0FNn
edps+taHbTEfGinz28pq7EbM4PDRVR1T5UzEz7axwnKEWffSpAE9WrcDeI6YwPLa0NKhsSK9x
GTL78+15hKZ3xuQbWZotPv+C03iFMFuXj/qvEyyh+GsjKOF+6c62zBFN9uRzJPzsKHvWKOY2f
lKbHx0xMJtpnFwWZqxX45QU9kSs41Pws3Dwojh0LqHVRwOSkWO334/Z64C4+IH4qLF9fQX9pa
J60UO46HMlSgSU/ByASaOsepPUnyXDlQsoX6t+QhMplLRNKHT78N5x5KDlH2bbFzqO0tC2rQf
grp43tx95AR05awVCU1jbpq3P2ctDawkBt1+W/P+T+K83jK20eNG+jUqHjd1n0Q7BTcqd7AgP
/jMMWe2kxiLKp6uHp5GOiZvcjUGRux/dXr/DB5CCpoPeCN/GFqMFc5hjh/ARiQz63b2Pc1kMX
25dGl9GADDmaXlXtSeSBImaHRj7glCREnLxGvYkm3pay7/i+rkDJEh7gpUyZ6kxwQPsUhfNhf
fcWEBvL4qZLZuSSgzPqgie2rlD6Euw9KKxEcWwex4huso+IfwFp8cN5steogY8duvgK/1aGws
j3ogBiYQVGXbec14Efx/wvLuQ8VPUGArbi2x/hp/k5Cg8poBi7oCh2bYQ80vypLs6vj9w3joz
Ul+PeA5BA8c4IMcfFYvbo/mH0znIe9ghTwtcm9kd/hh+Uv6GeJVlM/dthZXb3u9dHFAaf+3ft
2KKtSZJVOBoTA0Nv1tswHWshTqf7a6boI7/5U+4gF4IE2NWzJ2L6BLnrVx7leErQbLjdyJ1yx
4JpegZdZ8gDIHmeZlGQldFN1LJNmfKmSR7iEWRY+EbqErx/hYcI8uEu0kpmHP4eLe9fqIaQSR
Lk4r4QkqM2uD27FGTWkKPEMi21oJOYZUNnSbTOkmHorMfdN5SEMbLzPVHd9M2M3Sy30gn9CEU
m0o6tq9QFGyKuDoUbfgogOgt+WfCcjePV12i5mSXfzJHbk5X4abdewXnw==
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.0 (-)
* gnu/packages/node.scm (node-headers): New function.
* guix/build-system/node.scm (python): New function.
(node-headers): New function.
(lower): Add node-headers and python to build inputs.
* guix/build/node-build-system.scm (configure-gyp): New function.
(%standard-phases): Add 'configure-gyp after 'configure.
=2D--
gnu/packages/node.scm | 19 ++++++++++++++++++-
guix/build-system/node.scm | 16 ++++++++++++++++
guix/build/node-build-system.scm | 15 +++++++++++++++
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 522d4943d0..d0f7c5cdb7 100644
=2D-- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -48,7 +48,24 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (ice-9 match)
+ #:export (node-headers))
+
+(define (node-headers node)
+ "Return an <origin> object for a tarball with headers for the given nod=
e
+package version."
+ (let* ((version (package-version node))
+ (hash (match version
+ ("10.24.0"
+ "0h37zjwcpxjdqcxqjfj5zp1n5zjxaa0g8lsy83955afg5cca8p0n")
+ ("14.16.0"
+ "1vpdgq7kcw1a0w90lpvbvxbrc0n3pwjrs3sm42pjj7560clvji2b")=
)))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://nodejs.org/dist/v" version
+ "/node-v" version "-headers.tar.gz"))
+ (sha256 (base32 hash)))))
(define-public node
(package
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
index 98f63f87ef..7828582a9a 100644
=2D-- a/guix/build-system/node.scm
+++ b/guix/build-system/node.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright =C2=A9 2016 Jelle Licht <jlicht@HIDDEN>
;;; Copyright =C2=A9 2019 Timothy Sample <samplet@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,6 +42,19 @@
(let ((node (resolve-interface '(gnu packages node))))
(module-ref node 'node-lts)))
+(define (python)
+ "Return the python package."
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((module (resolve-interface '(gnu packages python))))
+ (module-ref module 'python-wrapper)))
+
+(define (node-headers node)
+ "Return a tarball with headers for the given node, needed for packages =
that
+need to build native bindings using node-gyp."
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((module (resolve-interface '(gnu packages node))))
+ ((module-ref module 'node-headers) node)))
+
(define* (lower name
#:key source inputs native-inputs outputs system target
(node (default-node))
@@ -62,6 +76,8 @@
;; Keep the standard inputs of 'gnu-build-system'=
.
,@(standard-packages)))
(build-inputs `(("node" ,node)
+ ("node-headers" ,(node-headers node))
+ ("python" ,(python))
,@native-inputs))
(outputs outputs)
(build node-build)
diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-syst=
em.scm
index 70a367618e..2993c49b2b 100644
=2D-- a/guix/build/node-build-system.scm
+++ b/guix/build/node-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright =C2=A9 2015 David Thompson <davet@HIDDEN>
;;; Copyright =C2=A9 2016, 2020 Jelle Licht <jlicht@HIDDEN>
;;; Copyright =C2=A9 2019, 2021 Timothy Sample <samplet@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -101,6 +102,19 @@
(invoke npm "--offline" "--ignore-scripts" "install")
#t))
+(define* (configure-gyp #:key inputs #:allow-other-keys)
+ "Run 'node-gyp configure' if we see a 'binding.gyp' file.
+
+By default, 'node-gyp' will try to download node headers from the interne=
t, we
+prevent this with the '--tarball' flag."
+ (let ((node-gyp (string-append (assoc-ref inputs "node")
+ "/lib/node_modules/npm/node_modules/node=
-gyp"
+ "/bin/node-gyp.js")))
+ (if (file-exists? "binding.gyp")
+ (invoke node-gyp "--tarball" (assoc-ref inputs "node-headers")
+ "configure"))
+ #t))
+
(define* (build #:key inputs #:allow-other-keys)
(let ((package-meta (call-with-input-file "package.json" read-json)))
(if (and=3D> (assoc-ref package-meta "scripts")
@@ -147,6 +161,7 @@
(add-after 'unpack 'set-home set-home)
(add-before 'configure 'patch-dependencies patch-dependencies)
(replace 'configure configure)
+ (add-after 'configure 'configure-gyp configure-gyp)
(replace 'build build)
(replace 'check check)
(add-before 'install 'repack repack)
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:35 2021
Received: from localhost ([127.0.0.1]:54987 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJP-0000sH-Bq
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:35 -0400
Received: from mout.gmx.net ([212.227.17.22]:51349)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJG-0000p5-SW
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465661;
bh=jRc5OYYPlm1ZL7RCafQ6yRoaIIpCSnFlFKPLEJdwBm4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=G/RYOQz3C5U53XEwHadR2ZypDt02tVUm/OmMKjN6z5tcIBmGocwfulYYaEHgv4CIo
TbhmegghHfjnEanrOee/fBylBWZPAvhY7aT0c7RG0HiM/dbN9ZjaOg2d+XiL9n9QeY
4/7YEn041huliFLRyZwcCgPMTSXllU5SHEh32cpw=
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
1MZCbB-1mZ3qW055d-00VBfg; Mon, 09 Aug 2021 01:34:21 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 13/31] gnu: Add tree-sitter-css.
Date: Mon, 9 Aug 2021 00:33:36 +0100
Message-Id: <20210808233354.6745-13-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:wxC+1jTZjapE7b/jFgOWMK5Z34ZSh0CDXnlYDiGIXhIH+FWb54/
i4JrLuKUfTT10AXX3tSR64zAQqzz068eOvsZg6fwVoEvmr6Z7PwmUusHl+NGt1I90RSIQc4
HO8W9djABChuoJN3Too9UqfHbqXqYqT/UQ6z8Q6YifdTlbXIFpymrI5lcDZZh22j1zfGGc9
Rg+8bgsvG/QUv5L5FJuDw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:SJxEa6Y/cZE=:j73w8Zy2nkYHmPEd6AWZnS
I0k4B55kKAPseUzHK0VkTZC5EZUtuSqUvVI5qmq9I5lv4NELvF90xIkjLckKT71t3VMLDD40b
VvfiTBPfkcHfm8Z/OQ3E2vtJQBYSv4qGsZnYPTeYvqvMCfXO2CPejG0jMGiqyCpSLE3+1keQj
Ze1U9UNrCXeZ4N+XgpHoZKwYsaXeW3y7cmQ3MyhVL15h4n3REjklISuPuZ1CaVc7dDuCiL3As
bIfLeIPaslaGeaJTUTlxojziomdbnY24jHAtbrxaWwYEG0cLNlhIVOCB/M2teZ8sZP9YX0JTk
1hNux9PyO9qErQPkO7Z1/pp/z5hyJhDdl3eYVeO1xdqFTqdgZ7UR2EnxjczEsApqlRAZxvirW
eWbQf3EVvcSezFfUO8j/UiUUGQ/sYbWoNVLW3SDLvIVzZiP+rfGnPPwoe3NNSbyctTeB5I9be
3lA+HV6YkX50xEHwf4GTysHY7Sh/kL/b7qwMZS7zouCqCdQTCRGmlvU1Zj7rOPoYwDikWDvGu
Ecaj/KmxWcv2pmj4CX5lrrPlFAaX+TgFLROJGgaKWmxlnza0o/5w5fV3NacD0TyqWw071/rHD
UkEW3qe4tDhrCkUiEbKWO83/lH2/+pI+m/GOtKn8sJiWbgfbnU2eFLCJUHalIoUAC6P/JV+0Q
2ClpJphRuBAC5EVmeRbht4J/qsiPlxXrcnZ6V6rb5Dj3TP6Ttj9wL7oSN1p/nFP+qPoqwCuVD
R3CF54lsjQl9xhYtWuGv+WSL0tM+aD/ATKrum3+8oojuKcLLgXVGNYY7yMU6LSFResKIQ4Jai
VZtplwAyuJF0NUvoFY0ru+DR+RdKivdeme8zgywq5SATR1OAL4/dW/i5B9SK1EmXRpnez2RAQ
33As1dSGBFiMzBjMiYVFnOYZC7vW5cQnI8YztIJebrkejM5mSrwyqLG2aa2a5pKaob5GgSelh
5sS84QM153XlhQKxvlcv73BAONZMihj7SHhxInoRKkejiQ5JA+EIEGVMB290u3PUcsXOq11u+
jNeNkQ8S2ygKmzLGsh3iQBblAZHlA2rXCdVyARPqHPpB5wq0MmqYzVldLUUjaqSk4dE9xpTMA
tmfdnCuugjrE9cgzeJ0JEYZX0Sq/lfcNjrUxMsUUITpi7CqSwdPmkXmfQ==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-css): New variable.
=2D--
gnu/packages/tree-sitter.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ac4fe5c578..05929a9062 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -181,3 +181,23 @@ library.")
(description
"This package provides a C++ grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-css
+ (package (inherit tree-sitter-c)
+ (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"))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:35 2021
Received: from localhost ([127.0.0.1]:54985 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJP-0000sA-0g
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:35 -0400
Received: from mout.gmx.net ([212.227.17.20]:33727)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJG-0000p2-8u
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465660;
bh=Bn/ZfJ1pMr7RtZSRK/RQa5qPa1DQ/pNKmpSA/pOMIsY=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=YOhQ2GA3zXfjvLsA0msfCD3W7AJtaA/rUlBS5ZoEANIp3zOmHjGhR7PZOjpcKMHNW
qbhvARzthkgTkY2pldeOUQy4uaFKt6qCKk2VjnBDufJ/s9rnYfi8jtN857kVTzz+u+
ruV4TWkrZ/Vv48/ssd4XaiiEBAL147u0P+Yu7cjc=
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
1MNKlu-1mSlWg1rZK-00Oogp; Mon, 09 Aug 2021 01:34:20 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 11/31] gnu: Add tree-sitter-c.
Date: Mon, 9 Aug 2021 00:33:34 +0100
Message-Id: <20210808233354.6745-11-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:DshNbg/inGyMHopiW2vQGA+kfKPDjgNZYevtXonudnoMNiu5R8R
9fKMN7EWLHqgYcIiQLMRnlsSNIuZE7SsPxUkAzZuvkJyh23Uj9W25S04oVSwfsIzS7y5+RO
5LEFx9D6d4KfRzJ8lQfMsLYfn3lrovA5UjnZkIsGADhekU8Bg+sVYEEpkFiLJStaJzVGvCY
7oxdwv1ngCpm0QZyaWU7Q==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:jkq+sfHkCz8=:5GfvNC9JI2ckVtnAk/gsQ8
z+CVW23doos62rcD1W4ulBDsPK35IwXIT6q4HwX86p/RYAZ328cT50HF5ZXw7Ssu3Pk5msvjS
PT1A/QtGtkzoxJiaBm02T/n2yIHtB9Ez1ieqfRqrkgTOG0HUozoPKS7z3UxmiBGxLrUiDK50E
sTOvmN66bveKU8cIOLaAKTQBaYyk2+l7BF1mbotAVlU66XqHLRCqBysOJrSKIY6YOJMim4ZeG
y4Heb7BPgjCBFg18SIhedVZA/5HToPDyMoU2t7eHkBhPLUJb/WnKbfysm8opgrwkyKgvsj0Ir
29XSc0vrWnO0vIxqle3HPmCxgYQqxuqaZyTtYAxWpR4itNv8HyWsGAwDSdsXgcXN2nGUvCIbZ
Nlvza3Mq6GkD5Kpdse5Ibl0a7Up6abY8zV9cpztu/5qSD3ne36zpvawK6R9W6xPtFrSVw1FpL
VCcV9Nxybhk6BDMnJMFC9rGbG38fA89NoXheGoLkCrrtAdSCd/eamqoEokBWEDKZluElhA16R
DuRYgFkPWl/eHzrUKje8TE/pobf2pteQvnjeTOcRWkie2y77XY/8qMNGzAIHyejURH6fh78rz
VNvLCl6+GuiPs0jbCHn6ypSZARbR1VyQ56EHCO50kydnpDf+rg9kLADzqMdxbI7CK4eC/KYW8
mts7xyv0rsNERm+rbNLzFGh9XwyTSLoMDLgZhLX19psEOhaTjRo9EyzC+7YvhzeC8FIpy7I/x
biVNc218CDhjHZyhnxWrx/f7Rs1BW1LjFpaOS/XekLvGw8HKV6iQit+7gbGChd0VS1tampJ2i
TxNThDKxCfiT7S9s0fxP3OzIiP3WX2aOV2rftXp62okWL4RKfDE5A6FOiogLheWNpaILwY06w
sZSuTL5bPB5sRx106cMzuZ/1BBRg8EDp6tathx5rNbYrHhXvnyLH3+E3QE+ACyELnDd2LyS/i
4DCa7pbxa9ZS/+QWFrIdpmDQRwroDBVy7fpobYW1DziRzw7SePGsUvhWDszZQfnvrA+TfI9go
9oPiz2UdQlCw+Ubqiggtr8WuLzqGnbnoEWnvwQ4VL6uuGMesfFHJJXKkEUkizF9QtCuqJa95t
oVm69xcTB1zJPEFE3iISgbdqzD8xhSFrERYItkFxmzO5ee6gzCb/ft1Yg==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-c): New variable.
=2D--
gnu/packages/tree-sitter.scm | 63 +++++++++++++++++++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 2c749dc0a8..c855cba347 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -19,10 +19,12 @@
(define-module (gnu packages tree-sitter)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system node)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages crates-io)
- #:use-module (gnu packages crates-graphics))
+ #:use-module (gnu packages crates-graphics)
+ #:use-module (gnu packages node-xyz))
(define-public tree-sitter
(package
@@ -96,3 +98,62 @@ can be embedded in any application.
This package includes the @command{tree-sitter} tool as well as the runti=
me
library.")
(license license:expat)))
+
+(define-public tree-sitter-c
+ (package
+ (name "tree-sitter-c")
+ (version "0.19.0")
+ (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
+ "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv"))))
+ (build-system node-build-system)
+ (native-inputs
+ `(("tree-sitter" ,tree-sitter)
+ ("node-nan" ,node-nan)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; tree-sitter-cli is listed as a Node.js dependency, however th=
e
+ ;; node tree-sitter-cli package is just a wrapper which download=
s a
+ ;; tree-sitter binary, see
+ ;; https://github.com/tree-sitter/tree-sitter/tree/master/cli/np=
m
+ ;; Instead we remove it as a dependency so that we can use our o=
wn
+ ;; tree-sitter package.
+ (add-after 'unpack 'fix-configure
+ (lambda _
+ (with-atomic-file-replacement "package.json"
+ (lambda (in out)
+ (use-modules ((guix build json)))
+ (let ((package-meta (read-json in)))
+ (assoc-remove! (assoc-ref package-meta "devDependencie=
s")
+ "tree-sitter-cli")
+ (write-json package-meta out))))))
+ (add-before 'build 'set-cc
+ (lambda _
+ (setenv "CC" "gcc")))
+ (add-before 'build 'make-files-writable
+ (lambda _
+ (for-each make-file-writable (find-files "src" ".*"))))
+ (add-after 'install 'install-native-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out")
+ "/lib/tree-sitter")))
+ ;; Invoking `tree-sitter test' loads the grammar which
+ ;; compiles it to a .so binary that we install.
+ (invoke "tree-sitter" "test")
+ (mkdir-p lib)
+ (copy-recursively (string-append (getenv "HOME")
+ "/.tree-sitter/bin")
+ lib)))))))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:35 2021
Received: from localhost ([127.0.0.1]:54983 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJO-0000s2-Mt
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:34 -0400
Received: from mout.gmx.net ([212.227.17.20]:35095)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJG-0000p3-Ix
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465661;
bh=hsfRwUms+uTCDezLaiQMRA0vx2JLWnI4idvu7kYTJlU=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=iDIc5D78BEjuF+KWBzCZLl8sn4VsahacBmDTZmKsCU2woAPJCm57q+XwDJBjYKuHk
HWBELUV4aACgg+C16nAOJQwCaCxhCh2Sum+fFjWTWrB0tBxuXUa2zsitHGbjVqtIlk
kBDses8MXJIfoPFGtP8gqbxiTZLre91zOrN91wzs=
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
1MLQxX-1mVEND3519-00IWEg; Mon, 09 Aug 2021 01:34:20 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 12/31] gnu: Add tree-sitter-cpp.
Date: Mon, 9 Aug 2021 00:33:35 +0100
Message-Id: <20210808233354.6745-12-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Ijk2fqy+wicWdgBzO7vWqfV70yGeJM9E5jk4EfC98p9GztBpXiX
NZViGOtoHSCN5eKmTiGhthRa3+iK6q+w76iiViKsXixeJCyENro3TBfn9wKyZoE6N+3CF9W
Gg4XJ/UmpW0QI9R8fZKqPYXgVYBEUj96APETGvg6VLCvbwZEdBzXI9kyFysSzbQrEJJxdQi
yqwMjXwQ4MRB8qh2Sx5LA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Wfn7NcJkY1k=:kJhCKDXlApStYV/Hp5WQ7Y
Q3lb73hfIQkBg5+sEujiIJGOLKy96SL8BuT3cP5PKFmRsa0OdhUJxo4ah1+6J04x6mtcwWMHm
0U0TC650/i/v8BTJYH1Gj8r/rfEotBnWrFRTBsf3hyFcwAxQJD6vk1UKuSl8fCjK1N7emUhEO
nNbZ8Q4bLvDybKpmT12wz0xU/zZg+EZD8hmrDANp2EH+gRRPdpJVkCqwgkV2dVpF7ywk/YkUV
QAe6wVnSKoYXDbiWlIUiYFW+RM05+WZXXcn4ToM2BCD26AxCbb40KQB6NrJy6Y0K94/mOnTvk
ZacO/Zo1uG7FWpHPxpOhW8092FrMyPc86PifMMK/tB8m9gAFHFs/p8fof7vIrEahyjhwCPqG4
XLrIekC7ECsUSV5A3WdoCTqGgbGEq91l/hng1vWV+h8jMsKQMKsEkT9G6jLNZv5bHZUFtDbgx
e4pf0WADSXbScjCvAPTswr0tK7WdKzQU4q3UeqziQ+fa67JwQIGu9daZ1xeD9/exoASx8BbN3
BXrao/uEE7/GHMkX3tXXo/ljgR6hZtYeJnrQPiV9zjpcinsSb53Izv93qQel8zkBMspI/N5z2
Cun+ruff5FZJE1s6UpRM4V6INYFRfgw7Q2axFw3JuD85JTeG1J0PrVp3UxBC45/Jvkp6gy1hq
H2cvacp6NUdjBtYOicNfAG92ru+nrGDdlpQggFoMWT3q6ONRMgQdsV3bdq9oE4y9mKgSLLQKf
HCT2MTwupMuj0tgwEKiUxXDeN/QihcKft2ZgZRaKC4vVlfxkkG3bjHye7YHgaKgdTem/pVyqU
VCJBU/U+obWBvVKwv0iLWrVRRaahPyrH4+VWEB+dBcyv3eGOEAtJSRrlNvn0Y564UEXkz+ldA
xs5mwI7zUP2LXOmkmfl38j0Ow8UjVBI0kTlEHbdhJXP2miCCJIXMD6PGAqnaGIFI86nGvGZu4
FFhLiBu8QLBTzITyLG+iXOdq5k9sCt0pbG91VpLNosnkElqCxKPza0S+ivRvapG7qEMGVoXW3
ZFIglsP5QsdZUXeq4u+/H4uJRtmzPKgvVr+zc8L0+GKkcgEhYuuolB2AndHHEQaxMS1oqFJW5
JG2iFV16udOjaMNurcaBsrh3wfe+S+Bm6CX4KsnB0VDd9SlMKPKtRceoA==
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.0 (-)
* gnu/packages/tree-sitter.scm (tree-sitter-cpp): 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 c855cba347..ac4fe5c578 100644
=2D-- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -157,3 +157,27 @@ library.")
(description
"This package provides a C grammar for the Tree-sitter library.")
(license license:expat)))
+
+(define-public tree-sitter-cpp
+ (package (inherit tree-sitter-c)
+ (name "tree-sitter-cpp")
+ (version "0.19.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
+ "08ywv6n80sa541rr08bqz4zyg7byvjcabp68lvxmcahjk8xzcgwk"))))
+ (native-inputs
+ `(("tree-sitter" ,tree-sitter)
+ ("tree-sitter-c" ,tree-sitter-c)
+ ("node-nan" ,node-nan)))
+ (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.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:34 2021
Received: from localhost ([127.0.0.1]:54981 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJO-0000rv-AV
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:34 -0400
Received: from mout.gmx.net ([212.227.17.20]:43419)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJG-0000p1-0t
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465660;
bh=h00xkQJgUXFPJ95URPrq+fzQXBggsdaz074TJ1WwMzw=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=R9l8zn8ScNY3Vzegro8tDTDBvPDoTSjJELfs7qNOTskttD3IY73XiEZjs2yh/K/8r
zg+flByIpJ+Ph8Dm1lugCLoNA7frcgrqMl0pUa3nIESkT/8905UdcsSGPYbQ50fNO/
JM00rTR9FeK6+IJui9Ga5eUnIyoXavoKyLF28aaE=
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
1N3bSt-1nDKYB0h99-010gk2; Mon, 09 Aug 2021 01:34:20 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 10/31] gnu: Add node-nan.
Date: Mon, 9 Aug 2021 00:33:33 +0100
Message-Id: <20210808233354.6745-10-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:IAHXCrYwTD03XDP7/7DLA76whVEyVYhnx257T2hZY5YQAvnlJuB
AMfuRJBvokiFeuycEr5NxHHbn0Uwrj0ZFm9N8O/wWqrvCPtm974tUk85lSgz4/2gg+cl4Hs
OJ69T1CS2jh7EBLKBuG8ZGtf0xLp6KlzKcvX0tPdSwoyYePwLHcosagn1sfgd8xf11EvscW
ogxJEkZ7m1UKovkvXD7LA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:hwTtky2/siE=:GKz1rXUZEqm2uJ85NUNo9Z
qnXUbJ1gMURml+kMIDk53OR0GcfuX3INNSfFN/AuvM3U7K4lmIYtp05GkIaF/nYi5R4lxq9o7
oKdSyXMWxcg+5DyGwD3TBV277oMShJFNl9wiwW3gYB6Z+sUTb2VqJzt1DS0QsC4kbd7horHeE
LF9rC4BzfmNy+nyFHsUmQ9riggxDAB7BMWwv+3m2oy7Mr6RTvKcgRqE5QiFbz5loZkuQYgJ+i
E+XUmO+7cf5S4SWVIuFO+V9wRAoTV3MFKUCex9VuB3nXE/rzn1SEKJv0zEcCxjpAxGzMZ3R7y
BvtFgDlU97hY5AgCRTz54klVhtvkPG0/eIO1vOBrYZhyQdOA8/T04LeiosuXj4o/znrCWb61D
FzzakCDIFZcwk8UK3QcU0n5RWheNIYG1DpH/65iPpAbbo8s4bYdwZnoZnrNzoPpBKCjTZACE2
sIALcb31rK0PfN57CbPMWWZiYOMRWqLlbWynRhW/sCRE1Pq+OLPXvxDYQq72HZvw/0uyWm9pO
qIOpcgNmoQ/fV0WKXLAldHf1JY3cQE88i9eoXDHZoU9an3Ga+XiNOeqCb0SSqi+rtGwc/SE6n
ReNK2erjkSJWIrFlmQbxlkkbTQixq9CMRbCz5H/WvjW28m3pGPQeVze3dSBNGcZPo8RezpH+j
abprKgkzQo05vJ1FSt9ZNUsnRInZuJIlF5/NV7rXVv8RE4ZXZt/9Ms1Mnrh/Z8uUj6uHcHKr/
Pz4otQmjIvREoASCwTROSsNeWxJpmSSgpf7xYy3NHuecbDjcIA2G4eWNB37dQ/DSjy7+FMs9f
2u0Ab1skoARMV2jONlZ21tiAayzSkjoC9Ho6PJqEMEHgf5KjbuTSiDTR8f9L9xkYVIgUSm+HS
CbHFB0ignpWmUmx4eEcoiwIogvvsfkEGqx3XxtKCWyfA78PhWlqYjyYin0d3IRWPSIltN3Yo4
Em7M5ECcZPflO49zoLs/0F4eIFaEwUbQkB6O5A1vyeMtqJD8UkYV+OoK1fLBd8T/fih3zKOdd
RQWzx6/P8k/4h+PSEZqSU4jWefGwivfMt2sOGSmaBOw/whzmXT/TbL+G2fQZo8swhVvP7eKcV
HEXxBNWuaodPJHY2nAEmZNsGp4ubUyxoN2CZUu4pdnMsUCuVUi8x24rjg==
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.0 (-)
=2D--
gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index cbb68f77d6..eb4b59d1ab 100644
=2D-- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -3,6 +3,7 @@
;;; Copyright =C2=A9 2020 Giacomo Leidi <goodoldpaul@HIDDEN>
;;; Copyright =C2=A9 2021 Noisytoot <noisytoot@HIDDEN>
;;; Copyright =C2=A9 2021 Charles <charles.b.jackson@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -171,6 +172,35 @@ user-land JavaScript.")
random number generator.")
(license license:bsd-3)))
+(define-public node-nan
+ (package
+ (name "node-nan")
+ (version "2.15.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nodejs/nan")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18xslh9va5ld872scrp5y4251ax9s3c6qh0lnl1200lpzbsxy7yd"))))
+ (build-system node-build-system)
+ (arguments
+ '(#:tests? #f ; FIXME: tests depend on node-tap
+ #:phases
+ (modify-phases %standard-phases
+ ;; The default configure phase fails due to tap being missing, a=
s we do
+ ;; not have tap packaged yet. It is used only for tests. This =
package
+ ;; still works as a dependency of node-glob and node-inflight.
+ (delete 'configure))))
+ (home-page "https://github.com/nodejs/nan")
+ (synopsis "Native Abstractions for Node.js")
+ (description "This package provides header files filled with macros a=
nd
+utilities for making add-on development for Node.js easier across version=
s.")
+ (license license:bsd-3)))
+
(define-public node-oop
;; No releases, last commit was February 2013.
(let ((commit "f9d87cda0958886955c14a0a716e57021ed295dc")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:34 2021
Received: from localhost ([127.0.0.1]:54979 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJN-0000ro-Rz
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:34 -0400
Received: from mout.gmx.net ([212.227.17.22]:47423)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJF-0000ox-55
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:26 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465659;
bh=kRbz6Vpf/V7l4+XEZ+ruIutM5jbgz2lSJZdniE5wKik=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=Y4p2hVd4AOy1OUSMPoLUjh40DcfGb3hf0AAXz0C/6HbdU6Yf/IQptovA9AubYPR7Z
HcEDEztW7Ot0W1N0YtO/ctYELxw2JA6Tj2glq70T36B+EHvFTnZlGd8FoH/FZiodCu
AG3jpRmHHVY8FwgvUjazdhlIMa44mbUd0wxQALz4=
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
1N0Fxf-1n1Hrg1Iu7-00xLEA; Mon, 09 Aug 2021 01:34:19 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 07/31] gnu: Add tree-sitter.
Date: Mon, 9 Aug 2021 00:33:30 +0100
Message-Id: <20210808233354.6745-7-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:4ga6ZpdNZHWP5NTgmmG+heLGpVqHBgCNeH1t2KkjPIsAtzJv5CE
7/mI0trw8hGs6IM6hZJ3om5zuIpR89tOxuVMasC0mXaa+hdYh4fvVytrYy7Ax+BKxKZ3OK6
yO+a8mvCYkioV608lyP5lsZxHFoixLR2KyEwc+KIOiZ4+E0rSXBFWIvQDOcoEyB65C3X/Or
OwIIQCxBuM/YmVjQXHHqA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:21j0w1KyVKA=:IF/h5CS6FXRIqZX+OuwR79
t2rC2tFlDHZgE1RW9Pur0yUBgvuyop6rh3vkW2vI16M7OWSEuoMqNBN6Cn+O/sNfu2kSBu5U4
TMNHxwDMfyAtV19TOj2gHk0TM80g4xXbEXPTRh84frhpGXXYyIPjaAyXS3PNqS1NJDS0H769u
qeqqLImExRiBZAfnWhJ/gWHd1gT0j9/NaRQ6rlfpGPhTq9vsoKZI4wnPM30gfqeVos5y8fqVz
ZnKjcrWxi+jqBh0DlEcLZ/Id/DOqU1k2q8Mvk2Mw0jYTmTcf9M5a6OHGAWCRHOFtT2m/ZfAOp
BEnSi4tn50AiD85+63kiLIkjJr6SCGpG2/4IBp64ZwYF/a0+NE+g/h7YRYBYUGCQfnP4n8GAy
vC8O+xErWxLjW8v8ub8rA5RFQWIQn2NcPW9QGTHsfkr6VZBP4UyEV2pY4NPNwjN4mVZwWWAoD
vb7xWSS+zrXaMM0eAn/NaJOu4K2JW8vDYr+oPh0EL8+b/deKyL0JuEP56/iLXmMO/BY0Emyxs
zqk8Y8uVpXU8ASv0sNAU21ikL9ZThiIybLShK3bIEXR4yRIoKhGjM8EDiaAL9H7F7b0r0uaPm
Y9MORJ2KCV8ku61/CkFeDeT9U/7bgu8ylSbPFpIwyXiia7ZNLHsbmYkyjO+FwzV0By28SSQkP
SlBVZYmfSPANTnOevdULbpBVp3MfIFY4bMpuXc27SVVJ6VJUci1DmXq4ragAPNVEJEIKwD3aw
6CZOCqho+9gUJ0pxMLm/ZzRtnwo+f0OHzpBJo2GJ0s8+ZALHSiEFE9fp+yai2ZeoW8LlZLhr0
DoS/0RSPyrTm5bgUWxOD2Tkfdw/95/r+0wVRoE4xP+i7aBTlwVU+5zALNdvpZwHaehIVdco/w
6hAdt04S8kWjgi218nmmUrJ2nfOhIaMrx/LrVaC7uw4mp77Hv+xSvOuwmEekxvSfVH4ERnewF
/yJmMeqVS8mfCqEy3xDQhtXPa4hyScfy2Fus1ogSnQ7wDgHJUzmNsaDigWDQgw/LASgn8C7x/
pANuP1yblCXYX1jC+fSUIoeQokTCBFFJObxrBHMEtNLncXVk56oCFAkMXky3mqR02Q6taoYRY
4e9wscJJJ+9xZ7jYm+JvcdEDN7a50BxIoG3ln/n6hhp1ADS97CuHVY/4Q==
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.0 (-)
* gnu/packages/tree-sitter.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register it.
=2D--
gnu/local.mk | 1 +
gnu/packages/tree-sitter.scm | 98 ++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+)
create mode 100644 gnu/packages/tree-sitter.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 3f09b167b1..3763df0821 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -559,6 +559,7 @@ GNU_SYSTEM_MODULES =3D \
%D%/packages/tls.scm \
%D%/packages/tmux.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/tree-sitter.scm b/gnu/packages/tree-sitter.scm
new file mode 100644
index 0000000000..2c749dc0a8
=2D-- /dev/null
+++ b/gnu/packages/tree-sitter.scm
@@ -0,0 +1,98 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2021 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 licenses) #:prefix license:)
+ #:use-module (guix build-system cargo)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (gnu packages crates-io)
+ #:use-module (gnu packages crates-graphics))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.19.5")
+ (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
+ "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(;; Running test requires downloading fixtures, see the
+ ;; script/fetch-fixtures script.
+ #:tests? #f
+ ;; FIXME: Installing the sources for the tree-sitter Rust bindings
+ ;; doesn't work out of the box due to tree-sitter having multiple
+ ;; Rust packages in the same repository (bindings and CLI).
+ #:install-source? #f
+ #:cargo-inputs
+ (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("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-smallbitvec" ,rust-smallbitvec-2)
+ ("rust-spin" ,rust-spin-0.7)
+ ("rust-tiny-http" ,rust-tiny-http-0.8)
+ ("rust-walkdir" ,rust-walkdir-2)
+ ("rust-webbrowser" ,rust-webbrowser-0.5)
+ ("rust-which" ,rust-which-4))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-cargo.lock
+ (lambda _ (delete-file "Cargo.lock")))
+ (add-after 'build 'build-lib
+ (lambda _ (invoke "make")))
+ (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)
+ (setenv "PREFIX" out)
+ (invoke "make" "install")))))))
+ (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 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} tool as well as the runti=
me
+library.")
+ (license license:expat)))
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:33 2021
Received: from localhost ([127.0.0.1]:54977 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJN-0000rg-Is
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:33 -0400
Received: from mout.gmx.net ([212.227.17.22]:46273)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJF-0000oy-F4
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:26 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465659;
bh=nUN5Xy8hb9P2/6RyAThAnJXvyHKtJABwHxEH3sIcKrA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=LKRfO4WeaFa1+f2LBIvvjdbi2wt7AD+9fRXKp+f2Erlg3cQgVoGiMo/D6DWG0XU3p
dxYfl+pRPLFdRsP5p7oY7XFfAWyTD4LmJakZxv3JfY0mkpB3iNythdRTAcRQmQfmNc
nwk9yK/ToZ6yh4FxVTOcW7sw5D21xOAc1EzGIBlU=
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
1MGyxX-1mI5E02VNr-00E4EA; Mon, 09 Aug 2021 01:34:19 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 08/31] gnu: node: Patch /usr/bin/env in node-gyp.
Date: Mon, 9 Aug 2021 00:33:31 +0100
Message-Id: <20210808233354.6745-8-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Jpd5kOwLsqpT0Ebl+jL6RkGQ8SMCMo8tZDY/IwDAQNPmaPkaYEp
zN6vkH0r6ovGBOyey1V4cZrGpr9NzEnuxGyxEkQyw+QxgMN2eGFdBR8D5VN+D/syk491WYY
J5jcSTMmPF4z7725msxW3t/voogZQ96tbF1RTsJcBNTNtl0iRPxrikQNu1lqRZCzPvmCoI4
Ok7zlK93G/a58u+0o0EAQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:NcgmcmebuD4=:g9SFUg4BdLsIcn9devK29v
ZpaqV32ohEpFBqFtMzdj7TuJubSfGib5fSFV4+XNByvVxkzg5tNM7QXIyRKu9hul+V3/WpfnH
YEp0MT9dstam3RMx5H1B2SSMn3QnyaTngA4w20gdYX6hwfB9RRhges94M48avXHSdcrROivr3
Cop4993kc73BXpKqFpKkhNb/Sjqij7tLehnJYVTlNf59aLwNOhLMnA+FN0SGb7SVDGhojR1uD
KEVSRbWPUqRd2D8sGjxB3DtDhtCgOk21khCtqyr0phNbVYQsKovlsqb0eUCl6s3mOO19kujBX
JaVXkuOaZIDpVj9/DEEKPd7kxSo4usainj042ddLCzwAzHZboCtVEzECk7oTQAL+16TQu57g0
lX4tpR3nt/y9mObCUTbtuUFOuf6d/9PgrEA3oQPFVGKDR/RVFj689wyJuZkDE65MmOo4LX1br
k0mtXZ1IaJZ7PBwEeWkeBkuPpmzlRZfHEMAmxU301n7PsB/SKAca/D2VY4emqR2J61C+1Lq/4
surZBY9kyOyg0YRtvaf2sBf6n6Ik4hsuhEqbu6wVg3vwliB0ob5THHrUIBLfXpMx572zVGCcy
NL6LnQ/s4MZzXasVzFH1/O6tZL/T7dt6csENiZFFjSsDy7L7wkL+cSEeDIPsdQZQZ7P9Rh4a+
PUsYkkXrBU8MsV0G8iMuhmNH7I6/T8SlavgvYiHyhBEPmAfRwP4rLb7RETfRCMXjtmLsecjHg
p4pza8TPFGZDYpZHy3w4ERfgtP67+gF3WyFRebH43vLjXZ1r/Qyo3h5+54bATk5xB4cZsHZfc
C05wws/Y9Cy6AYRAmp44rVfRWmyo1sj0W1dDbKJ68BBvLrSh3NcPK9FiT9LNMdGaDCmR018e0
+OJpj1yHtNIYMG458fjKZB1zUvXRx8bHXyDepBY9Dr7spqt/+lOu0yYvwJidSZhjRv/7cRHq5
cSXhDeIlOfwTva/fJKvjNEV+zKZMGFHXKUfzgOENhQC2XS2F9Wk576kGrwk+/l5QAMGoGC26n
knfwIXakWnqT7Qu0LG7cgaIMmk/uAZXwW/sQFO2BXtJNYJ+97wW62puotpA6oNYB6iSWuKPrB
6sxUw6IhDWy9rUr+BK8Mf4UH0PjZ/VEU2e4LvUVO1CPZS3Th842t3V+Aw==
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.0 (-)
* gnu/packages/node.scm (node)[arguments]: Fix /usr/bin/env shebang in
node-gyp.js.
(node-lts)[arguments]: Ditto.
=2D--
gnu/packages/node.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 36c45e9c7a..522d4943d0 100644
=2D-- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -6,7 +6,7 @@
;;; Copyright =C2=A9 2017 Mike Gerwitz <mtg@HIDDEN>
;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice <me@HIDDEN>
;;; Copyright =C2=A9 2018, 2019, 2020, 2021 Marius Bakke <marius@HIDDEN>
-;;; Copyright =C2=A9 2020 Pierre Langlois <pierre.langlois@HIDDEN>
+;;; Copyright =C2=A9 2020, 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;; Copyright =C2=A9 2020 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright =C2=A9 2021 Simon Tournier <zimon.toutoune@HIDDEN>
;;;
@@ -120,6 +120,10 @@
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
+ ;; Fix /usr/bin/env shebang in node-gyp.
+ (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.js=
"
+ (("#!/usr/bin/env") (string-append "#!" (which "env"))))
+
;; FIXME: These tests fail in the build container, but they =
don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
@@ -661,6 +665,10 @@ source files.")
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
+ ;; Fix /usr/bin/env shebang in node-gyp.
+ (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.=
js"
+ (("#!/usr/bin/env") (string-append "#!" (which "env"))))
+
;; FIXME: These tests fail in the build container, but the=
y don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:33 2021
Received: from localhost ([127.0.0.1]:54975 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJN-0000rZ-AS
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:33 -0400
Received: from mout.gmx.net ([212.227.17.22]:49181)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000ou-Kt
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465658;
bh=9ZiAtbml8UWjM8kAYQ3SKzZSwm87AD3px4MCoBAJqq0=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=G+Jll8l7ir0JOIeGWrFI0hA+vrpg2huhQ9zW6ogN83ak9iAhMP87IMw0lyZuKRoeT
WKl/HHtbIGo+SSauPZvirodNBUuvRAMh+9dK18peWafnWk3i4PvfxE4a7Ky4AFzNoo
LDesVNqh13vQVo/UHY5w79YEGf/gwo6OsSpdqzxY=
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
1MStCY-1mh18O1vAc-00UN7r; Mon, 09 Aug 2021 01:34:18 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 04/31] gnu: Add rust-smallbitvec.
Date: Mon, 9 Aug 2021 00:33:27 +0100
Message-Id: <20210808233354.6745-4-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:9p+Af32bsRdciH5mtGKlVfdmrS3LxhtEpAWa8CMJZ9zS2JJhs1k
pu0SQANjmTjt9WZvXJvIpNycJcnQD3x08/79kK2VL5mkehxOVGUNTdVKe7H+2ZRhWeNle3b
HrtPx5Ro8B2XwM+YkZS6CscBsewdu3YBYLEPJutQz9d6EJIREahzRxtxA88ub7RmlP2QY3P
7s8Xot52KuStF/1tmEAjQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ypjtHdzATBM=:PkEiVRynCfYlbQW2a5QLeR
RGp6cV6Rzvz1VxIj+Wp95zSFnt1XTShddtdyEYk7BnfOMC1uI+8s+l2xHjQBv9hgnyuwKGDu1
bhGf3htOMfL6C8u2o9p5hOF89xYcEMyZySNDUtd0VuaAoa164hqIXIUrdFkWnHpCCfHDFMDhz
At3DySx0u5ac2Pp8Y6j8jjMQBo+aX2/Wt7GkOCLSGkxqVa+2d3iQ52nOCQJay8Z/SqHLehPxi
MU8F3xMIiO6aNiOKgC6FW8jXByIGmtyhc9XkGcoHN/nJBL1G50xCn5Y2tHZntazeTjb3vtLft
/isrUmib9fP8HC7ZsZqtrZTC9Rukc9WbUyQZ5jbcYdr+mHZmGSzQIwZ0IWa8UpOJYDADn5s0w
MzB0/IdN240iBOr7uC8ZDLSPJDY1XweD87RqysQnA0Swg0YJG67xoC++Av3Di6YepxVk0pf2R
t/UfEktnQizjb1LkI3h00TxaCtN+wgFZvdYt3prtH3SJv0y/kLab7lJrpSHcbWUdc/02QC07N
AND1HypSIK5pCW19YcQMqEOkPh1+fDhRYcLTBbN2yymIB/LyNR1LNKu494vjg4zntNuOqgobL
UXNSRznFWi+Xan5v7jqvPsTVwlIc+vE3KyzM0vhsSWh8nVrcaExP1p3OVaLLN8c5V1mZ3Bl07
PxbpAovW2kfNdY38TtyFENd9JVEf6LeJFdvUoZ47XAyDMrOkQC/Vfa4eHCIgnhjazaJ9paO9e
8W/P9op5O7M/E7GaNw6APaYUB3W13ElkC+5iJwNvEY0rxSiVBVHZrq8x17ziiNECAJpJ3QlJ0
XR2q1raWBtGFZlhgsLI8LDAwb4UwhkZr5SnLxUlazYb9KU6gdnYYv3YVkodDP1ZUzWfzSRdIC
/ToJxemewV00Ic+jqg6EHCWDaxCLTV7MmyqFDwY0mbjYKG+vSVXaGSQm1XPGNELlgeXhQIgVh
NNX6JKDWS96/9/osJarOawUDqq/SzjOdTCR7YoHW1CTR98z2W0WbyQyjMtrUAxu2nS5MCmk0j
rPq3EsLiGZnHbL1AWUjmhBiM7zZNvHggbaYebUXuXj0BqZjbcfULbaY3A1OJYjzNgEsX2ELjf
jYci+AW5i6RB93P4F+BA5R2pVH5tARxtvOLCqzofO6HTYFdAqginw5HSA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable.
=2D--
gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4a9db4943b..2274e4f12b 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44087,6 +44087,29 @@ I/O programming.")
("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
("rust-futures-io-preview" ,rust-futures-io-preview-0.3))))))
+(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 "A bit vector optimized for size and inline storage")
+ (description "This package provides a bit vector optimized for size a=
nd
+inline storage")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:33 2021
Received: from localhost ([127.0.0.1]:54973 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJN-0000rS-16
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:33 -0400
Received: from mout.gmx.net ([212.227.17.20]:40137)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000ow-RD
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465659;
bh=B0ctYYpX6EyzHe8VLSJjst1os0DnjH+DETIGQZqrwVQ=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=c3Vk74XnmUPFm8pTi1EKWhlooV0KqP803yMI3ZjOsK+QND78/i4X6PwLRzVCnhpAB
dknup2GXnZJP6EVfqhzfSYUAfKuw7wPkFkwcLLIGC+DBBWFGVn7HJq5fZAUX1sl/yE
n1O90l0RKXjKysGgizpAA6fW6ZuXIFmCbk/qnl9w=
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-1mDylr08G4-0018Cv; Mon, 09 Aug 2021 01:34:19 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 06/31] gnu: rust-spin: Update to 0.7.
Date: Mon, 9 Aug 2021 00:33:29 +0100
Message-Id: <20210808233354.6745-6-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Emze/rH6n8h8LbeCwtVD6vw195PsEAkk5thA9Lrq9tmwxXZRwVo
iTCOYYOCL++u4hkP3D4af3ZkIlUYmiGGNVL8QEZVzmLBjNWy2Xl25kzDvklL2xnKBdzZlFR
+pbGcWXRu57HvPkRGrc6LBLhAb0Ob5jd/kJowv//m8fAIUG6MzdwIo1XUJgiy7GMexXLQ6r
7S9SDyDe6+4oXg67E5WrQ==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:Sf6Y3lCdmQ4=:QCqm9ZcLjq7NGgdTg3tKWo
DDosEPtYeSoXxCAPPmrJCxFsH8LRKik961Gcwxv/70pjHtA+jNe4rnUGM9nEhxIdg87MRxkne
rUgOtsU6Yq6/x9PDXx2NUie4/Dmg6rwBGqbcfyVx8C3vqRiTg4T1nJ/pMFgRXp3xFTv1E3njo
UTMWb6paLxmkDe+tTqV+0g7IW+SGjEY1ut7Mp5/6f0c0G83xtmgatvouy0G0okqYyrOliUmEp
Gy8mtb2LZ+2frUlzg5yYOQZLc+cSM7tMEuDZ+NoX70Af1DguIWhBoIcQ8BxR5AVV0NCITveEy
7ilDdNqZc57UEpjT/7JsoOUn3yIo69cjbuZWggU4V1cKkWxOVDl2T7jsN5DzPDyO4HSE2h1Ng
ClIr5r2U+x6BhzH8ZufenE+pVtfG4A80q2aKRWF27OJ06e0INnwP1MFi1qu5BqSB/otLEOdUX
I5tjalgiuluck9DRrWCVD5uZjZONBKdfAgDew64aflvCFYpEwKl3XrUTYMRIGEdaE91YK+TZm
KzN4B5g1o/PJzduahUFW2XkdaO2un3eXMIOQnupDv/OQwuaJS+sdxdwccHkCX5EczFfrFUFxb
y8K58TR9GkKnjbyBOm1EqA+Vbg/K8VS1evKXlsOREN/Tbgx9BEp3fizP3B8irfgOy9ijoEL+c
0F/cya0Q9XuCY1uH5hPqNQR6IvUq7p5QKHWjT8CG88irBc5DOj47zu2Ls4yb9YYka/TMNR8eC
8DD2TecuQHSAjVHDlRWJqW0xjpgsSDcrm8mh5n2qVDLYkpjfZdmHLPnLd4LNGfmOribfJ2QR6
vGGu+xLO/EJS0mFJHwEALMpKa+ELFJojhMqF1pgNdF5WHR1x+8AGVu7T0aVNsC3iWmTQ6tz6n
X9b1EYrl095YLRwJDc2aBjvwEkb541puYIAvOWUCDAuC7tWqvhRDJfULueeqHW1Dof6TmG169
p1URARHwPwcrSmNohXFRBfpcxDDOIXSZI2gW6Dp5lP74XRkkGGtxyQHgnTiUzMClZZZMoTpTP
oRGjFjjzmcjiabu2Ne3SfCKBNiB9X1aQ87Jb0/AjKk7nTILvyVJkKqBlIOYGNDzlTmxtpVdDt
02RBw2fOJeaTrlyf+bRhpxUYZT+TEDfNjmnHnWu+UtYPVYontmQScjfpA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-spin-0.7): New variable.
(rust-spin-0.5): Inherit from rust-spin-0.7.
=2D--
gnu/packages/crates-io.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb31356ceb..b551e6921d 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44496,10 +44496,10 @@ track of where each new file and line starts.")
"An RSpec inspired minimal testing framework for Rust.")
(license license:expat)))
-(define-public rust-spin-0.5
+(define-public rust-spin-0.7
(package
(name "rust-spin")
- (version "0.5.2")
+ (version "0.7.1")
(source
(origin
(method url-fetch)
@@ -44507,8 +44507,11 @@ track of where each new file and line starts.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf"))))
+ "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lock-api" ,rust-lock-api-0.4))))
(home-page "https://github.com/mvdnes/spin-rs")
(synopsis "Synchronization primitives based on spinning")
(description "This crate provides synchronization primitives based on
@@ -44516,6 +44519,21 @@ spinning. They may contain data, are usable with=
out @code{std},and static
initializers are available.")
(license license:expat)))
+(define-public rust-spin-0.5
+ (package
+ (inherit rust-spin-0.7)
+ (name "rust-spin")
+ (version "0.5.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "spin" version))
+ (file-name (string-append name "-" version ".crate"))
+ (sha256
+ (base32
+ "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf"))))
+ (arguments '(#:cargo-inputs ()))))
+
(define-public rust-spin-0.4
(package
(inherit rust-spin-0.5)
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:33 2021
Received: from localhost ([127.0.0.1]:54971 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJM-0000rQ-P5
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:32 -0400
Received: from mout.gmx.net ([212.227.17.20]:38897)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000ov-NI
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465659;
bh=JzllOfLGkM2gVC6HTAC+2SUBEXV6xGug/L++Xd9u9aA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=fjq80hhEDvPxhMVW2rI/i6QDTC4JQVpHlTH493FvGUIyRH57Z/C1RHosjf2IR7waH
LATX5emdMb2nV5fZYMVHA6r/ZiRYrlzUS2Trll2zm/NvkGVsBJseKgR/eZvNHmuyo+
JbX7SyTjFFgF9OLFQdOU4bVe+iayyi0hk9OHTmjU=
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
1MGQj7-1mKpJX379B-00Goa0; Mon, 09 Aug 2021 01:34:18 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 05/31] gnu: rust-tiny-http: Update to 0.8.
Date: Mon, 9 Aug 2021 00:33:28 +0100
Message-Id: <20210808233354.6745-5-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:innWTeLhnpGlPJcFilODscRMiwiTlQ5Fw/87k/4WiMF3MInHR3g
WMjAy7CTdiZCU/QIXZwJSGMtnzRVNpcGhgUw+9pADSLIFSi9T/CdZbZPnIApIzajRIYGooR
tfP5dzSFK3w578a6uxy6FvaYSbRnNRO/LS9FnTYM14bx/++u7mC12ed8ZlCxXqbPO1VqR+1
AbDYYqImDOTDaUvh+6FmA==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:HgVCP7WsAOI=:nrJ0C3RyisDWTyZ/6LPTFb
AuEMW1A+IOWffiK4oEJfrhrnVXF0E68+56zOPT5oU3UFactewyzvScZaRJD8daDYLJ8EReEsl
Krw5v5YKxp9KGl80ttc5WNllJFSao5IYQeR7FCNpnK34tjpVgcy8PGBQdWzD8BanyyJ1JLkEP
bH/oqt0y2T9ID9iAIE8tIK/0p/NUMTs0XVi7NELpJD8cizwFmnXu2WzaaX0C6zLcjyJYQGzNo
FknRwe3yQGOwMBJpYh+LDog+wd1xZx5TjASRit4cTNXzGvr0XTuZVxaRHyUU4yLlHJoUYm6MA
opl5RaF9kLRtbiPoS8bZbLTs04eeN5LYBIhEfmtgLsHZ1ZslKYUrifoQ/gTdSjsi4i5MzP+ND
bmHuiPzV+V25BqEhsaTuD9hJGb2QBCXeaet9ElVE3K1Vov7ybZIDmam4qg+ZL4bgzINwYKeEY
qejS+w9WCAsyPeBz/ZmbWvcyc8B0zWDmnfnD8jYI23NuLMLvGfhlfdLmlGSYWUy5YiMMPYkMA
aptyU5JvLLQ+IP1i1AoJeb/eT8XVbLO+T5ym1FXdK23dszZL9TT3bSHHmAH+cVrg4AJwqS7Nd
q3nGEf12OjUa6TbClYkiF/3njTia9dT/j0eMBpKzHPiXYXr0hlO3qqAgWChlV7sg0liVYUHpU
CAQ5Hlfiha0JT7gBP/zh7r4HyikoPzqxGYnjUYd9SjtpsMJ9MZXjOJoLHVM6h33X/PuZaeM60
tvYlgXtd4kqx8r6NBprBFJ6oruTIgjw1V2zRvgt41buiUckPsKA8hbNzaHkatYhEIK0Ow7/04
FtrvUQDVp5+tg00pTrs5gdCAjkaNEQsw8C8GvHyrcDtfH1+qLymQ5CUnxZY2A6/6+7KpvHq+8
KZRyc0x7dgQ+B8OE1gnVhvDrIiNz6rY89Vx9bf8B7ZlzWvKHJXAyuk8a1ao6P2/vwYTnGAfLb
lZu19t/2DvCJxEAE7SrWWN0wsyJBvMM5i68qHn9z5PSb2Abl0T7xAssGF2RADaJA00Slr3ODO
C8wAJqBo1odyOUidiotJHb7qUFnAYZGaDLpZnLoFwYm90mPRI8ygHhc6fG40BARx7FCRKt8dA
JnkkGYIXvt0hBsnOREfqaFQXqKX6+PQ8gYId9VDsSunmMU9AQaqUi89Eg==
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.0 (-)
* gnu/packages/crates-io.scm (rust-tiny-http-0.8): New variable.
(rust-tiny-http-0.6): Inherit from rust-tiny-http-0.8.
=2D--
gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2274e4f12b..bb31356ceb 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48810,8 +48810,39 @@ closures after a delay or at a given timestamp.")
manipulation in Rust.")
(license license:expat)))
-(define-public rust-tiny-http-0.6
+(define-public rust-tiny-http-0.8
(package
+ (name "rust-tiny-http")
+ (version "0.8.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tiny_http" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fcdwpb2ghk671qjjrk6048hs3yp7f681hxpr68gamk00181prcw"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ascii" ,rust-ascii-1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-chunked-transfer" ,rust-chunked-transfer-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-url" ,rust-url-2))
+ #:cargo-development-inputs
+ (("rust-fdlimit" ,rust-fdlimit-0.1)
+ ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+ ("rust-sha1" ,rust-sha1-0.6))))
+ (home-page "https://github.com/tiny-http/tiny-http")
+ (synopsis "Low level HTTP server library")
+ (description "This package provides a low level HTTP server library."=
)
+ (license license:asl2.0)))
+
+(define-public rust-tiny-http-0.6
+ (package (inherit rust-tiny-http-0.8)
(name "rust-tiny-http")
(version "0.6.2")
(source
@@ -48830,11 +48861,7 @@ manipulation in Rust.")
("rust-chunked-transfer" ,rust-chunked-transfer-0.3)
("rust-log" ,rust-log-0.4)
("rust-openssl" ,rust-openssl-0.10)
- ("rust-url" ,rust-url-1))))
- (home-page "https://github.com/tiny-http/tiny-http")
- (synopsis "Low level HTTP server library")
- (description "This package provides a low level HTTP server library."=
)
- (license license:asl2.0)))
+ ("rust-url" ,rust-url-1))))))
(define-public rust-tiny-keccak-2
(package
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:28 2021
Received: from localhost ([127.0.0.1]:54962 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJH-0000qG-B9
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:28 -0400
Received: from mout.gmx.net ([212.227.17.20]:52503)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000oq-1B
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465657;
bh=xM71tzaJBd1d1E2jq4sOV9Yd7mvHQfCzJcpz6HspSog=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=i0ioI3M7H8zy9qncM40c1JqlOKY9Y1idLzZbDLGTsIc68ukuqp+LwcdNPistxbs2C
+l4HJV27+iDoA1eCA8dDJmJv0aWP7sWXUDLKWX2dU1MbgqWJnZ70C8XVcy5beCwM1V
Qrr3f9s8fGwtGTKftoYTizV2EIArKm6hoEWIyUT8=
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
1N33ET-1nG4dY2UMn-013R5s; Mon, 09 Aug 2021 01:34:17 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 01/31] gnu: rust-chunked-transfer: Update to 1.4.0.
Date: Mon, 9 Aug 2021 00:33:24 +0100
Message-Id: <20210808233354.6745-1-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <87h7fztt60.fsf@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:ch0HFm9psOVZx7MuIwLghc+Rop7H/reTEDQVYsdh3S5MIrRVtDp
ix6J6/IBVA3zGwwvqEwEbQL1e6iMitz3R5EMe/Oz2EYvRXHCMwsSR828/yNNKUeq2yhQYwE
6tSmhXd43MZ9MonfXCIORIKRYAvh5x7iwKcazE6fw3YdMqHIrOeVIXMUcyc/sHIePSwq1xl
fBTHn3YUmUthBPdwUla6g==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:+8u7rzOzPTg=:l3t4XG27+zgZyrgK4bkg5D
WI4UYby+xYrxM0drBSBtbFEjNJi1LnJPOlsWBB+KPRNdXAHnEwnV0I001K8zElRIGZfjw39Qm
S1SwX4mqhx6LkO9f//Oh/1QA5i2mx5pNfykMvFt5rH+hVOWVjFC26UNPS4/qWau0HwpdkQFuo
5bc7Y+WRaZd5nayK34Y0In6FJXRTKjTb53AIGWMY2kYwjFIG2c9AUvcnSdhOWH5PkuL5EoWEs
DACR8mpQtFz8hiWqb2x00+pQmQK33+IhUgfMJjr9g0z6SrZKPXgyldCHgOK+hfHz7CoSQM1mr
eoLaYTjyUEOnOLaumjRL/ruec0l5nYxTp4E4J1Aw/yuw3pClMw2twPEaJq9nD6ibSXUDTygRT
f9lrxevJJDovzAHXnnJTq+RcbKJr2yfieIA38XginKd9+p3/FxOOX02sNTgWJSC0f0EbTYP5z
/YWtImEgrHz/ZrgZzfkNSKU42/yrai3RmgexLYKK/7VHDkjMuFnlz6z1mJ5l3wxJCx83R3hI+
snaI/yutaho3oxOGXESRQGGksKKvpiPhWmJO5P3OPhqelpTRRjs4eJTYwwPaW4CjovTHc6PDN
K8e91KEENkm2r2F7FsrQPTBD70ZJLvo/YTcDyxqMbS62JD1v8UBNtlin9G0Fgxy3Khaa5jdhM
vxuoreD4B8Na/pbahCZ1tidDhVWiTyOQz4yE+7ZXMn6CCtqQMvQZ1st8hW6WaUoN3TiMsHufJ
qdNJeHP5+U99NhBp1NdvRs/HCx9jPoI1pzcAWp0IxJVVcthElvK+oOk3mk+pxcY/RXGp0Zrf0
41RYJ/pYLLBt+FjjZhQm8Ld8xGG8moHlZv5xB2jUjOJeHV5NQwyXpyTxk2qsBLnYGOoEj0hq2
7qxvrRjjm4pPDGUyvk3p3BukTGRoUarTIOaXzV7o8QlmO9zRGg3K3f2TNx1zs48ihC95YhZnC
5GDDb+nx1lUP38HYFy1VlcrtHkzaCwTq01ldYkdj+A6Xnlk3LU0RFusMICCC1DL05Dps112e3
owAF2T6q1lpaKdWQeQpEL8bRneM0nkjjKkjf/LLnVOhJ3BexRAId84khtWziiO5gph9lXZ4Go
4a4KwohRs1wRFGOcd9vP5Gc3+D/LcKGh5tZrjsCdVi+48V2MZt6x1RDdA==
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.0 (-)
* gnu/packages/crates-io.scm (rust-chunked-transfer-1): New variable.
(rust-chunked-transfer-0.3): Inherit from rust-chunked-transfer-1.
=2D--
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 24cc772ba7..01a0dff724 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18,6 +18,7 @@
;;; Copyright =C2=A9 2021 Antero Mejr <antero@HIDDEN>
;;; Copyright =C2=A9 2021 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright =C2=A9 2021 Vinicius Monego <monego@HIDDEN>
+;;; Copyright =C2=A9 2021 Pierre Langlois <pierre.langlois@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -7825,19 +7826,21 @@ Python arrow.humanize.")
TimeZone trait for @code{rust-chrono}.")
(license (list license:expat license:asl2.0))))
-(define-public rust-chunked-transfer-0.3
+(define-public rust-chunked-transfer-1
(package
(name "rust-chunked-transfer")
- (version "0.3.1")
+ (version "1.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "chunked_transfer" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))=
)
+ (base32 "0bkdlsrszfcscw3j6yhs7kj6jbp8id47jjk6h9k58px47na5gy7z")))=
)
(build-system cargo-build-system)
- (arguments `(#:skip-build? #t))
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3))))
(home-page "https://github.com/frewsxcv/rust-chunked-transfer")
(synopsis "Encoder and decoder for HTTP chunked transfer coding")
(description
@@ -7845,6 +7848,19 @@ TimeZone trait for @code{rust-chrono}.")
coding.")
(license license:asl2.0)))
+(define-public rust-chunked-transfer-0.3
+ (package (inherit rust-chunked-transfer-1)
+ (name "rust-chunked-transfer")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "chunked_transfer" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))=
)
+ (arguments `(#:skip-build? #t))))
+
(define-public rust-ci-info-0.3
(package
(name "rust-ci-info")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:27 2021
Received: from localhost ([127.0.0.1]:54957 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJG-0000pt-BH
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:27 -0400
Received: from mout.gmx.net ([212.227.17.21]:40877)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000os-2g
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465658;
bh=bmN1Hl2Un2Uy3g33zfU8rK3SvJJHoGJ88ZW0uB0vb+o=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=EOuV2lwAukG4feiduhL7K/cydHrUjTEwq7rP9TK1pv5SHZ9bF4rC7TapZUSPRot17
0cJTmUmEo8eh6tzc9mQh4pfMM40wli/GZPScKGzAU2dmf2ityrBJyvjmQILj8eAeZ/
9H1jrMO41IzNkS5sOjD67mMlBxqGL584r36uaRf0=
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
1N8GQy-1n87cA0hLk-014FNF; Mon, 09 Aug 2021 01:34:18 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 03/31] gnu: Add rust-html-escape.
Date: Mon, 9 Aug 2021 00:33:26 +0100
Message-Id: <20210808233354.6745-3-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:YDJFuHkBBpJoKviUnEviaPhtae4TK/SwRTwLNuNHvVysD2vCIxW
fjn05aKOb1ylflaGML8PPmhGyOtywRelFi2Q05uAVQZE7tU2MxqaUlLlIpKE7F0hXsOFg4N
zBYFgbTFHR0vy4kuXcAJ5yvNlvBcoGrQWIk3aYA02Pet/cK6PfWaYxZc3205wA3kvQfYMsU
LR8GLNDWAy3Wv1zDS1bJg==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:ocSUfdLxnCs=:UsXAXmFFREDtC2in72I2kc
GAl7hcjAntwvUMHOgCMESqDjFrV7ZmKvni4zkt7QomzNXnaLl5D9EtwllFDinRyGWDf7gqAfO
9AhxuO2hXudKQ84xfTdT8fGF6TiSd61chDOpqjYNKGrx6i199EwpyLPBtDzd0gPHxBOYe3AGC
WvaQ7zqcASCrkYhnmFosKAO1hRWXSka2cM7gzBL6ExhxGUYE9Ko4Ef09J8P9RlmbH5MrTARKW
oyzQuqoVt+aE0Ce8pAvcb1+PjhNDnew47tb6UuE4m1243y2DRjsPwdme7mr83FtQQ/wYlskBE
d3Y7kSiAs4+bxGv/E7aLyLP/QaHy+Oojiacu/NPfObz0kdndcuQ7x+3PkRtyiGqKtJco4QDIU
Xx5WXOYhfcmRhva1il67VRTpAoI6PTDyuXrMziXqvOWY543xxHiduyHtKt61HGWWJ0OQ4ryIP
+F8j6oPt5AMxBN1b1/vYLmKuOq5dlQ8BN1uUb+Op5n6+MgLVVSsIY8k3dfDrWhotwovOK6553
zk2HABsD+fk8QVq6B86cybjT/owkxZDMGpyekOw6Xxr8oFitqLcTQSWbGD7eEM6BZh4JxlEwL
CJqIE5BHchu4dIc8XlnVNX4jcD78bHy2mIl4gTccvB7V/1KGKaCh1Pj6Yi4DPfhcC+ZYjh4ub
3/zwjoRHWoSoUnL3+1tdqJG8IvSJtbKsu8woq4Vk97lkld5Z7cWRniPDzXcucqkyuFRTqiyIN
xt27CZChLIUuu9qobcJyiPdATraXaHWZg8hRrm0D5LRsw3qDZlmwym4M4ENltPJU0gxnS/4Ow
gw6VTTZWcsyzusH4kQm9p+5mNLyZ7BqnZPEImkHgvbS1Kd5kLqIbE5Ws5T+LvN/yG6QOJEPM+
fjhoXL+dNJR8ZCimwIAEIsUPuWw/kfWmuulTw4km0f84ng3T7cmHvch621Tgr+xVYxBH25f3V
JBhwCq1f3z4bxN9i7QJlnZZd3Yh7HIhFubLsUmXq8Gm1YzBKEluchlfKmGoDu2PLfZHxeijmP
ni2vzhJRL1G9LN3xjWU5J4oRGKbJMqqX9dOjxxC+0jRypmVCDWp9iZv7BPcsSt6ARX4b5ynln
llEZyKoAkFiMiNhadb76TyKaVap3nOFjAPNIxDihdlr74TVWES8Cl5Z1g==
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.0 (-)
* gnu/packages/crates-io.scm (rust-html-escape-0.2): New variable.
=2D--
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d6b52a217f..4a9db4943b 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20824,6 +20824,32 @@ Hash-based Message Authentication Code algorithm}=
for SHA1.")
"This package provides a library for HTML entity encoding and decodi=
ng.")
(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.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "html-escape" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1dxw9lpckrqzzqgbkw64ckbajr4b7xxnjdn8adgzqf2mm40shvl1"))))
+ (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 HT=
ML")
+ (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-http-0.2
(package
(name "rust-http")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:34:26 2021
Received: from localhost ([127.0.0.1]:54953 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mCsJF-0000pk-Pv
for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:26 -0400
Received: from mout.gmx.net ([212.227.17.21]:56635)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pierre.langlois@HIDDEN>) id 1mCsJE-0000or-1V
for 49946 <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:34:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
s=badeba3b8450; t=1628465658;
bh=acabr615RslOkDVNRT4ZZG4Nw50IAg9fMp3JqUDKyrA=;
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
b=YbC2+aKnfJXk0wj2gF8ewsDgDuVTWq22gg3h9ZTtA4GGjcv2c+JzHpNsLrL4BpVkf
h9tRQZlMfSfwOmyEp1FQ+RV6Qwoma/2dO/asXoAfR8mRbA7S9OuHcrvlc0ds6wAoHy
mGIZElT/EmoCzl8TQMQuY402F4n+ZaJrY8juwRyM=
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
1MDywu-1mMkCD3hZM-009xtZ; Mon, 09 Aug 2021 01:34:18 +0200
From: Pierre Langlois <pierre.langlois@HIDDEN>
To: 49946 <at> debbugs.gnu.org
Subject: [PATCH 02/31] gnu: Add rust-fdlimit.
Date: Mon, 9 Aug 2021 00:33:25 +0100
Message-Id: <20210808233354.6745-2-pierre.langlois@HIDDEN>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210808233354.6745-1-pierre.langlois@HIDDEN>
References: <87h7fztt60.fsf@HIDDEN>
<20210808233354.6745-1-pierre.langlois@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:p/IXNAHwjzI7tkq1E/wlMyJZHqCW/Zr9AqB8vFFICYvltm0HR6/
2nl0k6dRONcvZFZ/4Kdy/N4QK8fOgEn7HMEuOypdrR75C9FjGhcwt6FZ/BtfuoLGGsLhELK
WpgO/khPyshEjQGMXSmGRFvBl7Sg8iy4cI2Od4K5syNA85mnitDyAzBa7snU0yMWl9oKgdt
IBThBIWo6QYLfEC3MZJSw==
X-Spam-Flag: NO
X-UI-Out-Filterresults: notjunk:1;V03:K0:yzxEFlEn430=:sh8LLQi6smKgkrtg66eacT
hU7hR8YFl91BOBURPiVxzvBIwjBUy6XZb0lLRCsVnowfCQf1+cNXsjBFuzwLzwdrfDUIQkILr
KecHsXSuVUb4l3yTfgniHbjQo6JG0DAEG1dAlNXSJeTfycIjxR6qmmTEJwXkvGJpXCG8gl+ia
bRi8yInMepjah6VZm70JvCho4vGS0uATOh17y5e6N2ezC2Lx51uC9mc7EIX+UwOLjt8nCjvT7
hH3widAmDK5+rvBXrq7P7ZLXC/rpagIhHSHUNppTgpUxbboBxa8qsgQ49lHWVlcY3F1eFAC/K
TH9CeUvDd8TqPaUYp/+T3oIKL0JMSjzcgzAXWOShg+8hAqjBFdft8JEMXbKqoW5rj3xD954tD
oeYGyFCRbh5NXgVi4ykV/FLii/UufT07UAgDaiRyP1J7jn7ou51WdbJtFz3B8eECkf72H7gtH
rnUciZRTwunDwkUvpSnIV2yDFXx0AWHiu97zqU+0rQ9/dMB+txXdeq/SXLKIDv1YYLm4JmoBu
bfszzT925nTlhr9qsCt/sBRHMSvz6kmN6ODFPTsPurZk2RfZfjeBgpGxPBr/FFzHJn9HEgTOy
R59mEfTJA/U2U0AVSSXnkcymBJRn2F1RRiauxqRyow5jS4YRLxVAfHDDC47mVx+f5MN3e7k2E
oVS6hPo11Kgf3y7/qvlwLShDoVGe/f+jeWMNwPZ8Pvp1hC8vQyZ1qcdD2a1nEGOYidm/DfAuJ
EvLwYQlVBrJUqnDulsFedfEWtQPeH8xP+YthU3UUTLB2RTQXRn/IE+f4GcgPdJN8jxSczxes0
BOtO53URgzj2cr0BSzrGkYSJBRvtCHtNlAgtOgOCd6vYuv2C/K5oKXw36J4P9OyDrdAS79JdU
oM9VeFBYpTg3a8owXL3VQymJoQ8yUKqhGBGimuc+BfrZUhQSSrmQynlhPbGKsZbIBdCEfKon+
Ni2NZE/YqYwFSIqWyTAI9e/ErRpJGSpT8ssDq91D1qLhucGh+pntiTtisIC5YykpOBEiAomRs
9fanKXM9N2qPYzNMmBSGyyMIevpHpiPWHMiYAbJ4tDHkSMpwHcMs0VNw+5OqTRUOwAEYn1o04
UOe0SJ7DzqWDxS8ZC6pSQvxLXbaiyRCryaTsKfkkrr3ZqoYS/pwhAhaIg==
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.0 (-)
* gnu/packages/crates-io.scm (rust-fdlimit-0.1): New variable.
=2D--
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 01a0dff724..d6b52a217f 100644
=2D-- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15930,6 +15930,28 @@ floats.")
it.")
(license (list license:expat license:asl2.0))))
+(define-public rust-fdlimit-0.1
+ (package
+ (name "rust-fdlimit")
+ (version "0.1.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fdlimit" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0g30d6gqkrwy8ylwdy7pqm443iq0p5dmnpz4ks41pirl7dclm98d"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/paritytech/fdlimit")
+ (synopsis "Raise the open file descriptors limit")
+ (description "Utility crate for raising file descriptors limit.")
+ (license license:asl2.0)))
+
(define-public rust-femme-2
(package
(name "rust-femme")
=2D-
2.32.0
guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 8 Aug 2021 23:26:25 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 08 19:26:24 2021 Received: from localhost ([127.0.0.1]:54935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mCsBU-0000cQ-GQ for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:26:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:54406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pierre.langlois@HIDDEN>) id 1mCsBS-0000cH-M2 for submit <at> debbugs.gnu.org; Sun, 08 Aug 2021 19:26:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <pierre.langlois@HIDDEN>) id 1mCsBS-0005hc-BU for guix-patches@HIDDEN; Sun, 08 Aug 2021 19:26:22 -0400 Received: from mout.gmx.net ([212.227.15.19]:42791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <pierre.langlois@HIDDEN>) id 1mCsBQ-0008Qj-6Q for guix-patches@HIDDEN; Sun, 08 Aug 2021 19:26:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628465176; bh=+yntOmXptqFSwgFtpzEf1tsbxlIZN27mdaABHfTpEO0=; h=X-UI-Sender-Class:From:To:Subject:Date; b=RMp3hTRSaOs26fxCiI/ZVRklg5luXr6ddNe5jjrzt1uajVRV4bGAcPqZwi+oQpHqc 6EEId016qBLLZSmXYtU50/4K0m2SZvQz6j+/DvSrR+xMwUrtLey8rn1FX+3PXCQbG0 i8lfp1E1e6nzfO7ZJkrSNdbVfR5g77Ivf3up5di0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1Mn2aD-1mwuFj0or9-00k4Ke for <guix-patches@HIDDEN>; Mon, 09 Aug 2021 01:26:16 +0200 User-agent: mu4e 1.6.1; emacs 27.2 From: Pierre Langlois <pierre.langlois@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 00/31] Tree-sitter, node-gyp addon support and emacs-tree-sitter Date: Sun, 08 Aug 2021 23:29:43 +0100 Message-ID: <87h7fztt60.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:Y5BYsE5Kdb4srnwpPFVWNe/+I8pcxFIANPUb2OR2FrCZGNXNz0T I40eI/SJbewEh6iL83cOPbZwMI8JOQaT633/HMVcirNe2d4MwWOPmZ47oAaT4KQINBodyJ4 slgDaoLQcUgmM81YbkP888wroOXkAxXtFZTHoP1AZNPKjOTu3uyvYwKuCPmB8yOF71Ri4Ot pTxVBKboZSGuO6RINFfrw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:+X6p37ikJJI=:uJFdd2nh1S7prerLS1+nKo 2e2/AaqgrcY8IBEqo5CTFu/YtAtS9GHWIUbfDDuauETiIC9aoCfr2LZ5iuNDwmV0W/X8iB06f 6PgIh2sb95QPh71EzA5QLpp++F+PCs+4fBZf8Y6UayU1PzpLpoV+fLGU+tsJVJKoVhInR2fXZ NBGb/ww7PiW1uRp2jaEy6QrlmIheqAKxAqsPk4GsLMI1xTLk4AlQv3wIl/WQUBDMEwbiGt2nN NTfOpf+ZJ1kdubDQ2IYsNQqkC04ZNmqbSgjjSbQDhNWOLMzR9T461tvyG+46HJmQ3NXCHVP5k DwMc91a/T109LjKDqTc+XsbSm8EH4dbBE2021IA1s4DuBMSdRhxMwxKZqkZezZiLxFGUNmaCi UpSecUf/tXhCIE3bLyqXOvK2F9bngHqumuGSaHa3w3HI3xi1jVZIiwDj9B0aCG+OvzCw8YWsa 9CAJ9yVrTS6hpPWmCzfFaaM0sy7Udru/nsOCzjMATLvPzQ2ZRPxU2SRw/8qUe+VD6Diw8DOms yQ2sKnvC0G7JfXIQJYIxelAlheSJIT6ggDNz1NhGDbtWzVeQOqimF+819W78jfQNjo8RAKDf2 RvjPCmTbvQ38m75hoHzKZ3C+qe09nhC/7dCa5dLu5r3Dga0Uub/q2i4lDafWTjvwIr6qe6G30 NN/zHJ3C82lUdMChgBCi0pXJC5/JUTCutS071FMTou6bZ4Z3BlxsluQgxxQfrnkAN/SJbNOw3 c6GQVVO20GZqMzxN/cfnT1EbYj3gT6gOwLZKn4VNYcUMWMrRdpy87ECHCUcqZMfSD10JqJJlJ tpKjJfo+EqrV69tLhEdljUkT5HmvjeLHfYixrtp1hOQl2ykJbJBNAHp1RWz+nx7EnfyCM11he 5+iF/aCHthAWWJNU/qQKFVsNE4MktcJwua3A6a1naL/aZlm/RUwhC/wLD5wN5BRHNPCVE8bji hmXq5Lsv3/yV1pGaajS/ce4ZMryqciD/adbz/ZVsaeJRqELjxh74/SyMDwPABKpPnAWSKShmQ IsIG+jYv9uIwfv+vaNl5hab5G25vStqTllRcI9asLu7LEqhSx7RH+qR8Elk6bN41JC2boLCD8 nMGldSDGPdZKVa6L6H4Gg5Cg/D025YpopDTlvV0hmCZiyfYZhevTnmpEQ== Received-SPF: pass client-ip=212.227.15.19; envelope-from=pierre.langlois@HIDDEN; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: submit 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: -2.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Guix! Here's a patch series that adds support for the Tree-sitter library, command-line tool and its support in emacs: https://tree-sitter.github.io/tree-sitter The series in split into multiple parts: 1. Add the tree-sitter package, which is both a command-line tool for generating parsers and a runtime library. The runtime is written in C but the tooling in Rust. * gnu: rust-chunked-transfer: Update to 1.4.0. * gnu: Add rust-fdlimit. * gnu: Add rust-html-escape. * gnu: Add rust-smallbitvec. * gnu: rust-tiny-http: Update to 0.8. * gnu: rust-spin: Update to 0.7. * gnu: Add tree-sitter. 2. Add support for native addons to the node build-system. * gnu: node: Patch /usr/bin/env in node-gyp. * guix: node-build-system: Support compiling addons with node-gyp. I've not touched the node build system before so it'd be great to get some review here! The idea is that when a package has a `binding.gyp' file then there's native code that needs to be compiled against node. This uses node-gyp, which is a build system written in python. Normally, there shouldn't be anything to do, the package.json file should invoke `node-gyp` tp compile C code. However, `node-gyp' needs node headers to compile against, packaged as a tarball, which it tries to download. Instead, we can run a `node-gyp --tarball <> configure' step to manually provide the tarball, which we can package separately for any given node version. I could have added this into the packages themselves, but I thought it made more sense to be a part of the build system, let me know what you think! 3. Packaging grammars for multiple languages. Tree-sitter grammars are Nodejs packages, they consist of a grammar.js file which the tree-sitter command-line program uses to generate C code for the parser/scanner. Using npm as a packaging mechanism for this seems overkill, but it's true some grammars depend on each other (cpp on c, typescript and javascript). * gnu: Add node-nan. * gnu: Add tree-sitter-c. * gnu: Add tree-sitter-cpp. * gnu: Add tree-sitter-css. * 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-php. * gnu: Add tree-sitter-python. * gnu: Add tree-sitter-rust. * gnu: Add tree-sitter-typescript. 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. Let me know what you think! This rebuilds all node packages, but there aren't that many so hopefully that'll be ok on master. Thanks, Pierre Pierre Langlois (31): gnu: rust-chunked-transfer: Update to 1.4.0. gnu: Add rust-fdlimit. gnu: Add rust-html-escape. gnu: Add rust-smallbitvec. gnu: rust-tiny-http: Update to 0.8. gnu: rust-spin: Update to 0.7. gnu: Add tree-sitter. gnu: node: Patch /usr/bin/env in node-gyp. guix: node-build-system: Support compiling addons with node-gyp. gnu: Add node-nan. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-css. 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-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. 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. gnu/local.mk | 1 + gnu/packages/crates-io.scm | 290 +++++++++++-- gnu/packages/node-xyz.scm | 30 ++ gnu/packages/node.scm | 29 +- gnu/packages/tree-sitter.scm | 716 +++++++++++++++++++++++++++++++ guix/build-system/node.scm | 16 + guix/build/node-build-system.scm | 15 + 7 files changed, 1064 insertions(+), 33 deletions(-) create mode 100644 gnu/packages/tree-sitter.scm =2D-=20 2.32.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmEQaBcYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31Uk64H/RTjvpOAq1dLgQVt69syGPZO cx2KRhhKea+vAnjzkcau71H+ekqv2faeUCeRYJATBViOsavxbs0cMp4lqTS+7YQY 1K0rH/sR0Kc4D5Reb6OhUBkp1QjbrETydrAhp9vdX8KPwsMf8qApaxZT7KC49eYj UeiCFytDQ0f7fcELUWMnIsy3ca1F9Q/FarUofITWGNiJ5biWxkr0xhdO4qe7roo/ xEElSYGbVp7qNeXcyku7kRWQES7F2ijsc354Hv1G6HAA76tkyDF6r2OOzKtGLFPg rpfduwfzWo4DENtOvSjekIHtkVSWuW3g5s6ThN+jSoAZf0IUE4XoxSn5i5b/Keg= =vVea -----END PGP SIGNATURE----- --=-=-=--
Pierre Langlois <pierre.langlois@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#49946; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.