X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
Resent-From: Emma Turner <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 30 Oct 2023 16:36:02 +0000
Resent-Message-ID: <handler.66836.B.16986837615871 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 66836 <at> debbugs.gnu.org
X-Debbugs-Original-To: "guix-patches@HIDDEN" <guix-patches@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.16986837615871
(code B ref -1); Mon, 30 Oct 2023 16:36:02 +0000
Received: (at submit) by debbugs.gnu.org; 30 Oct 2023 16:36:01 +0000
Received: from localhost ([127.0.0.1]:46615 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qxVFA-0001WP-Bc
for submit <at> debbugs.gnu.org; Mon, 30 Oct 2023 12:36:01 -0400
Received: from lists.gnu.org ([2001:470:142::17]:46978)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1qxCi9-000372-7i
for submit <at> debbugs.gnu.org; Sun, 29 Oct 2023 16:48:45 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mail@HIDDEN>)
id 1qxChT-0008R0-MP
for guix-patches@HIDDEN; Sun, 29 Oct 2023 16:48:00 -0400
Received: from mail-4317.proton.ch ([185.70.43.17])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mail@HIDDEN>)
id 1qxChQ-0001qX-Lu
for guix-patches@HIDDEN; Sun, 29 Oct 2023 16:47:59 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emturner.co.uk;
s=protonmail; t=1698612469; x=1698871669;
bh=n8dGLEHr/cj/X91v8C97KDwvLpVNBnGGo5Ys7DClv5I=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=iB0UF2r03h1IKbR0awIdE7Vyb7RvADjKcJVqzYWsV10GhhyGFivhSawlz33d58Ead
LiYYekoyLIZ8BYxd0Nsg4Ko1o23n1UB0AJ0EyGBA02fsgsDx6iC4tswN+Js/AMdZu0
tSLy1aoh4STU3O6m2ah+QzNCQhT+t1BuAzHmJw/V1UoNIzSSgfIkim4GVdCwhrfT6x
kKyYm7nw9Y2tcxz0EhQ0Nrr/g+FAsrPXcAl/aaZ1KeuH8CULW6ohWuP9T+3GNQIhbm
jPlnRWnV6PKdI/Kv+ehiGRJs0mMMiQu+x0Fte0y1nay1mosR6s3vF5StKTnZVRp6Dr
+8R8E+hTpYefg==
Date: Sun, 29 Oct 2023 20:47:34 +0000
From: Emma Turner <mail@HIDDEN>
Message-ID: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
Feedback-ID: 90737048:user:proton
MIME-Version: 1.0
Content-Type: multipart/alternative;
boundary="b1_2EsfZ9KPG2PtXlW9csJK3eMzYFlONqOQlqyCeyl4"
Received-SPF: pass client-ip=185.70.43.17; envelope-from=mail@HIDDEN;
helo=mail-4317.proton.ch
X-Spam_score_int: -30
X-Spam_score: -3.1
X-Spam_bar: ---
X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001,
RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Mailman-Approved-At: Mon, 30 Oct 2023 12:35:58 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?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.0 (/)
This is a multi-part message in MIME format.
--b1_2EsfZ9KPG2PtXlW9csJK3eMzYFlONqOQlqyCeyl4
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: base64
KiBnbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIuc2NtICh0cmVlLXNpdHRlci15YW1sKTogTmV3IHZh
cmlhYmxlLgoKQ2hhbmdlLUlkOiBJZDQ4MDQwZWVlMzI1YjBjZGI0MzVkODY5M2NhZjQ4Yzk2NTRj
ZjE0YwotLS0KZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbSB8IDkgKysrKysrKysrCjEgZmls
ZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvdHJl
ZS1zaXR0ZXIuc2NtIGIvZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbQppbmRleCA0MTI1N2Q0
MmYxLi42MDhmOGI2NTE5IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIuc2Nt
CisrKyBiL2dudS9wYWNrYWdlcy90cmVlLXNpdHRlci5zY20KQEAgLTcsNiArNyw3IEBACjs7OyBD
b3B5cmlnaHQgwqkgMjAyMyBOaWNvbGFzIEdyYXZlcyA8bmdyYXZlc0BuZ3JhdmVzLmZyPgo7Ozsg
Q29weXJpZ2h0IMKpIDIwMjMgWmhlbmcgSnVuamllIDw4NzMyMTYwNzFAcXEuY29tPgo7OzsgQ29w
eXJpZ2h0IMKpIDIwMjMgUmF2ZW4gSGFsbHNieSA8a2FybEBoYWxsc2J5LmNvbT4KKzs7OyBDb3B5
cmlnaHQgwqkgMjAyMyBFbW1hIFR1cm5lciA8bWFpbEBlbXR1cm5lci5jby51az4KOzs7Cjs7OyBU
aGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KOzs7CkBAIC02MjksMyArNjMwLDExIEBAIChk
ZWZpbmUtcHVibGljIHRyZWUtc2l0dGVyLXNjYWxhCiJzY2FsYSIgIlNjYWxhIgoiMGhzNmdta3E1
Y3g5cXJtZ2Z6MW1oMGMzNGZsd2ZmYzBrMm1od2YxM2xhYXdzd255d2ZreiIKIjAuMjAuMiIpKQor
CisoZGVmaW5lLXB1YmxpYyB0cmVlLXNpdHRlci15YW1sCisgKHRyZWUtc2l0dGVyLWdyYW1tYXIK
KyAieWFtbCIgIllhbWwiCisgIjFheTRzbmtkMnM0cGlkN3BjcjRiZ3gweTljajdiNXZsZ2Q3d2Zj
MWowODk2bDBwNjFjamIiCisgIjAuNS4wIgorICM6cmVwb3NpdG9yeS11cmwgImh0dHBzOi8vZ2l0
aHViLmNvbS9lbXR1cm5lci90cmVlLXNpdHRlci15YW1sIgorICM6Y29tbWl0ICJmNTM4NTkyMDlm
ZWYwNjViNjc3OTk1ODAyODQyYTJiNjUzMTRkZWZiIikpCgpiYXNlLWNvbW1pdDogMmI1YzZlMWE0
MWU0ZGRjZjRjZmE1M2EzMTllZDc4NGE4NTZlYWM1ZAotLTIuNDEuMA==
--b1_2EsfZ9KPG2PtXlW9csJK3eMzYFlONqOQlqyCeyl4
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: base64
PGRpdiBjbGFzcz0icHJvdG9ubWFpbF9zaWduYXR1cmVfYmxvY2sgIiBzdHlsZT0iZm9udC1mYW1p
bHk6IEFyaWFsLCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDE0cHg7Ij4NCiAgICA8ZGl2IGNsYXNz
PSJwcm90b25tYWlsX3NpZ25hdHVyZV9ibG9jay11c2VyIHByb3Rvbm1haWxfc2lnbmF0dXJlX2Js
b2NrLWVtcHR5Ij48L2Rpdj48ZGl2IGNsYXNzPSJwcm90b25tYWlsX3NpZ25hdHVyZV9ibG9jay1w
cm90b24iPjxzcGFuPiogZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbSAodHJlZS1zaXR0ZXIt
eWFtbCk6IE5ldyB2YXJpYWJsZS48L3NwYW4+PGRpdj48YnI+PC9kaXY+PGRpdj48c3Bhbj5DaGFu
Z2UtSWQ6IElkNDgwNDBlZWUzMjViMGNkYjQzNWQ4NjkzY2FmNDhjOTY1NGNmMTRjPC9zcGFuPjwv
ZGl2PjxkaXY+PHNwYW4+LS0tPC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+Jm5ic3A7Z251L3BhY2th
Z2VzL3RyZWUtc2l0dGVyLnNjbSB8IDkgKysrKysrKysrPC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+
Jm5ic3A7MSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKTwvc3Bhbj48L2Rpdj48ZGl2Pjxi
cj48L2Rpdj48ZGl2PjxzcGFuPmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIu
c2NtIGIvZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbTwvc3Bhbj48L2Rpdj48ZGl2PjxzcGFu
PmluZGV4IDQxMjU3ZDQyZjEuLjYwOGY4YjY1MTkgMTAwNjQ0PC9zcGFuPjwvZGl2PjxkaXY+PHNw
YW4+LS0tIGEvZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbTwvc3Bhbj48L2Rpdj48ZGl2Pjxz
cGFuPisrKyBiL2dudS9wYWNrYWdlcy90cmVlLXNpdHRlci5zY208L3NwYW4+PC9kaXY+PGRpdj48
c3Bhbj5AQCAtNyw2ICs3LDcgQEA8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4mbmJzcDs7OzsgQ29w
eXJpZ2h0IMKpIDIwMjMgTmljb2xhcyBHcmF2ZXMgJmx0OzxhIHRhcmdldD0iX2JsYW5rIiByZWw9
Im5vcmVmZXJyZXIgbm9mb2xsb3cgbm9vcGVuZXIiIGhyZWY9Im1haWx0bzpuZ3JhdmVzQG5ncmF2
ZXMuZnIiPm5ncmF2ZXNAbmdyYXZlcy5mcjwvYT4mZ3Q7PC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+
Jm5ic3A7Ozs7IENvcHlyaWdodCDCqSAyMDIzIFpoZW5nIEp1bmppZSAmbHQ7PGEgdGFyZ2V0PSJf
YmxhbmsiIHJlbD0ibm9yZWZlcnJlciBub2ZvbGxvdyBub29wZW5lciIgaHJlZj0ibWFpbHRvOjg3
MzIxNjA3MUBxcS5jb20iPjg3MzIxNjA3MUBxcS5jb208L2E+Jmd0Ozwvc3Bhbj48L2Rpdj48ZGl2
PjxzcGFuPiZuYnNwOzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBSYXZlbiBIYWxsc2J5ICZsdDs8YSB0
YXJnZXQ9Il9ibGFuayIgcmVsPSJub3JlZmVycmVyIG5vZm9sbG93IG5vb3BlbmVyIiBocmVmPSJt
YWlsdG86a2FybEBoYWxsc2J5LmNvbSI+a2FybEBoYWxsc2J5LmNvbTwvYT4mZ3Q7PC9zcGFuPjwv
ZGl2PjxkaXY+PHNwYW4+Kzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBFbW1hIFR1cm5lciAmbHQ7PGEg
dGFyZ2V0PSJfYmxhbmsiIHJlbD0ibm9yZWZlcnJlciBub2ZvbGxvdyBub29wZW5lciIgaHJlZj0i
bWFpbHRvOm1haWxAZW10dXJuZXIuY28udWsiPm1haWxAZW10dXJuZXIuY28udWs8L2E+Jmd0Ozwv
c3Bhbj48L2Rpdj48ZGl2PjxzcGFuPiZuYnNwOzs7Ozwvc3Bhbj48L2Rpdj48ZGl2PjxzcGFuPiZu
YnNwOzs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC48L3NwYW4+PC9kaXY+PGRpdj48
c3Bhbj4mbmJzcDs7Ozs8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj5AQCAtNjI5LDMgKzYzMCwxMSBA
QCAoZGVmaW5lLXB1YmxpYyB0cmVlLXNpdHRlci1zY2FsYTwvc3Bhbj48L2Rpdj48ZGl2PjxzcGFu
PiZuYnNwOyAmbmJzcDsgInNjYWxhIiAiU2NhbGEiPC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+Jm5i
c3A7ICZuYnNwOyAiMGhzNmdta3E1Y3g5cXJtZ2Z6MW1oMGMzNGZsd2ZmYzBrMm1od2YxM2xhYXdz
d255d2ZreiI8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4mbmJzcDsgJm5ic3A7ICIwLjIwLjIiKSk8
L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4rPC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+KyhkZWZpbmUt
cHVibGljIHRyZWUtc2l0dGVyLXlhbWw8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4rICZuYnNwOyh0
cmVlLXNpdHRlci1ncmFtbWFyPC9zcGFuPjwvZGl2PjxkaXY+PHNwYW4+KyAmbmJzcDsgInlhbWwi
ICJZYW1sIjwvc3Bhbj48L2Rpdj48ZGl2PjxzcGFuPisgJm5ic3A7ICIxYXk0c25rZDJzNHBpZDdw
Y3I0Ymd4MHk5Y2o3YjV2bGdkN3dmYzFqMDg5NmwwcDYxY2piIjwvc3Bhbj48L2Rpdj48ZGl2Pjxz
cGFuPisgJm5ic3A7ICIwLjUuMCI8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4rICZuYnNwOyAjOnJl
cG9zaXRvcnktdXJsICI8YSB0YXJnZXQ9Il9ibGFuayIgcmVsPSJub3JlZmVycmVyIG5vZm9sbG93
IG5vb3BlbmVyIiBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vZW10dXJuZXIvdHJlZS1zaXR0ZXIt
eWFtbCI+aHR0cHM6Ly9naXRodWIuY29tL2VtdHVybmVyL3RyZWUtc2l0dGVyLXlhbWw8L2E+Ijwv
c3Bhbj48L2Rpdj48ZGl2PjxzcGFuPisgJm5ic3A7ICM6Y29tbWl0ICJmNTM4NTkyMDlmZWYwNjVi
Njc3OTk1ODAyODQyYTJiNjUzMTRkZWZiIikpPC9zcGFuPjwvZGl2PjxkaXY+PGJyPjwvZGl2Pjxk
aXY+PHNwYW4+YmFzZS1jb21taXQ6IDJiNWM2ZTFhNDFlNGRkY2Y0Y2ZhNTNhMzE5ZWQ3ODRhODU2
ZWFjNWQ8L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4tLTwvc3Bhbj48L2Rpdj48c3Bhbj4yLjQxLjA8
L3NwYW4+PGJyPjwvZGl2Pg0KPC9kaXY+DQo=
--b1_2EsfZ9KPG2PtXlW9csJK3eMzYFlONqOQlqyCeyl4--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Emma Turner <mail@HIDDEN> Subject: bug#66836: Acknowledgement ([Patch] gnu: Add tree-sitter-yaml.) Message-ID: <handler.66836.B.16986837615871.ack <at> debbugs.gnu.org> References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk> X-Gnu-PR-Message: ack 66836 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 66836 <at> debbugs.gnu.org Date: Mon, 30 Oct 2023 16:36:03 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 66836 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 66836: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66836 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
Resent-From: Hilton Chain <hako@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 04 Nov 2023 12:17:02 +0000
Resent-Message-ID: <handler.66836.B66836.169910018632308 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Emma Turner <mail@HIDDEN>
Cc: 66836 <at> debbugs.gnu.org
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.169910018632308
(code B ref 66836); Sat, 04 Nov 2023 12:17:02 +0000
Received: (at 66836) by debbugs.gnu.org; 4 Nov 2023 12:16:26 +0000
Received: from localhost ([127.0.0.1]:33033 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qzFZi-0008P1-60
for submit <at> debbugs.gnu.org; Sat, 04 Nov 2023 08:16:26 -0400
Received: from mail.boiledscript.com ([144.168.59.46]:42504)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <hako@HIDDEN>) id 1qzFZe-0008Oq-Aq
for 66836 <at> debbugs.gnu.org; Sat, 04 Nov 2023 08:16:24 -0400
Date: Sat, 04 Nov 2023 20:15:08 +0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space;
s=dkim; t=1699099965;
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:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=AHTHF5K2h1/0VjfULshk83ukaZWO5Y+WboZBTH2IsTI=;
b=hLq0EygI9GG9dkIvf6oRpk7i4HSXHimqQiejNALks4wokPuQYFQrqoaItsvcPnwLQ7m0Ni
RZUObM8yIBflDeXN817N1PVvwIylknB+O52FLtGwV13d8v0IoD4p6m7P2L2Jwv1EvkI4by
3NH0xf2zniRMKucB9qOC8GtFEf/auU06vq1f8tqkaLo+8bwsv4we1I6j83pk8OB0UGKnaC
TRtuNk12558Vvx/aldDPClW9rsCxtSgVBgHSJtHHAPQB2j4v27B+x2rS8LP2Ko5BsQcQ5E
Wun57BTRkkaN+vaffEQvgHKaoYH7hK5n65eNsGaOUSxLUDRQsP8pS3cPtfC47A==
Authentication-Results: mail.boiledscript.com;
auth=pass smtp.mailfrom=hako@HIDDEN
Message-ID: <87pm0pww8j.wl-hako@HIDDEN>
From: Hilton Chain <hako@HIDDEN>
In-Reply-To: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-Spamd-Bar: /
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 Emma,
On Mon, 30 Oct 2023 04:47:34 +0800,
Emma Turner via Guix-patches via wrote:
>
> [1 <text/plain; utf-8 (base64)>]
> [2 <text/html; utf-8 (base64)>]
> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>
> Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c
> ---
> gnu/packages/tree-sitter.scm | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 41257d42f1..608f8b6519 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -7,6 +7,7 @@
> ;;; Copyright =A9 2023 Nicolas Graves <ngraves@HIDDEN>
> ;;; Copyright =A9 2023 Zheng Junjie <873216071@HIDDEN>
> ;;; Copyright =A9 2023 Raven Hallsby <karl@HIDDEN>
> +;;; Copyright =A9 2023 Emma Turner <mail@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -629,3 +630,11 @@ (define-public tree-sitter-scala
> "scala" "Scala"
> "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
> "0.20.2"))
> +
> +(define-public tree-sitter-yaml
> + (tree-sitter-grammar
> + "yaml" "Yaml"
> + "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb"
> + "0.5.0"
> + #:repository-url "https://github.com/emturner/tree-sitter-yaml"
> + #:commit "f53859209fef065b677995802842a2b65314defb"))
>
> base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
> --
> 2.41.0
There seem to be formatting issue in your patch, making the last two lines
embedded into one: "--2.41.0". You can have a look at it in [1].
I think your changes can be shipped as a patch with Guix. Maybe you can op=
en a
PR to upstream as well? :)
I have modified your commit since we don't have to clone the submodule and
generated files in src/ are deleted. I will send v2 for the change.
Thanks
---
[1]: https://issues.guix.gnu.org/66836
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
Resent-From: Hilton Chain <hako@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: mail@HIDDEN, hako@HIDDEN, andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sat, 04 Nov 2023 12:24:02 +0000
Resent-Message-ID: <handler.66836.B66836.1699100605568 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 66836 <at> debbugs.gnu.org
Cc: Emma Turner <mail@HIDDEN>, Hilton Chain <hako@HIDDEN>, Emma Turner <mail@HIDDEN>, Hilton Chain <hako@HIDDEN>, Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-Debbugs-Original-Xcc: Emma Turner <mail@HIDDEN>, Hilton Chain <hako@HIDDEN>, Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.1699100605568
(code B ref 66836); Sat, 04 Nov 2023 12:24:02 +0000
Received: (at 66836) by debbugs.gnu.org; 4 Nov 2023 12:23:25 +0000
Received: from localhost ([127.0.0.1]:33037 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qzFgS-000094-82
for submit <at> debbugs.gnu.org; Sat, 04 Nov 2023 08:23:25 -0400
Received: from mail.boiledscript.com ([144.168.59.46]:55098)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <hako@HIDDEN>) id 1qzFgP-00008t-EV
for 66836 <at> debbugs.gnu.org; Sat, 04 Nov 2023 08:23:22 -0400
From: Hilton Chain <hako@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space;
s=dkim; t=1699100387;
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:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=fMszT5xBLfXSgDBCDi2FwIdZFZ0d9EcQRbzpIDsYve4=;
b=oaifvuCmk21tw7DEF7l1afs0kNWsea9Vu997kxg0pQ2LVsiJmywbMMNpFj5LXrqyKX0ryN
fOaGmq2+ChFLlhdtxOkq9QTjVx4j8EgmsqZsIAronTdqFRzz+ELuQD3tOXDDCK6SjDxSlX
Lk7qLZw/kTFjVl507zqyUnkvwW9qlAP6hFS7F4Pu/Y7vvUg6GxwYv1v0PFyS5K4B3d3iv1
mU3Al0ClHV6X0CiRM9NxakQEc5p2A+XjK9xmYcaV+2Ph+eaVtFyGVW7+coPCwxqeKbJ9aC
FwpnBkcVCliapLUW3CaFEYiVLFilG3PjineyEf00dYf6RRTx2sNlAL41K74W+Q==
Authentication-Results: mail.boiledscript.com;
auth=pass smtp.mailfrom=hako@HIDDEN
Date: Sat, 4 Nov 2023 20:22:10 +0800
Message-ID: <75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
In-Reply-To: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spamd-Bar: /
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 (-)
From: Emma Turner <mail@HIDDEN>
* gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
Modified-by: Hilton Chain <hako@HIDDEN>
Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
---
gnu/local.mk | 1 +
.../patches/tree-sitter-yaml-fix-tests.patch | 690 ++++++++++++++++++
gnu/packages/tree-sitter.scm | 15 +
3 files changed, 706 insertions(+)
create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 8d817379a7..a5b5afd84b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2045,6 +2045,7 @@ dist_patch_DATA = \
%D%/packages/patches/tofi-32bit-compat.patch \
%D%/packages/patches/tpetra-remove-duplicate-using.patch \
%D%/packages/patches/transcode-ffmpeg.patch \
+ %D%/packages/patches/tree-sitter-yaml-fix-tests.patch \
%D%/packages/patches/trytond-add-egg-modules-to-path.patch \
%D%/packages/patches/trytond-add-guix_trytond_path.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
diff --git a/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch b/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
new file mode 100644
index 0000000000..c658729bab
--- /dev/null
+++ b/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
@@ -0,0 +1,690 @@
+From 67e0bec12812921672776cf2dd8dfa79e27f6360 Mon Sep 17 00:00:00 2001
+From: Emma Turner <mail@HIDDEN>
+Date: Sun, 29 Oct 2023 16:40:30 +0000
+Subject: [PATCH] fix tests for tree-sitter 0.20.8
+
+---
+ corpus/spec.txt | 492 +++++++++++++++++++-----------------------------
+ 1 file changed, 194 insertions(+), 298 deletions(-)
+
+diff --git a/corpus/spec.txt b/corpus/spec.txt
+index ca75d12..8b64bc4 100644
+--- a/corpus/spec.txt
++++ b/corpus/spec.txt
+@@ -654,23 +654,16 @@ map:
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (double_quote_scalar)))
+- (ERROR))))))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (double_quote_scalar))))
+
+ ================================================================================
+ Bad indentation in mapping [INVALID]
+@@ -981,17 +974,13 @@ block scalar: >
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (block_node
+- (block_scalar)))
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (block_node
++ (block_scalar))))
+
+ ================================================================================
+ Block Sequence in Block Mapping
+@@ -1212,19 +1201,15 @@ key: word1
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (comment)
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (comment))
+
+ ================================================================================
+ Comment that looks like a mapping key [INVALID]
+@@ -1234,22 +1219,18 @@ this is #not a: key
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (comment)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (comment))
+
+ ================================================================================
+ Comment without whitespace after block scalar indicator [INVALID]
+@@ -1415,15 +1396,10 @@ key: "missing closing quote
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR)))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Doublequoted scalar starting with a tab
+@@ -2116,8 +2092,10 @@ Invalid document markers in flow style [INVALID]
+
+ --------------------------------------------------------------------------------
+
+-(ERROR
+- (string_scalar))
++(stream
++ (ERROR)
++ (document)
++ (MISSING _eof))
+
+ ================================================================================
+ Invalid document-end marker in single quoted string [INVALID]
+@@ -2192,8 +2170,7 @@ invalid: x
+ (string_scalar))))
+ (flow_node
+ (plain_scalar
+- (string_scalar)))
+- (string_scalar))
++ (string_scalar))))
+
+ ================================================================================
+ Invalid mapping in plain multiline [INVALID]
+@@ -2270,20 +2247,14 @@ invalid
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_sequence
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (string_scalar))))))
++(ERROR
++ (block_sequence_item
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Invalid scalar at the end of mapping [INVALID]
+@@ -2295,28 +2266,24 @@ invalid
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
++(ERROR
++ (block_mapping_pair
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
+ (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
++ (block_sequence
++ (block_sequence_item
++ (flow_node
+ (plain_scalar
+- (string_scalar)))
+- value: (block_node
+- (block_sequence
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar)))))))
+- (ERROR
++ (string_scalar))))
++ (block_sequence_item
+ (flow_node
+ (plain_scalar
+- (string_scalar))))))))
++ (string_scalar)))))))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Invalid scalar at the end of sequence [INVALID]
+@@ -2328,26 +2295,17 @@ key:
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (block_node
+- (block_sequence
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (block_sequence_item
+- (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (string_scalar)))))))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (block_sequence_item
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Invalid sequene item on same line as previous item [INVALID]
+@@ -2420,21 +2378,17 @@ invalid
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (flow_node
+- (plain_scalar
+- (string_scalar))))))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Key with anchor after missing explicit mapping value
+@@ -2507,17 +2461,13 @@ block scalar: |
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (block_node
+- (block_scalar)))
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (block_node
++ (block_scalar))))
+
+ ================================================================================
+ Literal unicode
+@@ -2647,27 +2597,23 @@ top2
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (block_node
+ (block_mapping
+ (block_mapping_pair
+ key: (flow_node
+ (plain_scalar
+ (string_scalar)))
+- value: (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar)))))))
+- (ERROR
+- (flow_node
++ value: (flow_node
+ (plain_scalar
+- (string_scalar))))))))
++ (string_scalar)))))))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Missing comma in flow [INVALID]
+@@ -2678,19 +2624,14 @@ key: [ word1
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (flow_node
+- (plain_scalar
+- (string_scalar)))
+- (comment))))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (comment))
+
+ ================================================================================
+ Missing document-end marker before directive [INVALID]
+@@ -2703,17 +2644,11 @@ scalar2
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document)
+- (ERROR
+- (flow_node
+- (plain_scalar
+- (string_scalar)))
+- (comment))
+- (document
+- (flow_node
+- (plain_scalar
+- (string_scalar)))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (comment))
+
+ ================================================================================
+ Missing space in YAML directive
+@@ -2924,18 +2859,14 @@ Multiline double quoted implicit keys [INVALID]
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (double_quote_scalar
+- (escape_sequence)))
+- value: (flow_node
+- (plain_scalar
+- (integer_scalar))))
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (double_quote_scalar
++ (escape_sequence)))
++ value: (flow_node
++ (plain_scalar
++ (integer_scalar)))))
+
+ ================================================================================
+ Multiline doublequoted flow mapping key without value
+@@ -3207,17 +3138,13 @@ Multiline single quoted implicit keys [INVALID]
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (single_quote_scalar))
+- value: (flow_node
+- (plain_scalar
+- (integer_scalar))))
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (single_quote_scalar))
++ value: (flow_node
++ (plain_scalar
++ (integer_scalar)))))
+
+ ================================================================================
+ Multiple Entry Block Sequence
+@@ -3529,19 +3456,16 @@ key: &x
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (anchor
+- (anchor_name))))
+- (ERROR
+- (tag))))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (anchor
++ (anchor_name))))
++ (flow_node
++ (tag)))
+
+ ================================================================================
+ Node and Mapping Key Anchors
+@@ -3922,40 +3846,34 @@ top2: &node2
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (block_node
++ (anchor
++ (anchor_name))
+ (block_mapping
+ (block_mapping_pair
+ key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (block_node
+ (anchor
+ (anchor_name))
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (anchor
+- (anchor_name))
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar)))))))
+- (block_mapping_pair
+- key: (flow_node
+ (plain_scalar
+ (string_scalar)))
+ value: (flow_node
+- (anchor
+- (anchor_name))))
+- (ERROR
+- (flow_node
+- (anchor
+- (anchor_name))
+ (plain_scalar
+- (string_scalar))))))))
++ (string_scalar)))))))
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (anchor
++ (anchor_name))
++ (flow_node
++ (anchor
++ (anchor_name))
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Scalars on --- line
+@@ -8728,19 +8646,15 @@ plain: a
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (comment)
+- (ERROR)))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (plain_scalar
++ (string_scalar))))
++ (comment))
+
+ ================================================================================
+ Trailing content after quoted value [INVALID]
+@@ -9607,20 +9521,13 @@ c]
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (flow_node
+- (plain_scalar
+- (string_scalar)))
+- (string_scalar)
+- (string_scalar))))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar)))
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Wrong indented multiline quoted scalar [INVALID]
+@@ -9632,17 +9539,10 @@ c"
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (document
+- (block_node
+- (block_mapping
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar))))
+- (ERROR
+- (string_scalar)
+- (string_scalar))))))
++(ERROR
++ (flow_node
++ (plain_scalar
++ (string_scalar))))
+
+ ================================================================================
+ Wrong indented sequence item [INVALID]
+@@ -9671,18 +9571,14 @@ key: value
+
+ --------------------------------------------------------------------------------
+
+-(stream
+- (ERROR
+- (block_mapping_pair
+- key: (flow_node
+- (plain_scalar
+- (string_scalar)))
+- value: (flow_node
+- (plain_scalar
+- (string_scalar)))))
+- (document
+- (yaml_directive
+- (yaml_version))))
++(ERROR
++ (block_mapping_pair
++ key: (flow_node
++ (plain_scalar
++ (string_scalar)))
++ value: (flow_node
++ (plain_scalar
++ (string_scalar)))))
+
+ ================================================================================
+ Zero indented block scalar
+
+base-commit: 6129a83eeec7d6070b1c0567ec7ce3509ead607c
+--
+2.41.0
+
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 41257d42f1..f2bfff748b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@HIDDEN>
;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
;;; Copyright © 2023 Raven Hallsby <karl@HIDDEN>
+;;; Copyright © 2023 Emma Turner <mail@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -629,3 +630,17 @@ (define-public tree-sitter-scala
"scala" "Scala"
"0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
"0.20.2"))
+
+(define-public tree-sitter-yaml
+ (let ((base (tree-sitter-grammar
+ "yaml" "Yaml"
+ "1bimf5fq85wn8dwlk665w15n2bj37fma5rsfxrph3i9yb0lvzi3q"
+ "0.5.0"
+ #:repository-url
+ "https://github.com/ikatyang/tree-sitter-yaml")))
+ (package
+ (inherit base)
+ (source (origin
+ (inherit (package-source base))
+ (patches
+ (search-patches "tree-sitter-yaml-fix-tests.patch")))))))
base-commit: 9dcd8802f5bc472579f23a38dcf437f8a9ac976c
--
2.41.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
Resent-From: Emma Turner <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 04 Nov 2023 18:07:02 +0000
Resent-Message-ID: <handler.66836.B66836.16991211987324 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: hako@HIDDEN
Cc: 66836 <at> debbugs.gnu.org
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.16991211987324
(code B ref 66836); Sat, 04 Nov 2023 18:07:02 +0000
Received: (at 66836) by debbugs.gnu.org; 4 Nov 2023 18:06:38 +0000
Received: from localhost ([127.0.0.1]:35688 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qzL2b-0001u4-KK
for submit <at> debbugs.gnu.org; Sat, 04 Nov 2023 14:06:38 -0400
Received: from mail-4317.proton.ch ([185.70.43.17]:26363)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1qzL2X-0001tl-FE
for 66836 <at> debbugs.gnu.org; Sat, 04 Nov 2023 14:06:35 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emturner.co.uk;
s=protonmail; t=1699121149; x=1699380349;
bh=ZNzxo+HwZ5AhWyO/m7bSeA2XNjtZI8Fk+6YJL1KjRF0=;
h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References:
Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:
Message-ID:BIMI-Selector;
b=oVHOONAejzVO1lzllFZr8n9LSDYnGH/eix5j6PLwL3dsmFWYaeqL5ActinsYWPZ4U
NNKY8VVrFdNYT3VgUyt8POFUrnhxdxXE0EqMTILs0l67CzlUMFkIlPbSpG0Q8JqaQy
xTloSpFHHuD8W5Hl9LEt48rmm0bU3mS/7dxkxNyy6twzq1fGBzUBuQa9D0tRcHY1NB
znqTkmYgIk5OLd30wUyVSiF1SIDZNrdt8FArOQjxiPMss4wzR5HeNRrAfQr7rx5xWC
ko5iQQqqURbHE3QQiAA77xqQWKykqVK5z0mDdwvEXV78bNKdMWdUtR5SQyNhCOBDfu
zUOsG1KkUkkvA==
Date: Sat, 04 Nov 2023 18:05:45 +0000
From: Emma Turner <mail@HIDDEN>
Message-ID: <HYeYPycfx13kpW36HJDuz2Nxhl6Iic_vPjmBEDYpfW5OtftxkyIfmbVxNd1KGy5RnT-pvkv259PQH38MXBnD0sOYqsc0a_SWf07UF6ltEbk=@emturner.co.uk>
In-Reply-To: <87pm0pww8j.wl-hako@HIDDEN>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<87pm0pww8j.wl-hako@HIDDEN>
Feedback-ID: 90737048:user:proton
MIME-Version: 1.0
Content-Type: multipart/alternative;
boundary="b1_8V4xONlStsthS2zWAapNZYLAprRK4fXmsslNBqKnk"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 (-)
This is a multi-part message in MIME format.
--b1_8V4xONlStsthS2zWAapNZYLAprRK4fXmsslNBqKnk
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: base64
SGkgSGlsdG9uLAoKVGhhbmtzIHNvIG11Y2ghIEhhdmluZyB0aGUgdGVzdCBmaXhlcyBhcyBpdHMg
b3duIHBhdGNoZXMgbWFrZXMgY29tcGxldGUgc2Vuc2UuCgpJIHdpbGwgdHJ5IG9wZW4gYSBQUiB0
byBzZWUgaWYgdGhlIGZpeGVzIGNhbiBnZXQgdXBzdHJlYW1lZCwgYW5kIG9wZW4gYSBmdXR1cmUg
cGF0Y2ggb2YgaXQgZG9lcyBnZXQgbWVyZ2VkLgoKVGhhbmtzLApFbW1hCgotLS0tLS0tLSBPcmln
aW5hbCBNZXNzYWdlIC0tLS0tLS0tCk9uIDQgTm92IDIwMjMsIDEyOjE1LCBIaWx0b24gQ2hhaW4g
d3JvdGU6Cgo+IEhpIEVtbWEsIE9uIE1vbiwgMzAgT2N0IDIwMjMgMDQ6NDc6MzQgKzA4MDAsIEVt
bWEgVHVybmVyIHZpYSBHdWl4LXBhdGNoZXMgdmlhIHdyb3RlOiA+ID4gWzEgXSA+IFsyIF0gPiAq
IGdudS9wYWNrYWdlcy90cmVlLXNpdHRlci5zY20gKHRyZWUtc2l0dGVyLXlhbWwpOiBOZXcgdmFy
aWFibGUuID4gPiBDaGFuZ2UtSWQ6IElkNDgwNDBlZWUzMjViMGNkYjQzNWQ4NjkzY2FmNDhjOTY1
NGNmMTRjID4gLS0tID4gZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbSB8IDkgKysrKysrKysr
ID4gMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSA+ID4gZGlmZiAtLWdpdCBhL2dudS9w
YWNrYWdlcy90cmVlLXNpdHRlci5zY20gYi9nbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIuc2NtID4g
aW5kZXggNDEyNTdkNDJmMS4uNjA4ZjhiNjUxOSAxMDA2NDQgPiAtLS0gYS9nbnUvcGFja2FnZXMv
dHJlZS1zaXR0ZXIuc2NtID4gKysrIGIvZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNjbSA+IEBA
IC03LDYgKzcsNyBAQCA+IDs7OyBDb3B5cmlnaHQgwqkgMjAyMyBOaWNvbGFzIEdyYXZlcyAgPiA7
OzsgQ29weXJpZ2h0IMKpIDIwMjMgWmhlbmcgSnVuamllID4gOzs7IENvcHlyaWdodCDCqSAyMDIz
IFJhdmVuIEhhbGxzYnkgID4gKzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBFbW1hIFR1cm5lciAgPiA7
OzsgPiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguID4gOzs7ID4gQEAgLTYyOSwz
ICs2MzAsMTEgQEAgKGRlZmluZS1wdWJsaWMgdHJlZS1zaXR0ZXItc2NhbGEgPiAic2NhbGEiICJT
Y2FsYSIgPiAiMGhzNmdta3E1Y3g5cXJtZ2Z6MW1oMGMzNGZsd2ZmYzBrMm1od2YxM2xhYXdzd255
d2ZreiIgPiAiMC4yMC4yIikpID4gKyA+ICsoZGVmaW5lLXB1YmxpYyB0cmVlLXNpdHRlci15YW1s
ID4gKyAodHJlZS1zaXR0ZXItZ3JhbW1hciA+ICsgInlhbWwiICJZYW1sIiA+ICsgIjFheTRzbmtk
MnM0cGlkN3BjcjRiZ3gweTljajdiNXZsZ2Q3d2ZjMWowODk2bDBwNjFjamIiID4gKyAiMC41LjAi
ID4gKyAjOnJlcG9zaXRvcnktdXJsICJodHRwczovL2dpdGh1Yi5jb20vZW10dXJuZXIvdHJlZS1z
aXR0ZXIteWFtbCIgPiArICM6Y29tbWl0ICJmNTM4NTkyMDlmZWYwNjViNjc3OTk1ODAyODQyYTJi
NjUzMTRkZWZiIikpID4gPiBiYXNlLWNvbW1pdDogMmI1YzZlMWE0MWU0ZGRjZjRjZmE1M2EzMTll
ZDc4NGE4NTZlYWM1ZCA+IC0tID4gMi40MS4wIFRoZXJlIHNlZW0gdG8gYmUgZm9ybWF0dGluZyBp
c3N1ZSBpbiB5b3VyIHBhdGNoLCBtYWtpbmcgdGhlIGxhc3QgdHdvIGxpbmVzIGVtYmVkZGVkIGlu
dG8gb25lOiAiLS0yLjQxLjAiLiBZb3UgY2FuIGhhdmUgYSBsb29rIGF0IGl0IGluIFsxXS4gSSB0
aGluayB5b3VyIGNoYW5nZXMgY2FuIGJlIHNoaXBwZWQgYXMgYSBwYXRjaCB3aXRoIEd1aXguIE1h
eWJlIHlvdSBjYW4gb3BlbiBhIFBSIHRvIHVwc3RyZWFtIGFzIHdlbGw/IDopIEkgaGF2ZSBtb2Rp
ZmllZCB5b3VyIGNvbW1pdCBzaW5jZSB3ZSBkb24ndCBoYXZlIHRvIGNsb25lIHRoZSBzdWJtb2R1
bGUgYW5kIGdlbmVyYXRlZCBmaWxlcyBpbiBzcmMvIGFyZSBkZWxldGVkLiBJIHdpbGwgc2VuZCB2
MiBmb3IgdGhlIGNoYW5nZS4gVGhhbmtzIC0tLSBbMV06IGh0dHBzOi8vaXNzdWVzLmd1aXguZ251
Lm9yZy82NjgzNg==
--b1_8V4xONlStsthS2zWAapNZYLAprRK4fXmsslNBqKnk
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: base64
SGkgSGlsdG9uLDxicj48YnI+VGhhbmtzIHNvIG11Y2ghIEhhdmluZyB0aGUgdGVzdCBmaXhlcyBh
cyBpdHMgb3duIHBhdGNoZXMgbWFrZXMgY29tcGxldGUgc2Vuc2UuIDxicj48YnI+SSB3aWxsIHRy
eSBvcGVuIGEgUFIgdG8gc2VlIGlmIHRoZSBmaXhlcyBjYW4gZ2V0IHVwc3RyZWFtZWQsIGFuZCBv
cGVuIGEgZnV0dXJlIHBhdGNoIG9mIGl0IGRvZXMgZ2V0IG1lcmdlZC48YnI+PGJyPlRoYW5rcyw8
YnI+RW1tYTxicj48YnI+PGJyPjxicj4tLS0tLS0tLSBPcmlnaW5hbCBNZXNzYWdlIC0tLS0tLS0t
PGJyPk9uIDQgTm92IDIwMjMsIDEyOjE1LCBIaWx0b24gQ2hhaW4gPCBoYWtvQHVsdHJhcmFyZS5z
cGFjZT4gd3JvdGU6PGJsb2NrcXVvdGUgY2xhc3M9InByb3Rvbm1haWxfcXVvdGUiPjxicj5IaSBF
bW1hLA0KDQpPbiBNb24sIDMwIE9jdCAyMDIzIDA0OjQ3OjM0ICswODAwLA0KRW1tYSBUdXJuZXIg
dmlhIEd1aXgtcGF0Y2hlcyB2aWEgd3JvdGU6DQo+DQo+IFsxICA8dGV4dC9wbGFpbjsgdXRmLTgg
KGJhc2U2NCk+XQ0KPiBbMiAgPHRleHQvaHRtbDsgdXRmLTggKGJhc2U2NCk+XQ0KPiAqIGdudS9w
YWNrYWdlcy90cmVlLXNpdHRlci5zY20gKHRyZWUtc2l0dGVyLXlhbWwpOiBOZXcgdmFyaWFibGUu
DQo+DQo+IENoYW5nZS1JZDogSWQ0ODA0MGVlZTMyNWIwY2RiNDM1ZDg2OTNjYWY0OGM5NjU0Y2Yx
NGMNCj4gLS0tDQo+ICBnbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIuc2NtIHwgOSArKysrKysrKysN
Cj4gIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKykNCj4NCj4gZGlmZiAtLWdpdCBhL2du
dS9wYWNrYWdlcy90cmVlLXNpdHRlci5zY20gYi9nbnUvcGFja2FnZXMvdHJlZS1zaXR0ZXIuc2Nt
DQo+IGluZGV4IDQxMjU3ZDQyZjEuLjYwOGY4YjY1MTkgMTAwNjQ0DQo+IC0tLSBhL2dudS9wYWNr
YWdlcy90cmVlLXNpdHRlci5zY20NCj4gKysrIGIvZ251L3BhY2thZ2VzL3RyZWUtc2l0dGVyLnNj
bQ0KPiBAQCAtNyw2ICs3LDcgQEANCj4gIDs7OyBDb3B5cmlnaHQgwqkgMjAyMyBOaWNvbGFzIEdy
YXZlcyA8bmdyYXZlc0BuZ3JhdmVzLmZyPg0KPiAgOzs7IENvcHlyaWdodCDCqSAyMDIzIFpoZW5n
IEp1bmppZSA8ODczMjE2MDcxQHFxLmNvbT4NCj4gIDs7OyBDb3B5cmlnaHQgwqkgMjAyMyBSYXZl
biBIYWxsc2J5IDxrYXJsQGhhbGxzYnkuY29tPg0KPiArOzs7IENvcHlyaWdodCDCqSAyMDIzIEVt
bWEgVHVybmVyIDxtYWlsQGVtdHVybmVyLmNvLnVrPg0KPiAgOzs7DQo+ICA7OzsgVGhpcyBmaWxl
IGlzIHBhcnQgb2YgR05VIEd1aXguDQo+ICA7OzsNCj4gQEAgLTYyOSwzICs2MzAsMTEgQEAgKGRl
ZmluZS1wdWJsaWMgdHJlZS1zaXR0ZXItc2NhbGENCj4gICAgICJzY2FsYSIgIlNjYWxhIg0KPiAg
ICAgIjBoczZnbWtxNWN4OXFybWdmejFtaDBjMzRmbHdmZmMwazJtaHdmMTNsYWF3c3dueXdma3oi
DQo+ICAgICAiMC4yMC4yIikpDQo+ICsNCj4gKyhkZWZpbmUtcHVibGljIHRyZWUtc2l0dGVyLXlh
bWwNCj4gKyAgKHRyZWUtc2l0dGVyLWdyYW1tYXINCj4gKyAgICJ5YW1sIiAiWWFtbCINCj4gKyAg
ICIxYXk0c25rZDJzNHBpZDdwY3I0Ymd4MHk5Y2o3YjV2bGdkN3dmYzFqMDg5NmwwcDYxY2piIg0K
PiArICAgIjAuNS4wIg0KPiArICAgIzpyZXBvc2l0b3J5LXVybCAiaHR0cHM6Ly9naXRodWIuY29t
L2VtdHVybmVyL3RyZWUtc2l0dGVyLXlhbWwiDQo+ICsgICAjOmNvbW1pdCAiZjUzODU5MjA5ZmVm
MDY1YjY3Nzk5NTgwMjg0MmEyYjY1MzE0ZGVmYiIpKQ0KPg0KPiBiYXNlLWNvbW1pdDogMmI1YzZl
MWE0MWU0ZGRjZjRjZmE1M2EzMTllZDc4NGE4NTZlYWM1ZA0KPiAtLQ0KPiAyLjQxLjANCg0KDQpU
aGVyZSBzZWVtIHRvIGJlIGZvcm1hdHRpbmcgaXNzdWUgaW4geW91ciBwYXRjaCwgbWFraW5nIHRo
ZSBsYXN0IHR3byBsaW5lcw0KZW1iZWRkZWQgaW50byBvbmU6ICItLTIuNDEuMCIuICBZb3UgY2Fu
IGhhdmUgYSBsb29rIGF0IGl0IGluIFsxXS4NCg0KSSB0aGluayB5b3VyIGNoYW5nZXMgY2FuIGJl
IHNoaXBwZWQgYXMgYSBwYXRjaCB3aXRoIEd1aXguICBNYXliZSB5b3UgY2FuIG9wZW4gYQ0KUFIg
dG8gdXBzdHJlYW0gYXMgd2VsbD8gOikNCg0KSSBoYXZlIG1vZGlmaWVkIHlvdXIgY29tbWl0IHNp
bmNlIHdlIGRvbid0IGhhdmUgdG8gY2xvbmUgdGhlIHN1Ym1vZHVsZSBhbmQNCmdlbmVyYXRlZCBm
aWxlcyBpbiBzcmMvIGFyZSBkZWxldGVkLiAgSSB3aWxsIHNlbmQgdjIgZm9yIHRoZSBjaGFuZ2Uu
DQoNClRoYW5rcw0KLS0tDQpbMV06IGh0dHBzOi8vaXNzdWVzLmd1aXguZ251Lm9yZy82NjgzNg0K
PC9kaXY+
--b1_8V4xONlStsthS2zWAapNZYLAprRK4fXmsslNBqKnk--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
Resent-From: Hilton Chain <hako@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sun, 12 Nov 2023 15:04:01 +0000
Resent-Message-ID: <handler.66836.B66836.169980140332019 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Emma Turner <mail@HIDDEN>
Cc: 66836 <at> debbugs.gnu.org, Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-Debbugs-Original-Xcc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.169980140332019
(code B ref 66836); Sun, 12 Nov 2023 15:04:01 +0000
Received: (at 66836) by debbugs.gnu.org; 12 Nov 2023 15:03:23 +0000
Received: from localhost ([127.0.0.1]:56760 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r2Bzf-0008KN-4u
for submit <at> debbugs.gnu.org; Sun, 12 Nov 2023 10:03:23 -0500
Received: from mail.boiledscript.com ([144.168.59.46]:46622)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <hako@HIDDEN>) id 1r2Bzc-0008KE-DO
for 66836 <at> debbugs.gnu.org; Sun, 12 Nov 2023 10:03:21 -0500
Date: Sun, 12 Nov 2023 23:02:00 +0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space;
s=dkim; t=1699801163;
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=fhCQ8V6t0I6LNRBDnRD5dTI5KtjyEN8mGT4QXoXp9lo=;
b=pBd1qifvVdpN0KW/2yllBh+Tc3ruNl8PYxM39oAyHeykX0PtqdVO+DthfZkMbTm2UXXXX8
LkacHqi5sTEnlEJBdWLzUYqahJt8g542Vtv2mrQ3K3xJbTt2GauCWfTeiL1tNTOQa8eaQ/
t5IYHARMzmoeoo6RB2enKT2JFaTMpfKiwzrKKMYIlKE+kvc32jjoHwqp0kQmZNPN4PwN7J
1hvEUZB5+ZnlB4k/oEHbvVt5WZR8v+bRixDMHj7fK2+Gzij7Gq2bGhBWhxE5/RpWELHfd9
48GmfScaQErWYHBndJCuJ6xr62BCX95G/GCi5YR87Cg5T8E0ecYE896Xn9ybPg==
Authentication-Results: mail.boiledscript.com;
auth=pass smtp.mailfrom=hako@HIDDEN
Message-ID: <87wmun817b.wl-hako@HIDDEN>
From: Hilton Chain <hako@HIDDEN>
In-Reply-To: <75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-Spamd-Bar: /
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 Emma,
Tests currently fail on aarch64-linux[1], which can be reproduced with
`./pre-inst-env guix build tree-sitter-yaml --system=aarch64-linux`.
Any ideas?
On Sat, 04 Nov 2023 20:22:10 +0800,
Hilton Chain wrote:
>
> From: Emma Turner <mail@HIDDEN>
>
> * gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>
> Modified-by: Hilton Chain <hako@HIDDEN>
> Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
> ---
> gnu/local.mk | 1 +
> .../patches/tree-sitter-yaml-fix-tests.patch | 690 ++++++++++++++++++
> gnu/packages/tree-sitter.scm | 15 +
> 3 files changed, 706 insertions(+)
> create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
Thanks
---
[1]:
https://bordeaux.guix.gnu.org/build/206a6c33-c95a-4f7f-8e15-30e7b5662634/log
--8<---------------cut here---------------start------------->8---
--- expected / +++ actual
1. Spec Example 9.3. Bare Documents:
(stream
(document
(flow_node
(plain_scalar
(string_scalar))))
(comment)
(document)
(document
(block_node
+++ (block_scalar)))
+++ (MISSING _eof))
--- (block_scalar))))
2. Spec Example 9.5. Directives Documents:
(stream
(document
(yaml_directive
(yaml_version))
(block_node
(block_scalar)))
+++ (MISSING _eof))
--- (document
--- (yaml_directive
--- (yaml_version))
--- (comment)))
3. Zero indented block scalar:
(stream
(document
(block_node
+++ (block_scalar)))
+++ (MISSING _eof))
--- (block_scalar))))
4. Zero indented block scalar with line that looks like a comment:
(stream
(document
(block_node
+++ (block_scalar)))
+++ (MISSING _eof))
--- (block_scalar))))
--8<---------------cut here---------------end--------------->8---
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
Resent-From: Andrew Tropin <andrew@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 18 Nov 2023 07:43:02 +0000
Resent-Message-ID: <handler.66836.B66836.170029335619414 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Hilton Chain <hako@HIDDEN>, Emma Turner <mail@HIDDEN>
Cc: 66836 <at> debbugs.gnu.org
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.170029335619414
(code B ref 66836); Sat, 18 Nov 2023 07:43:02 +0000
Received: (at 66836) by debbugs.gnu.org; 18 Nov 2023 07:42:36 +0000
Received: from localhost ([127.0.0.1]:47718 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r4FyN-000534-Pd
for submit <at> debbugs.gnu.org; Sat, 18 Nov 2023 02:42:36 -0500
Received: from relay2-d.mail.gandi.net ([2001:4b98:dc4:8::222]:35335)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1r4FyJ-00052o-UV
for 66836 <at> debbugs.gnu.org; Sat, 18 Nov 2023 02:42:34 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id C25C040003;
Sat, 18 Nov 2023 07:42:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1700293344;
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=X/FSgjn+kBGqn5tJ2Jl0coKcVtU5IY3PoRCrtPWqEmk=;
b=dYyhIvt+awk3jjEuOVmPHveUhBv/XR797pseYPTLeDivj+PcGZZt0YQhQPBpGgaz3jyVT7
7+A5wdShz04iBDX3dzrXj7fHXOqTBSJ/R7tQzyrvn8uz4ee9dhglEwUm2PWwkIrUwdJI9b
/HgdzG1obaugdkNGRHDKVXJU19BK4iWMDi1pwkF2m6j/opMHgrjBqFzrG+SLe+5bATtC79
v5z9dZ1j/iJ/ED+XBsKH0y/k4X/dD/AG6f0Yb7BHGABz37wfo1FoE9v8dY+iU1nZn7SAxr
Zinb52+1qjt/BqOOsuSQ5j9iytkJZq+IIa+6pCEs/m76H+bIB8TW+odpF8QKiA==
From: Andrew Tropin <andrew@HIDDEN>
In-Reply-To: <87pm0pww8j.wl-hako@HIDDEN>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<87pm0pww8j.wl-hako@HIDDEN>
Date: Sat, 18 Nov 2023 11:42:20 +0400
Message-ID: <87zfzb33tv.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-GND-Sasl: andrew@HIDDEN
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
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 2023-11-04 20:15, Hilton Chain via Guix-patches via wrote:
> Hi Emma,
>
> On Mon, 30 Oct 2023 04:47:34 +0800,
> Emma Turner via Guix-patches via wrote:
>>
>> [1 <text/plain; utf-8 (base64)>]
>> [2 <text/html; utf-8 (base64)>]
>> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>>
>> Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c
>> ---
>> gnu/packages/tree-sitter.scm | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
>> index 41257d42f1..608f8b6519 100644
>> --- a/gnu/packages/tree-sitter.scm
>> +++ b/gnu/packages/tree-sitter.scm
>> @@ -7,6 +7,7 @@
>> ;;; Copyright =C2=A9 2023 Nicolas Graves <ngraves@HIDDEN>
>> ;;; Copyright =C2=A9 2023 Zheng Junjie <873216071@HIDDEN>
>> ;;; Copyright =C2=A9 2023 Raven Hallsby <karl@HIDDEN>
>> +;;; Copyright =C2=A9 2023 Emma Turner <mail@HIDDEN>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> @@ -629,3 +630,11 @@ (define-public tree-sitter-scala
>> "scala" "Scala"
>> "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
>> "0.20.2"))
>> +
>> +(define-public tree-sitter-yaml
>> + (tree-sitter-grammar
>> + "yaml" "Yaml"
>> + "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb"
>> + "0.5.0"
>> + #:repository-url "https://github.com/emturner/tree-sitter-yaml"
>> + #:commit "f53859209fef065b677995802842a2b65314defb"))
>>
>> base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
>> --
>> 2.41.0
>
>
> There seem to be formatting issue in your patch, making the last two lines
> embedded into one: "--2.41.0". You can have a look at it in [1].
>
> I think your changes can be shipped as a patch with Guix. Maybe you can =
open a
> PR to upstream as well? :)
It seems that https://github.com/ikatyang/tree-sitter-yaml is
unmaintained, that's probably why I didn't add this grammar earlier.
So maybe forking and taking a maintainance is not a bad idea.
>
> I have modified your commit since we don't have to clone the submodule and
> generated files in src/ are deleted. I will send v2 for the change.
>
> Thanks
> ---
> [1]: https://issues.guix.gnu.org/66836
>
>
>
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmVYatwACgkQIgjSCVjB
3rDnzA/+JGq8xPe9aPt/xR9ppohoG726AYhtfUZ/tAs3jxxXWGco0a3xhMAxPw1O
ll9EKLB59q3BN1wYTQ2HWwLk5qrtRVRNis/Sl/r37zi5J9I7ReJ5oYdKApNypHme
aMc35AOOlc11krpjbBW959e/68FUiIc7xVqpkG0ujzNaN85yM5Tj3jBR7HSMDw72
41RcKKa3By7lZaRV0rbxBBPUl1UrpCBALyWZXyjAkvSxLjhGqYCu2hizdHzy7exW
i8VVe3880aP/sIqFb4d8WSESFyX0C7IN028bjpKu3wn86UufSB9Gn2hzMrDsMJuH
525OdQAfVMCKM06JslYEWoX1Cz2duHoo9CoJ0kYTKjnYuK786PUhsZ+o1AKLf1Cn
pjUwbUIUM5aCDhLQmIEaJwIOw4RPlsm/dGtYyChjfsWGXMdUgTxBXAZIlCkP3RHq
2IKnrvZSvGFITUncWyO3w1rhEjIL+KoyXrsfDFbvJX0kelmceWHvIv69YIZqGBJs
1Q+hzNxaZj7Da5d7Eu9v5ySBvCiBYBcXqArYG0Oo9UKLxhfTbozqHxh/I/DpOgkT
rqrlno/XegUZDQArV3I9IA03yTA4ut9qKS3MdJhNmXYG4rkuZfAypcKPJhonnzOl
mTUAKuUJXtsq4jk5YZJuhNZK+J+sqJgQirQz87Xid3JZ5Xe+lNU=
=YPU8
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
Resent-From: Hilton Chain <hako@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 18 Nov 2023 10:46:02 +0000
Resent-Message-ID: <handler.66836.B66836.17003043614668 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Andrew Tropin <andrew@HIDDEN>
Cc: Emma Turner <mail@HIDDEN>, 66836 <at> debbugs.gnu.org
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.17003043614668
(code B ref 66836); Sat, 18 Nov 2023 10:46:02 +0000
Received: (at 66836) by debbugs.gnu.org; 18 Nov 2023 10:46:01 +0000
Received: from localhost ([127.0.0.1]:47879 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r4Ips-0001DE-RU
for submit <at> debbugs.gnu.org; Sat, 18 Nov 2023 05:46:01 -0500
Received: from mail.boiledscript.com ([144.168.59.46]:40042)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <hako@HIDDEN>) id 1r4Ipq-0001D4-5q
for 66836 <at> debbugs.gnu.org; Sat, 18 Nov 2023 05:45:59 -0500
Date: Sat, 18 Nov 2023 18:45:48 +0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space;
s=dkim; t=1700304148;
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=QI5LFvJmZrKK8UkaOoVnAgwvZo5LsIgPHVb8FVtHrRs=;
b=lPAR4K7EnZaSledHsJQ2v+xfAc23Bkzb0RliawMbSIwfo1GAgJxh/fysAAbA2S+Ed4NA3o
TQzpBIZh0NUrUiITaCSxwYgxpoYXcxK7GsyfSqY0232WzHfpsaouZqaN5M5HPneZmRnxWh
fgqPZYYUnr3mLlO6l7sW48/WGURoSIfBXZKWLfqBJAimJYQIYEPDqh+TDunKgXD4Z9mna0
FbxVpdeZ8nCvsnGShbTec+MP+z+T3IBlCYqhHlolt1P77te4RbnAPTgPxONl86NBgJymK4
tkp+kT57icPVsXMxPwBfRCPQzW7SHe5p6oVUqOo0H4g1thGGeblcui/zzxqrFw==
Authentication-Results: mail.boiledscript.com;
auth=pass smtp.mailfrom=hako@HIDDEN
Message-ID: <87fs13z6eb.wl-hako@HIDDEN>
From: Hilton Chain <hako@HIDDEN>
In-Reply-To: <87zfzb33tv.fsf@HIDDEN>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<87pm0pww8j.wl-hako@HIDDEN> <87zfzb33tv.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-Spamd-Bar: /
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 Andrew,
On Sat, 18 Nov 2023 15:42:20 +0800,
Andrew Tropin wrote:
>
> > There seem to be formatting issue in your patch, making the last two lines
> > embedded into one: "--2.41.0". You can have a look at it in [1].
> >
> > I think your changes can be shipped as a patch with Guix. Maybe you can open a
> > PR to upstream as well? :)
>
> It seems that https://github.com/ikatyang/tree-sitter-yaml is
> unmaintained, that's probably why I didn't add this grammar earlier.
>
> So maybe forking and taking a maintainance is not a bad idea.
I have found the first tree-sitter commit causing the test failures, it's
0fb864c1a0a5a53a951e3bf830fdbdc5edac385d (v0.20.4-9-g0fb864c1), there's also
open issue for it[1].
And the tree-sitter-yaml repository actually has some relevant activity this
July[2].
Thanks
---
[1]:
Regression in YAML parsing with web-tree-sitter + tree-sitter-yaml
https://github.com/tree-sitter/tree-sitter/issues/2339
[2]:
https://github.com/ikatyang/tree-sitter-yaml/tree/feat/error-recovery
Received: (at control) by debbugs.gnu.org; 25 Feb 2025 21:52:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 25 16:52:56 2025 Received: from localhost ([127.0.0.1]:48748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tn2rH-00042x-LD for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 16:52:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57419) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <o.rojon@HIDDEN>) id 1tn2rD-00042e-Ul for control <at> debbugs.gnu.org; Tue, 25 Feb 2025 16:52:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 04952240101 for <control <at> debbugs.gnu.org>; Tue, 25 Feb 2025 22:52:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1740520365; bh=IMOFvOfsFzOgtTYLYgXsodo+99K6bihFyVym9dcPB/M=; h=Date:Message-Id:To:From:Subject:From; b=QYluUT9vEMxGgWwhfM723BCKu345GQuJMxrUAuvGuBXY9yLpaD2QMdT0vOU62I8ZD rJTIvew78thrkRjkJBdvht9nddkpxYotVS52AtPI40cMebjlPyUxc2XZpWyq2Fbk9S ovYyhR5g+xTrZ6ZewijLJIqC9cnHfHfLbFm0ZFlYwFrB05TDm/eM/0Bi1Wc6n0HU/o bArT5LR2ocCn13adcKaxlUm1/O6OOnUZkYa7oQjUVQKD86ZDQkggENDztlygVTqmHO DS0XbLFkVpgR8Gic6tXRaiBdh3v3WTVAe4/Li2Y0PSyAh7bzxD3OlAtpICAz7GFIVe bCRu9EmZEwWdQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Z2WYR6NKzz9rxK for <control <at> debbugs.gnu.org>; Tue, 25 Feb 2025 22:52:43 +0100 (CET) Date: Tue, 25 Feb 2025 21:52:42 +0000 Message-Id: <87bjup66ad.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Olivier Rojon <o.rojon@HIDDEN> Subject: control message for bug #66836 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?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 (---) tags 66836 + moreinfo quit
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
Resent-From: Olivier Rojon <o.rojon@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 22:05:02 +0000
Resent-Message-ID: <handler.66836.B66836.174052106329081 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch moreinfo
To: Hilton Chain <hako@HIDDEN>
Cc: Emma Turner <mail@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, 66836 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Andrew Tropin <andrew@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.174052106329081
(code B ref 66836); Tue, 25 Feb 2025 22:05:02 +0000
Received: (at 66836) by debbugs.gnu.org; 25 Feb 2025 22:04:23 +0000
Received: from localhost ([127.0.0.1]:48760 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn32N-0007Yz-4r
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 17:04:23 -0500
Received: from mout01.posteo.de ([185.67.36.65]:41761)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <o.rojon@HIDDEN>)
id 1tn32K-0007YY-2G
for 66836 <at> debbugs.gnu.org; Tue, 25 Feb 2025 17:04:21 -0500
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 65724240027
for <66836 <at> debbugs.gnu.org>; Tue, 25 Feb 2025 23:04:10 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1740521051; bh=crB3YMT4QzG5nnb+KnntpkNyMGqw3ty0D+fM+P4w09k=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type:
From;
b=JrdNrds+LhNxhwmWGuGfA/BOMwZ13DxwFucEOU2kWkj+Opqic802a8bpad+MEY2Mh
b7VEywiSEaeoJxKPoXu8jeeHcm5AQ4Q+MEBBIxxUYJbsPLlrGrZzeJvrLqYBi7sIz0
H1VBTbWpAnKH8mHVE72T65VcZjPcyE24DJOcTqgOELc/wR/Q6Zhu3OPlObn+3GU7If
Rag3ESBHJ66ciEf+gPTAUM5cOppEvbHQeKUccN+FBMbknbfZ0AcwCZRWAi5fKQK559
jAGCyUznD54W18UGmXMoqAGlgF2qttmw5da1pogsV9iUDXt0cGu7aNbj19Pd0d8tI/
KyndB0foF4lSw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4Z2Wpf0XX5z9rxR;
Tue, 25 Feb 2025 23:04:10 +0100 (CET)
From: Olivier Rojon <o.rojon@HIDDEN>
In-Reply-To: <87wmun817b.wl-hako@HIDDEN> (Hilton Chain's message of
"Sun, 12 Nov 2023 23:02:00 +0800")
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
<87wmun817b.wl-hako@HIDDEN>
Date: Tue, 25 Feb 2025 22:04:09 +0000
Message-ID: <878qpt65ra.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?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 everyone,
soo.... it has been a while since there has been some activity. I have checked and
couldn't find another effort to get tree-sitter-yaml packaged (that is, no duplicates).
Did anyone of you have spare time to look more into this? I am very intersted to get this
package into the guix codebase, and it seems there has been more recent activity not only
in the original repository (https://github.com/ikatyang/tree-sitter-yaml), but even more
recently, there has been activity in another repository which is a fork of the original
one (https://github.com/tree-sitter-grammars/tree-sitter-yaml).
I have spent a short amount of time trying to get either of them to package, but that
didn't result in any tangible results (all attempts failed, I didn't know what the problem
was, I gave up).
However, I'd be motivated to try to get it done together, so if any of you is on board,
let's get it on ;-)
Have a good day, fellows :-)
Hilton Chain <hako@HIDDEN> writes:
> Hi Emma,
>
> Tests currently fail on aarch64-linux[1], which can be reproduced with
> `./pre-inst-env guix build tree-sitter-yaml --system=aarch64-linux`.
>
> Any ideas?
>
> On Sat, 04 Nov 2023 20:22:10 +0800,
> Hilton Chain wrote:
>>
>> From: Emma Turner <mail@HIDDEN>
>>
>> * gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Register it.
>> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>>
>> Modified-by: Hilton Chain <hako@HIDDEN>
>> Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
>> ---
>> gnu/local.mk | 1 +
>> .../patches/tree-sitter-yaml-fix-tests.patch | 690 ++++++++++++++++++
>> gnu/packages/tree-sitter.scm | 15 +
>> 3 files changed, 706 insertions(+)
>> create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
>
> Thanks
> ---
> [1]:
> https://bordeaux.guix.gnu.org/build/206a6c33-c95a-4f7f-8e15-30e7b5662634/log
>
> --- expected / +++ actual
>
> 1. Spec Example 9.3. Bare Documents:
>
> (stream
> (document
> (flow_node
> (plain_scalar
> (string_scalar))))
> (comment)
> (document)
> (document
> (block_node
> +++ (block_scalar)))
> +++ (MISSING _eof))
> --- (block_scalar))))
>
>
> 2. Spec Example 9.5. Directives Documents:
>
> (stream
> (document
> (yaml_directive
> (yaml_version))
> (block_node
> (block_scalar)))
> +++ (MISSING _eof))
> --- (document
> --- (yaml_directive
> --- (yaml_version))
> --- (comment)))
>
>
> 3. Zero indented block scalar:
>
> (stream
> (document
> (block_node
> +++ (block_scalar)))
> +++ (MISSING _eof))
> --- (block_scalar))))
>
>
> 4. Zero indented block scalar with line that looks like a comment:
>
> (stream
> (document
> (block_node
> +++ (block_scalar)))
> +++ (MISSING _eof))
> --- (block_scalar))))
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
Resent-From: Olivier Rojon <o.rojon@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 02 Mar 2025 19:29:02 +0000
Resent-Message-ID: <handler.66836.B66836.174094371410050 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch moreinfo
To: 66836 <at> debbugs.gnu.org
Cc: Emma Turner <mail@HIDDEN>, hako@HIDDEN, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Andrew Tropin <andrew@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.174094371410050
(code B ref 66836); Sun, 02 Mar 2025 19:29:02 +0000
Received: (at 66836) by debbugs.gnu.org; 2 Mar 2025 19:28:34 +0000
Received: from localhost ([127.0.0.1]:35712 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1toozJ-0002c1-4a
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 14:28:33 -0500
Received: from mout02.posteo.de ([185.67.36.66]:48291)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <o.rojon@HIDDEN>)
id 1toozD-0002ah-Ul
for 66836 <at> debbugs.gnu.org; Sun, 02 Mar 2025 14:28:31 -0500
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 924DB240101
for <66836 <at> debbugs.gnu.org>; Sun, 2 Mar 2025 20:28:20 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1740943700; bh=LU7BSBtOWpHRhiUWfUHYKp0u3LwTAmpqDbG42yJd0F8=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type:
From;
b=BBHbS2R4WWOCbFZW3UY0t1RvgBzWA5pphVaSqWtv3s9pD/GS5DxmDS1ToVgi6DI9e
KxRcjMEQbcrSWjQA+QwpDcoQAo2asp1p5jbtKoqKr6ato+8tXtSI+TbHnyW8PeN5IB
1XvJVPMqr4RS6s/rp06sLTLPbpP0diOoRVlZZhbIhN6hieVPKr8rwTqKjLyskSXt6z
QweSkClHKDZphOTQiyXGZGKg+fXZYJM0thxzklsP3wfVx3Rr+SC4j76Wfe4jBO4yTC
DSgZNIwyfAaCJiIMNy3xy9XSbJEeazW7APcN2KNVL5Ii8+A/LfhOtBTjQ43+k+DsAm
bD1ikCg1CVYhw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4Z5X6W2T1wz6tyy;
Sun, 2 Mar 2025 20:28:19 +0100 (CET)
From: Olivier Rojon <o.rojon@HIDDEN>
In-Reply-To: <878qpt65ra.fsf@HIDDEN> (Olivier Rojon's message of "Tue, 25
Feb 2025 22:04:09 +0000")
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
<87wmun817b.wl-hako@HIDDEN> <878qpt65ra.fsf@HIDDEN>
Date: Sun, 02 Mar 2025 19:28:11 +0000
Message-ID: <87ldtnw7uc.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?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 (---)
Hej fellows,
I've tried for some time to get it packaged but rather quickly hit a road block because I
am simply not well versed in the domain. Find below the code I managed to come up after a
bit of experimentation.
```
(define-public tree-sitter-yaml
(tree-sitter-grammar
"yaml" "YAML"
"0z5fz9hiafzapi0ijhyz8np6rksq6c1pb16xv1vhnlfh75rg6zyv"
"0.7.0"
#:repository-url
"https://github.com/tree-sitter-grammars/tree-sitter-yaml"))
```
Surprisingly, it started by downloading nodejs 22.10 which didn't happen for other
tree-sitter grammars I tried building for reference. The build fails in the build phase,
this is the output:
```
starting phase `build'
/tmp/guix-build-tree-sitter-yaml-0.7.0.drv-0/source/grammar.js:674
for (const [rule_name, rule] of Object.entries(grammar_json.rules)) {
^
TypeError: Cannot read properties of undefined (reading 'rules')
at global_alias (/tmp/guix-build-tree-sitter-yaml-0.7.0.drv-0/source/grammar.js:674:63)
at Object.<anonymous> (/tmp/guix-build-tree-sitter-yaml-0.7.0.drv-0/source/grammar.js:566:39)
at Module._compile (node:internal/modules/cjs/loader:1565:14)
at Object..js (node:internal/modules/cjs/loader:1708:10)
at Module.load (node:internal/modules/cjs/loader:1318:32)
at Function._load (node:internal/modules/cjs/loader:1128:12)
at TracingChannel.traceSync (node:diagnostics_channel:322:14)
at wrapModuleLoad (node:internal/modules/cjs/loader:219:24)
at Module.require (node:internal/modules/cjs/loader:1340:12)
at require (node:internal/modules/helpers:138:16)
Node.js v22.12.0
Node process exited with status 1
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "tree-sitter" arguments: ("generate" "--no-bindings") exit-status:
phase `build' failed after 0.0 seconds
command "tree-sitter" "generate" "--no-bindings" failed with status 1
build process 18 exited with status 256
builder for `/gnu/store/mhslv5phv7yic1rv91pq4kiqyhkzgvi1-tree-sitter-yaml-0.7.0.drv' failed with exit c
build of /gnu/store/mhslv5phv7yic1rv91pq4kiqyhkzgvi1-tree-sitter-yaml-0.7.0.drv failed
Could not find build log for '/gnu/store/mhslv5phv7yic1rv91pq4kiqyhkzgvi1-tree-sitter-yaml-0.7.0.drv'.
guix build: error: build of `/gnu/store/mhslv5phv7yic1rv91pq4kiqyhkzgvi1-tree-sitter-yaml-0.7.0.drv' fa
```
I also tried building the newest commit from the originally mentioned repository:
https://github.com/ikatyang/tree-sitter-yaml. This initially looks more promising but
then there is several errors regarding indentation and some other INVALID entries which
also results in a build failure.
I am afraid this is what I have to offer when it comes to trying to support the packaging
endeavour. Maybe someone of you guys knows more about tree-sitter grammars than I do and
can chime in.
Have a good day,
Olivier
Olivier Rojon <o.rojon@HIDDEN> writes:
> Hello everyone,
>
> soo.... it has been a while since there has been some activity. I have checked and
> couldn't find another effort to get tree-sitter-yaml packaged (that is, no duplicates).
>
> Did anyone of you have spare time to look more into this? I am very intersted to get this
> package into the guix codebase, and it seems there has been more recent activity not only
> in the original repository (https://github.com/ikatyang/tree-sitter-yaml), but even more
> recently, there has been activity in another repository which is a fork of the original
> one (https://github.com/tree-sitter-grammars/tree-sitter-yaml).
>
> I have spent a short amount of time trying to get either of them to package, but that
> didn't result in any tangible results (all attempts failed, I didn't know what the problem
> was, I gave up).
>
> However, I'd be motivated to try to get it done together, so if any of you is on board,
> let's get it on ;-)
>
> Have a good day, fellows :-)
>
> Hilton Chain <hako@HIDDEN> writes:
>
>> Hi Emma,
>>
>> Tests currently fail on aarch64-linux[1], which can be reproduced with
>> `./pre-inst-env guix build tree-sitter-yaml --system=aarch64-linux`.
>>
>> Any ideas?
>>
>> On Sat, 04 Nov 2023 20:22:10 +0800,
>> Hilton Chain wrote:
>>>
>>> From: Emma Turner <mail@HIDDEN>
>>>
>>> * gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
>>> * gnu/local.mk (dist_patch_DATA): Register it.
>>> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>>>
>>> Modified-by: Hilton Chain <hako@HIDDEN>
>>> Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
>>> ---
>>> gnu/local.mk | 1 +
>>> .../patches/tree-sitter-yaml-fix-tests.patch | 690 ++++++++++++++++++
>>> gnu/packages/tree-sitter.scm | 15 +
>>> 3 files changed, 706 insertions(+)
>>> create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
>>
>> Thanks
>> ---
>> [1]:
>> https://bordeaux.guix.gnu.org/build/206a6c33-c95a-4f7f-8e15-30e7b5662634/log
>>
>> --- expected / +++ actual
>>
>> 1. Spec Example 9.3. Bare Documents:
>>
>> (stream
>> (document
>> (flow_node
>> (plain_scalar
>> (string_scalar))))
>> (comment)
>> (document)
>> (document
>> (block_node
>> +++ (block_scalar)))
>> +++ (MISSING _eof))
>> --- (block_scalar))))
>>
>>
>> 2. Spec Example 9.5. Directives Documents:
>>
>> (stream
>> (document
>> (yaml_directive
>> (yaml_version))
>> (block_node
>> (block_scalar)))
>> +++ (MISSING _eof))
>> --- (document
>> --- (yaml_directive
>> --- (yaml_version))
>> --- (comment)))
>>
>>
>> 3. Zero indented block scalar:
>>
>> (stream
>> (document
>> (block_node
>> +++ (block_scalar)))
>> +++ (MISSING _eof))
>> --- (block_scalar))))
>>
>>
>> 4. Zero indented block scalar with line that looks like a comment:
>>
>> (stream
>> (document
>> (block_node
>> +++ (block_scalar)))
>> +++ (MISSING _eof))
>> --- (block_scalar))))
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 03 Mar 2025 12:23:01 +0000
Resent-Message-ID: <handler.66836.B66836.174100456311272 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch moreinfo
To: Olivier Rojon <o.rojon@HIDDEN>, 66836 <at> debbugs.gnu.org
Cc: Emma Turner <mail@HIDDEN>, hako@HIDDEN, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Andrew Tropin <andrew@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.174100456311272
(code B ref 66836); Mon, 03 Mar 2025 12:23:01 +0000
Received: (at 66836) by debbugs.gnu.org; 3 Mar 2025 12:22:43 +0000
Received: from localhost ([127.0.0.1]:45685 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tp4ol-0002vi-Eq
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 07:22:43 -0500
Received: from 8.mo561.mail-out.ovh.net ([87.98.172.249]:60483)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1tp4og-0002vQ-Gj
for 66836 <at> debbugs.gnu.org; Mon, 03 Mar 2025 07:22:40 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.148.6])
by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Z5ycq3zLXz1VV3
for <66836 <at> debbugs.gnu.org>; Mon, 3 Mar 2025 12:22:34 +0000 (UTC)
Received: from ghost-submission-5b5ff79f4f-7xgmx (unknown [10.108.54.44])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6F9891FEB5;
Mon, 3 Mar 2025 12:22:33 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.103])
by ghost-submission-5b5ff79f4f-7xgmx with ESMTPSA
id V7DNBAmfxWfjmwAA4N1SOw
(envelope-from <ngraves@HIDDEN>); Mon, 03 Mar 2025 12:22:33 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G0051b0d00ce-cdb4-4d6a-a0bd-db092a181068,
3FD0527DE2CE9D3C35B0E9483E243F320C79A24B) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 80.215.110.12
From: Nicolas Graves <ngraves@HIDDEN>
In-Reply-To: <87ldtnw7uc.fsf@HIDDEN>
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
<75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@HIDDEN>
<87wmun817b.wl-hako@HIDDEN> <878qpt65ra.fsf@HIDDEN>
<87ldtnw7uc.fsf@HIDDEN>
Date: Mon, 03 Mar 2025 13:22:32 +0100
Message-ID: <87wmd6mhh3.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Ovh-Tracer-Id: 11459972205277340251
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: -100
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelleduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeevkeelueejtdehgfffkeelkefhhffftefgvdehkeeluefhheeuleejtdejhfdvgfenucfkphepuddvjedrtddrtddruddpkedtrddvudehrdduuddtrdduvddpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeikeefieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=Im/WuXpuTrbuMp7JbS4cOMNNhFz1I7rlgb76yVf3krs=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1741004555; v=1;
b=HpeOY1JtwuzWVZY42LGuJcknCKYJTzS5L+TKwNDzUu+xYftM4RBKTIMer2D/qHtHkJBYFZbd
pIFzN7WSJBLGMM9Jh+hkP0dSeVwyUuC2by+v+/ujSrads78aNU67GZyPGVE/htZ1X7r413Cu21J
Ys+OAoi1NKFTwiNSwpEBchi9KuT0hfZO8EbPMXm1ADmheFNcc7cUScEoC/0ybAVezomE9QJk5dJ
uDgTJfrgCEBVvyqghFabrr+hFWk+LFy++2NSKjcUKQIi6Ed6N0ZHtSHjJzLDWyihTATkQoddDVW
ElvTkyaMDV1K664XOrLsEYn1sZLqSN4Gyr55G7FcGxtwQ==
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=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 (-)
This version seems to compile on my side :
(define-public tree-sitter-yaml
(tree-sitter-grammar
"yaml" "YAML"
"0z5fz9hiafzapi0ijhyz8np6rksq6c1pb16xv1vhnlfh75rg6zyv" "0.7.0"
#:grammar-directories '("schema/core" "schema/json")
#:get-cleanup-snippet
(lambda _
#~(begin
(use-modules (guix build utils))
(delete-file-recursively "bindings")))))
Haven't tried it in real conditions though ;)
--
Best regards,
Nicolas Graves
X-Loop: help-debbugs@HIDDEN
Subject: [bug#66836] [PATCH v3] gnu: Add tree-sitter-yaml.
References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
In-Reply-To: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk>
Resent-From: Olivier Rojon <o.rojon@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 12 Mar 2025 19:11:02 +0000
Resent-Message-ID: <handler.66836.B66836.174180662728326 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 66836
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch moreinfo
To: 66836 <at> debbugs.gnu.org
Cc: Olivier Rojon <o.rojon@HIDDEN>
Received: via spool by 66836-submit <at> debbugs.gnu.org id=B66836.174180662728326
(code B ref 66836); Wed, 12 Mar 2025 19:11:02 +0000
Received: (at 66836) by debbugs.gnu.org; 12 Mar 2025 19:10:27 +0000
Received: from localhost ([127.0.0.1]:51718 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tsRTG-0007Mo-Pz
for submit <at> debbugs.gnu.org; Wed, 12 Mar 2025 15:10:27 -0400
Received: from mout02.posteo.de ([185.67.36.66]:50675)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <o.rojon@HIDDEN>)
id 1tsRTE-0007MV-5I
for 66836 <at> debbugs.gnu.org; Wed, 12 Mar 2025 15:10:25 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 65770240101
for <66836 <at> debbugs.gnu.org>; Wed, 12 Mar 2025 20:10:17 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1741806617; bh=UjF6j2OLQ3nZmUkcQxnJX8gz6GMrwnvB9kdIWrwH2d8=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=Jcv2V6bmfFM1zBbyA7IQDnGV/iInBe+lyvtYmOAY5FtipuT4W+qOxYEqZExDLVEPd
G+bhULNH4JITU3W8pizhv8LGm87uPhcRxuFv5McGftpNzqycAf5GXMO9RaScQZaPvo
mGSVozCG4HHthuwLDQLnlG+ol+7xpESYCNwEnt6j0aX9eO1xUsWNvdrLqreHWDUyuK
QnWPCp0TxLgwuW0+p6VqfBRBMmI9+0WV6J7QDbEfWUsBMFZ2GMry7NL6EK1ZoPRunz
8LwH1DSXcM0oJaireLQoK/cmXiaGvtdFOF7fO9KL4SRPHCwB3+nA/PvcLh475pSrt9
bor5WiCKElBZg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4ZCgF504DHz9rxG;
Wed, 12 Mar 2025 20:10:16 +0100 (CET)
From: Olivier Rojon <o.rojon@HIDDEN>
Date: Wed, 12 Mar 2025 19:10:04 +0000
Message-ID: <20250312191004.92666-1-o.rojon@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?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 (---)
* gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
Change-Id: I2bc2ad26dba4b4a16cdc738fca867854da225442
---
gnu/packages/tree-sitter.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 19e32f53f1..da2cdec775 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -814,3 +814,14 @@ (define-public tree-sitter-vhdl
(("\\(integer_decimal\n") "(integer_decimal)\n")
(("\\(integer\\)") "")
(("\"0\")") "\"0\"")))))))
+
+(define-public tree-sitter-yaml
+ (tree-sitter-grammar
+ "yaml" "YAML"
+ "0z5fz9hiafzapi0ijhyz8np6rksq6c1pb16xv1vhnlfh75rg6zyv" "0.7.0"
+ #:grammar-directories '("schema/core" "schema/json")
+ #:get-cleanup-snippet
+ (lambda _
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "bindings")))))
--
2.48.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.