From patchwork Thu Oct 19 15:44:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55043 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79D1927BBEA; Thu, 19 Oct 2023 16:48:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 24FAD27BBE2 for ; Thu, 19 Oct 2023 16:48:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtVFL-00088R-CL; Thu, 19 Oct 2023 11:47:39 -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 1qtVFJ-00086W-NG for guix-patches@gnu.org; Thu, 19 Oct 2023 11:47:37 -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 1qtVFJ-0007it-Eh for guix-patches@gnu.org; Thu, 19 Oct 2023 11:47:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtVFj-00064e-Ac; Thu, 19 Oct 2023 11:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64905] [PATCH v5 04/10] gnu: tree-sitter-javascript: Update to 0.20.0-22.f772967. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, mail@cbaines.net, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 15:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64905@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Christopher Baines , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Hilton Chain , Christopher Baines , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 64905-submit@debbugs.gnu.org id=B64905.169773043423169 (code B ref 64905); Thu, 19 Oct 2023 15:48:03 +0000 Received: (at 64905) by debbugs.gnu.org; 19 Oct 2023 15:47:14 +0000 Received: from localhost ([127.0.0.1]:37569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtVEv-00061d-Uq for submit@debbugs.gnu.org; Thu, 19 Oct 2023 11:47:14 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtVEu-00061V-An for 64905@debbugs.gnu.org; Thu, 19 Oct 2023 11:47:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1697730259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6sDGApAT7leLmgWRO0MDObQhGkxy2xg9LjzD885naec=; b=NUxxK1+KZarDuMqPa/SRfEBdv2M3EYE/Vqsdeph802c+YVVugsUW8DrtDG/WbQ5q730XXu 9wrPXMdMYZlp9ryAOxV9rre4N0z8N20lBqVtj5eh59v9uEMyB+8LOKNq+1w+yq4s1CzpC+ u1P65Py11hWNX4La7qhWsUujOUsvEsDKI2ipijPCdNQUeiobUAWH/K1XXmEldHTm3J6krx RpJfC7qFPRocI6hC9qmzYTq9RhbvIxKsLdGoaedgtUdPpCXlbLdJCQ8yInC/WI2o46m1c8 QlUa0axwuTqlCj/X18iIuyl4mHDt80AImMll9Y8MaNp1DVDwl+dCPtUpPQXXMg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Thu, 19 Oct 2023 23:44:30 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-javascript): Update to 0.20.0-22.f772967. [#:get-cleanup-snippet]: Remove tree-sitter-javascript.wasm binary. --- gnu/packages/tree-sitter.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index dcb3d5506e..51afe91631 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -317,11 +317,29 @@ (define-public tree-sitter-html "0.19.0")) (define-public tree-sitter-javascript + ;; Commit required by tree-sitter-typescript 0.20.3. + (let ((commit "f772967f7b7bc7c28f845be2420a38472b16a8ee") + (revision "22")) (tree-sitter-grammar "javascript" "JavaScript(JSX)" - "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" - "0.20.0" - #:commit "rust-0.20.0")) + "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd" + (git-version "0.20.0" revision 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