From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id yEfbDytAMmVfRgAA9RJhRA:P1 (envelope-from ) for ; Fri, 20 Oct 2023 10:54:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yEfbDytAMmVfRgAA9RJhRA (envelope-from ) for ; Fri, 20 Oct 2023 10:54:03 +0200 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 15CB13BD28 for ; Fri, 20 Oct 2023 10:54:03 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=BedseOZO; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697792043; 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-to: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=pdNYkfIT1ZLcpT7bOpvgQ6PDYRovkBEI6fTs8BKjF04=; b=pe1iAVECN2Id8yqGhLxhd72WzDOc9c8INwcRoo+MLwLeW8hfYiXR0/B03Ind2LRIDaqB75 j6qJA08/EtlsXB6BFcUpiAWE60gpoNEzOgu1oXK/i/+wqZ6Sgq5/4CprOJgOEUIG/87K7U Jt7RuupXEVjxUwpI5H0HPhTvfBj8efFMXq71A4AKSMY0a0CoVYGZD+mfYalNlp0tQGAgnc FoIbcoMrw+ptlfBk7ZiGgqY7y3d6cjxIh72RGvtKmDK157uwUnbrb2+GTqIEe/CcXysMkF FBf7BXEvG990KCPsMqgoa1K83PuyvNqYx9DCxZeScJr20ywoY0PGL5OOHedwGQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=BedseOZO; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697792043; a=rsa-sha256; cv=none; b=czVUMyOkWnZHuqPvurFAnN4D685zB8NZ3L+ASvAPTP5WTd/YdYXc2wsduZmZrAXD8yQX+5 vh51ypVsObBLUe39ZwSJu/R/f9yB6TG7mS64JNKENY35m2/kMOLZPmGcoxg/Nn/nsfbqNd Zo5Wxv7u3J/uvjnbgCHzS5WpzRWdCPrP9TnX5T9x7bOyQwxNmM2L9m3+3nYFCotmNHgo3L wapQPwPl55Lk7NViV3kWxGSyS+nGlBHWGB2GXHXfbgSG32sXBhLBa5r9bSG8gW62IKEpch mk3SKQfU2bipPlR9oeE6FlwqF9Uc96urC65i424pa+8a8f6/ff7lBhPPKEtMxA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtlGE-0000jm-7Q; Fri, 20 Oct 2023 04:53:38 -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 ) id 1qtlGC-0000h3-2j for guix-patches@gnu.org; Fri, 20 Oct 2023 04:53:36 -0400 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 1qtlGB-0000mE-Pa for guix-patches@gnu.org; Fri, 20 Oct 2023 04:53:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtlGc-0007XS-Eb for guix-patches@gnu.org; Fri, 20 Oct 2023 04:54:02 -0400 Subject: bug#64905: [PATCH v5 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, {java, type}script, python}}, Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 20 Oct 2023 08:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 64905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain , 64905-done@debbugs.gnu.org Cc: Katherine Cox-Buday , Hilton Chain , Christopher Baines , Liliana Marie Prikler Mail-Followup-To: 64905@debbugs.gnu.org, andrew@trop.in, hako@ultrarare.space Received: via spool by 64905-done@debbugs.gnu.org id=D64905.169779200228917 (code D ref 64905); Fri, 20 Oct 2023 08:54:02 +0000 Received: (at 64905-done) by debbugs.gnu.org; 20 Oct 2023 08:53:22 +0000 Received: from localhost ([127.0.0.1]:38604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtlFx-0007WI-RJ for submit@debbugs.gnu.org; Fri, 20 Oct 2023 04:53:22 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:42777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtlFu-0007Vx-4h for 64905-done@debbugs.gnu.org; Fri, 20 Oct 2023 04:53:20 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id C8ED6E000C; Fri, 20 Oct 2023 08:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1697791964; 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=pdNYkfIT1ZLcpT7bOpvgQ6PDYRovkBEI6fTs8BKjF04=; b=BedseOZOBchuWL4K5QCb05HsW8UFZnVhmltYWjDyPPb2gbQggW1mnV22cRFzqEVtRfIhcH ospb5/jCAB09tDMM8CiIgIb4ntDiHHCmHoSIkDxa5JTCLxTlq2ShI/b/i1Orjb5JUNAdEZ +Im7KItecDmQ6IO8XCfr43m12SMasKMQt1Ayn1nFz14ZyuoqV/WtCjHaw8ieURPiDiLiLe enftxiwwbx7VsLv12Y2XnT0jLnqQTa7ryHrAwlQFRuA29tXMMaDEWhjWhlmWDhGSHZdJdd k4xmxJJNlgJgtaxvvFAwNdwnap0kjp4tfebabhC5ueu56irPsG2XJLdyh6EOOw== From: Andrew Tropin In-Reply-To: References: Date: Fri, 20 Oct 2023 12:52:40 +0400 Message-ID: <87r0lphe07.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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 1.18 X-Spam-Score: 1.18 X-Migadu-Queue-Id: 15CB13BD28 X-Migadu-Scanner: mx2.migadu.com X-TUID: 29sbFphsedT4 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-10-19 23:41, Hilton Chain wrote: > V4 -> V5: > - tree-sitter-bash@0.20.4, > tree-sitter-javascript: Remove binary file from source. > > V3 -> V4: > - tree-sitter-bash@0.20.0, > tree-sitter-c@0.20.6, > tree-sitter-cpp@0.20.3, > tree-sitter-python@0.20.4, > tree-sitter-rust@0.20.4. > > V2 -> V3: > - tree-sitter-c@0.20.5. > - Re-indent code in a separate commit to produce more readable diffs. > > V1 -> V2: > - Merge tree-sitter-javascript and tree-sitter-typescript updates into = one > commit. > - Merge tree-sitter-c and tree-sitter-cpp updates into one commit. > Each case updating the former package breaks build of the latter's old > version. > > Hilton Chain (10): > gnu: tree-sitter: Update to 0.20.10. > gnu: tree-sitter-bash: Update to 0.20.4. > gnu: tree-sitter-c-sharp: Update to 0.20.0. > gnu: tree-sitter-javascript: Update to 0.20.0-22.f772967. > gnu: tree-sitter-typescript: Update to 0.20.3. > gnu: tree-sitter-python: Update to 0.20.4. > gnu: tree-sitter-cpp: Update to 0.20.3. > gnu: tree-sitter-go: Update to 0.20.0. > gnu: tree-sitter-rust: Update to 0.20.4. > gnu: tree-sitter: Re-indent. > > gnu/packages/tree-sitter.scm | 110 +++++++++++++++++++---------------- > 1 file changed, 59 insertions(+), 51 deletions(-) > > > base-commit: c065da01ff956d3c2bdfc45a33d910e509a211d9 > -- > 2.41.0 > > v4...v5 > diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm > index 29b180026c..41257d42f1 100644 > --- a/gnu/packages/tree-sitter.scm > +++ b/gnu/packages/tree-sitter.scm > @@ -96,38 +96,36 @@ (define-public python-tree-sitter > (license license:expat))) > > (define-public tree-sitter > - ;; Untagged > - (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad")) > - (package > - (name "tree-sitter") > - (version "0.20.10") > - (source (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/tree-sitter/tree-sitter") > - (commit commit))) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 > - "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"= )) > - (modules '((guix build utils))) > - (snippet #~(begin > - ;; Remove bundled ICU parts > - (delete-file-recursively "lib/src/unicode")= )))) > - (build-system gnu-build-system) > - (inputs (list icu4c)) > - (arguments > - (list #:phases > - #~(modify-phases %standard-phases > - (delete 'configure)) > - #:tests? #f ; there are no tests for the runtime library > - #:make-flags > - #~(list (string-append "PREFIX=3D" #$output) > - (string-append "CC=3D" #$(cc-for-target))))) > - (home-page "https://tree-sitter.github.io/tree-sitter/") > - (synopsis "Incremental parsing system for programming tools") > - (description > - "Tree-sitter is a parser generator tool and an incremental parsing > + (package > + (name "tree-sitter") > + (version "0.20.10") ;untagged > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/tree-sitter/tree-sitter") > + (commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) > + (modules '((guix build utils))) > + (snippet #~(begin > + ;; Remove bundled ICU parts > + (delete-file-recursively "lib/src/unicode")))= )) > + (build-system gnu-build-system) > + (inputs (list icu4c)) > + (arguments > + (list #:phases > + #~(modify-phases %standard-phases > + (delete 'configure)) > + #:tests? #f ; there are no tests for the runtime library > + #:make-flags > + #~(list (string-append "PREFIX=3D" #$output) > + (string-append "CC=3D" #$(cc-for-target))))) > + (home-page "https://tree-sitter.github.io/tree-sitter/") > + (synopsis "Incremental parsing system for programming tools") > + (description > + "Tree-sitter is a parser generator tool and an incremental parsing > library. It can build a concrete syntax tree for a source file and > efficiently update the syntax tree as the source file is edited. > > @@ -142,7 +140,7 @@ (define-public tree-sitter > @end itemize > > This package includes the @code{libtree-sitter} runtime library.") > - (license license:expat)))) > + (license license:expat))) > > (define-public tree-sitter-cli > (package > @@ -319,20 +317,35 @@ (define-public tree-sitter-html > "0.19.0")) > > (define-public tree-sitter-javascript > - ;; Required by tree-sitter-typescript. > - (let ((commit "7a29d06274b7cf87d643212a433d970b73969016") > - (revision "14")) > + ;; Commit required by tree-sitter-typescript 0.20.3. > + (let ((commit "f772967f7b7bc7c28f845be2420a38472b16a8ee") > + (revision "22")) > (tree-sitter-grammar > "javascript" "JavaScript(JSX)" > - "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw" > + "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd" > (git-version "0.20.0" revision commit) > - #:commit commit))) > + #:commit commit > + #:get-cleanup-snippet > + (lambda (grammar-directories) > + #~(begin > + (use-modules (guix build utils)) > + (delete-file "tree-sitter-javascript.wasm") > + (delete-file "binding.gyp") > + (delete-file-recursively "bindings") > + (for-each > + (lambda (lang) > + (with-directory-excursion lang > + (delete-file "src/grammar.json") > + (delete-file "src/node-types.json") > + (delete-file "src/parser.c") > + (delete-file-recursively "src/tree_sitter"))) > + '#$grammar-directories)))))) > > (define-public tree-sitter-typescript > (tree-sitter-grammar > "typescript" "TypeScript and TSX" > - "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj" > - "0.20.2" > + "08k785q3cy8byrb3zrg93mfidnj1pcx1ggm1xhd8rgmfs2v6jns5" > + "0.20.3" > #:inputs (list tree-sitter-javascript) > #:grammar-directories '("typescript" "tsx"))) > > @@ -377,14 +390,14 @@ (define-public tree-sitter-elixir > ;; No tags at all, version in the source code is 0.19.0 > (let ((commit "b20eaa75565243c50be5e35e253d8beb58f45d56") > (revision "0")) > - (tree-sitter-grammar > - "elixir" "Elixir" > - "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" > - (git-version "0.19.0" revision commit) > - #:article "an" > - #:repository-url "https://github.com/elixir-lang/tree-sitter-elix= ir" > - #:commit commit > - #:license (list license:asl2.0 license:expat)))) > + (tree-sitter-grammar > + "elixir" "Elixir" > + "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" > + (git-version "0.19.0" revision commit) > + #:article "an" > + #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" > + #:commit commit > + #:license (list license:asl2.0 license:expat)))) > > (define-public tree-sitter-heex > (tree-sitter-grammar > @@ -396,8 +409,8 @@ (define-public tree-sitter-heex > (define-public tree-sitter-bash > (tree-sitter-grammar > "bash" "Bash" > - "11gjjaf9hrsw3rd774c3gq27im2j9gxmkn59wcpg4nwni60p0vjh" > - "0.20.0")) > + "01sjympivwhr037c0gdx5fqw8fvzchq4fd4m8wlr8mdw50di0ag2" > + "0.20.4")) > > (define-public tree-sitter-c-sharp > (tree-sitter-grammar > > Hello Hilton and Christopher! I went through the patches and they look great to me! Applied, tested the build of c grammar and pushed, thank you very much for updating tree-sitter and grammars. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmUyP9gACgkQIgjSCVjB 3rD6vQ//Vi4xgY7PfdqWncvJP6AYx+evBCkI6cgNKlw84oMjYAXM0SgKs0L2mZbN oeP6DFOihDJiXH4PwuuR3EzeSCIS82zdxO9Vs/KODHRs3KfQN6ntfB8r1XwWjMeu wvTT1qZ0szi+PDj4+tHYNY9R1ykf3HnHcoJZ2wJWpEMCOIjRwg1eB/zuhuqCbYAD AlucHlnSJEy9G7CFARxsKTqsI6m2FzmAws8sAHnnoHM4DVCbQrFlidiwJyGS7wQ8 On/6bPpxRNwFTw4PwvBiGLTgRBCa5FjNQLAnh7TLPuiWSAezFwrOhg/isxYuWPjH jaCPHiBK4/k5/g75xM/a95b4VgqfPFs4TJXw9WfEd+0nE2WkChdGe0n2DDa8mMrj YaImta/deHMFWY4hy8m47VLp5B01RVopH4oWZUM8qdM2RHwumuEerCRQdtW0UBoV z6WAAz7X/XdEQGqHQYSS/VOPM1FNCL4x4DKIgkSmfcx3uAGmqYUTimsZMzqtDjYs hijeMSybZkUH8rscA6eA1qoRJaiE0PnuvObA/lw87upn0fi43pjD+JEb+oX0rw45 Il8CDhQLV5lGf9M1QVGlG1XYjZRrq21RZlZYVgQ1+RO2NPx5jBRKez4o8Ly/2qoY WhGLRa1cxsjR6LoInr3YtrOrvVPvN9PVanASwAoVWRfeuXxIoGU= =rNTq -----END PGP SIGNATURE----- --=-=-=--