From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id IFDtEBhrWGUc0QAAauVa8A:P1 (envelope-from ) for ; Sat, 18 Nov 2023 08:43:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IFDtEBhrWGUc0QAAauVa8A (envelope-from ) for ; Sat, 18 Nov 2023 08:43:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EB14040BA8 for ; Sat, 18 Nov 2023 08:43:19 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=dYyhIvt+; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700293400; a=rsa-sha256; cv=none; b=oNY9pigQRmLPntjK2AJ2RkEIJC9bvBp92irn1tFG/fDjIYQFOnvcE1fFxu1Srqk86d2QHe gHbIWGyqof/hhZznWapbQRm75TPJkO4xVeDu8E19LZ1W9mEwFdTcZCBLpkbW90xXmvOIlr EsT1cVvn6EkzLagq1cZsa7xTp/C3Jq4Jyy4LT2O6MOPiPhkfSo1nc6BrwohEcAYnjEzLII jfEE8COMtpSFtOSPb7LZSRev+rcCVQF1EG4xy+N7dEWYLyclKoeBKKwEMroKU+Z3qCtREm AAtdj9N9xKyf3JI+xtxOLIWFux4jI7SKVjqcY6IjM5Te+9PItmRzu4LPTR7ABA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700293400; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=X/FSgjn+kBGqn5tJ2Jl0coKcVtU5IY3PoRCrtPWqEmk=; b=BhHpDHHliQ7D6NEHEq96H/UF/QE2QJeM366S0qLHVCrEDpkc8aOHUlsZGE6INq1BNDkCFn Bgxkn0a7eRUhHdi/86DidCuyKKNO0i9iclCTPYonqYSoP0OUlg/oIMbpsB3NPaUjy7IuYn 069MnRxkbXn/Z0qSAd+xtZaxGFnrIkjVsWoXRTjqx2zYltL0RKEFKTgHmPpUJtoj9+ZQSd g2HtBv4neJrAYC1XNNWLkT1ss+ON6RiIMkTzEeqwuhNSktiJhUxZjnmHNCO1Iih2w41M4c no/IGzAfeN6KXiLln12u5nBCrdCdWCb5wzB9Dgq3bQFNmb5IhEibyRgSHO5bxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=dYyhIvt+; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4Fyq-0006Et-Ci; Sat, 18 Nov 2023 02:43:04 -0500 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 ) id 1r4Fyo-0006EZ-0C for guix-patches@gnu.org; Sat, 18 Nov 2023 02:43:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4Fyn-0008F8-Nc for guix-patches@gnu.org; Sat, 18 Nov 2023 02:43:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4Fyo-00053j-BN for guix-patches@gnu.org; Sat, 18 Nov 2023 02:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66836] [Patch] gnu: Add tree-sitter-yaml. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Nov 2023 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain , Emma Turner Cc: 66836@debbugs.gnu.org Received: via spool by 66836-submit@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 ) id 1r4FyN-000534-Pd for submit@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 ) id 1r4FyJ-00052o-UV for 66836@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 In-Reply-To: <87pm0pww8j.wl-hako@ultrarare.space> References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk> <87pm0pww8j.wl-hako@ultrarare.space> Date: Sat, 18 Nov 2023 11:42:20 +0400 Message-ID: <87zfzb33tv.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-GND-Sasl: andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -4.29 X-Migadu-Queue-Id: EB14040BA8 X-Migadu-Spam-Score: -4.29 X-TUID: eMNnIVyubr0w --=-=-= 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 ] >> [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 =C2=A9 2023 Nicolas Graves >> ;;; Copyright =C2=A9 2023 Zheng Junjie <873216071@qq.com> >> ;;; Copyright =C2=A9 2023 Raven Hallsby >> +;;; Copyright =C2=A9 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? :) 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----- --=-=-=--