Package: guix-patches;
Reported by: Emma Turner <mail <at> emturner.co.uk>
Date: Mon, 30 Oct 2023 16:36:02 UTC
Severity: normal
Tags: moreinfo, patch
Done: Hilton Chain <hako <at> ultrarare.space>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66836 in the body.
You can then email your comments to 66836 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Mon, 30 Oct 2023 16:36:03 GMT) Full text and rfc822 format available.Emma Turner <mail <at> emturner.co.uk>:guix-patches <at> gnu.org.
(Mon, 30 Oct 2023 16:36:03 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Emma Turner <mail <at> emturner.co.uk> To: "guix-patches <at> gnu.org" <guix-patches <at> gnu.org> Subject: [Patch] gnu: Add tree-sitter-yaml. Date: Sun, 29 Oct 2023 20:47:34 +0000
[Message part 1 (text/plain, inline)]
* 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 © 2023 Nicolas Graves <ngraves <at> ngraves.fr> ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> ;;; Copyright © 2023 Raven Hallsby <karl <at> hallsby.com> +;;; Copyright © 2023 Emma Turner <mail <at> emturner.co.uk> ;;; ;;; 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
[Message part 2 (text/html, inline)]
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sat, 04 Nov 2023 12:17:02 GMT) Full text and rfc822 format available.Message #8 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: Emma Turner <mail <at> emturner.co.uk> Cc: 66836 <at> debbugs.gnu.org Subject: Re: [bug#66836] [Patch] gnu: Add tree-sitter-yaml. Date: Sat, 04 Nov 2023 20:15:08 +0800
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 © 2023 Nicolas Graves <ngraves <at> ngraves.fr> > ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> > ;;; Copyright © 2023 Raven Hallsby <karl <at> hallsby.com> > +;;; Copyright © 2023 Emma Turner <mail <at> emturner.co.uk> > ;;; > ;;; 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? :) 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
mail <at> emturner.co.uk, hako <at> ultrarare.space, andrew <at> trop.in, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sat, 04 Nov 2023 12:24:02 GMT) Full text and rfc822 format available.Message #11 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: 66836 <at> debbugs.gnu.org Cc: Emma Turner <mail <at> emturner.co.uk>, Hilton Chain <hako <at> ultrarare.space> Subject: [PATCH v2] gnu: Add tree-sitter-yaml. Date: Sat, 4 Nov 2023 20:22:10 +0800
From: Emma Turner <mail <at> emturner.co.uk>
* 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 <at> ultrarare.space>
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 <at> emturner.co.uk>
+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 <at> ngraves.fr>
;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2023 Raven Hallsby <karl <at> hallsby.com>
+;;; Copyright © 2023 Emma Turner <mail <at> emturner.co.uk>
;;;
;;; 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
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sat, 04 Nov 2023 18:07:02 GMT) Full text and rfc822 format available.Message #14 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Emma Turner <mail <at> emturner.co.uk> To: hako <at> ultrarare.space Cc: 66836 <at> debbugs.gnu.org Subject: Re: [bug#66836] [Patch] gnu: Add tree-sitter-yaml. Date: Sat, 04 Nov 2023 18:05:45 +0000
[Message part 1 (text/plain, inline)]
Hi Hilton, Thanks so much! Having the test fixes as its own patches makes complete sense. I will try open a PR to see if the fixes can get upstreamed, and open a future patch of it does get merged. Thanks, Emma -------- Original Message -------- On 4 Nov 2023, 12:15, Hilton Chain wrote: > Hi Emma, On Mon, 30 Oct 2023 04:47:34 +0800, Emma Turner via Guix-patches via wrote: > > [1 ] > [2 ] > * 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 © 2023 Nicolas Graves > ;;; Copyright © 2023 Zheng Junjie > ;;; Copyright © 2023 Raven Hallsby > +;;; Copyright © 2023 Emma Turner > ;;; > ;;; 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? :) 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
[Message part 2 (text/html, inline)]
andrew <at> trop.in, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sun, 12 Nov 2023 15:04:01 GMT) Full text and rfc822 format available.Message #17 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: Emma Turner <mail <at> emturner.co.uk> Cc: 66836 <at> debbugs.gnu.org Subject: Re: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml. Date: Sun, 12 Nov 2023 23:02:00 +0800
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 <at> emturner.co.uk>
>
> * 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 <at> ultrarare.space>
> 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---
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sat, 18 Nov 2023 07:43:02 GMT) Full text and rfc822 format available.Message #20 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Tropin <andrew <at> trop.in> To: Hilton Chain <hako <at> ultrarare.space>, Emma Turner <mail <at> emturner.co.uk> Cc: 66836 <at> debbugs.gnu.org Subject: Re: [bug#66836] [Patch] gnu: Add tree-sitter-yaml. Date: Sat, 18 Nov 2023 11:42:20 +0400
[Message part 1 (text/plain, inline)]
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 © 2023 Nicolas Graves <ngraves <at> ngraves.fr> >> ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> >> ;;; Copyright © 2023 Raven Hallsby <karl <at> hallsby.com> >> +;;; Copyright © 2023 Emma Turner <mail <at> emturner.co.uk> >> ;;; >> ;;; 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 > > > -- Best regards, Andrew Tropin
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sat, 18 Nov 2023 10:46:02 GMT) Full text and rfc822 format available.Message #23 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: Andrew Tropin <andrew <at> trop.in> Cc: Emma Turner <mail <at> emturner.co.uk>, 66836 <at> debbugs.gnu.org Subject: Re: [bug#66836] [Patch] gnu: Add tree-sitter-yaml. Date: Sat, 18 Nov 2023 18:45:48 +0800
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
Olivier Rojon <o.rojon <at> posteo.net>
to control <at> debbugs.gnu.org.
(Tue, 25 Feb 2025 21:53:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Tue, 25 Feb 2025 22:05:02 GMT) Full text and rfc822 format available.Message #28 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Olivier Rojon <o.rojon <at> posteo.net> To: Hilton Chain <hako <at> ultrarare.space> Cc: Emma Turner <mail <at> emturner.co.uk>, Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, 66836 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, Andrew Tropin <andrew <at> trop.in> Subject: Re: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml. Date: Tue, 25 Feb 2025 22:04:09 +0000
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 <at> ultrarare.space> 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 <at> emturner.co.uk> >> >> * 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 <at> ultrarare.space> >> 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))))
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Sun, 02 Mar 2025 19:29:02 GMT) Full text and rfc822 format available.Message #31 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Olivier Rojon <o.rojon <at> posteo.net> To: 66836 <at> debbugs.gnu.org Cc: Emma Turner <mail <at> emturner.co.uk>, hako <at> ultrarare.space, Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, Andrew Tropin <andrew <at> trop.in> Subject: Re: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml. Date: Sun, 02 Mar 2025 19:28:11 +0000
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 <at> posteo.net> 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 <at> ultrarare.space> 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 <at> emturner.co.uk>
>>>
>>> * 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 <at> ultrarare.space>
>>> 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))))
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Mon, 03 Mar 2025 12:23:01 GMT) Full text and rfc822 format available.Message #34 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: Olivier Rojon <o.rojon <at> posteo.net>, 66836 <at> debbugs.gnu.org Cc: Emma Turner <mail <at> emturner.co.uk>, hako <at> ultrarare.space, Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, Andrew Tropin <andrew <at> trop.in> Subject: Re: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml. Date: Mon, 03 Mar 2025 13:22:32 +0100
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
guix-patches <at> gnu.org:bug#66836; Package guix-patches.
(Wed, 12 Mar 2025 19:11:02 GMT) Full text and rfc822 format available.Message #37 received at 66836 <at> debbugs.gnu.org (full text, mbox):
From: Olivier Rojon <o.rojon <at> posteo.net> To: 66836 <at> debbugs.gnu.org Cc: Olivier Rojon <o.rojon <at> posteo.net> Subject: [PATCH v3] gnu: Add tree-sitter-yaml. Date: Wed, 12 Mar 2025 19:10:04 +0000
* 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
Hilton Chain <hako <at> ultrarare.space>:Emma Turner <mail <at> emturner.co.uk>:Message #42 received at 66836-close <at> debbugs.gnu.org (full text, mbox):
From: Hilton Chain <hako <at> ultrarare.space> To: Olivier Rojon <o.rojon <at> posteo.net> Cc: 66836-close <at> debbugs.gnu.org Subject: Re: [bug#66836] [PATCH v3] gnu: Add tree-sitter-yaml. Date: Sat, 12 Apr 2025 14:44:56 +0800
Hi Olivier, On Thu, 13 Mar 2025 03:10:04 +0800, Olivier Rojon wrote: > > * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable. > > Change-Id: I2bc2ad26dba4b4a16cdc738fca867854da225442 > --- > gnu/packages/tree-sitter.scm | 11 +++++++++++ > 1 file changed, 11 insertions(+) I have modified your patch and will push to rust-team soon. Thanks!
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Sat, 10 May 2025 11:24:12 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.