From patchwork Thu Jul 27 17:17:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52268 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 D43B627BBEA; Thu, 27 Jul 2023 18:43:28 +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 BFB5727BBE2 for ; Thu, 27 Jul 2023 18:43:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qP4dk-0005BA-Vk; Thu, 27 Jul 2023 13:19:05 -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 1qP4dj-0005AE-2N for guix-patches@gnu.org; Thu, 27 Jul 2023 13:19:03 -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 1qP4di-0005nM-Qa for guix-patches@gnu.org; Thu, 27 Jul 2023 13:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qP4di-0002Bu-MM for guix-patches@gnu.org; Thu, 27 Jul 2023 13:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64905] [PATCH v2 2/8] gnu: tree-sitter: Update to 0.20.10. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jul 2023 17:19:02 +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 Received: via spool by 64905-submit@debbugs.gnu.org id=B64905.16904782878276 (code B ref 64905); Thu, 27 Jul 2023 17:19:02 +0000 Received: (at 64905) by debbugs.gnu.org; 27 Jul 2023 17:18:07 +0000 Received: from localhost ([127.0.0.1]:43070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP4co-00029Q-IJ for submit@debbugs.gnu.org; Thu, 27 Jul 2023 13:18:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP4cl-000295-O9 for 64905@debbugs.gnu.org; Thu, 27 Jul 2023 13:18:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1690478010; 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=ED2vEhOaK2Kn0sGmmC6vQJP62ifCCPdwjy7trO14Doc=; b=bHKqSxcqxC8DtHLrqk8U8C7wkI+iG5W85vXgprKUZ5hMIwVYuScnG5VjtI1HNwTXXHXUtg ZL6aN/RcRZ1bmYtBGHyIEMmIQ9YpOmVf9blFCQrmNWAqUAg1g8Ir9RAWobs48hf1C2JhEr COOu6HS286bCKYRkvfoMUIs3eyTh8ecd+8IWNnel8uJVLrGe8FQs+73F+onxQ/93nappQ0 aveephkaXq5B3e1AjKDG4N9MRz+i9DC09e8n9137JRVBMbtd36V/LgpW8dTn96xhMl71xi DRRbIcxPRcMtKlbR03g3/p1U7CRCC5U6VYFYBEuJPvowv86OwGsdrmuYunWBfQ== Date: Fri, 28 Jul 2023 01:17:09 +0800 Message-ID: <3590dc684dbd7caaabd605685614d5d1c0f542e6.1690477886.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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): Update to 0.20.10. (tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test. <#:cargo-inputs>: Add rust-path-slash-0.2. --- gnu/packages/tree-sitter.scm | 66 +++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 117c2acb0c..fb34e42874 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -94,36 +94,38 @@ (define-public python-tree-sitter (license license:expat))) (define-public tree-sitter - (package - (name "tree-sitter") - (version "0.20.8") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tree-sitter/tree-sitter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv")) - (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=" #$output) - (string-append "CC=" #$(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 + ;; 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=" #$output) + (string-append "CC=" #$(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. @@ -138,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 @@ -173,6 +175,7 @@ (define-public tree-sitter-cli ;; good compromise compared to maintaining two different sets of ;; grammars (Guix packages vs test fixtures). "--skip=tests::corpus_test" + "--skip=tests::github_issue_test" "--skip=tests::highlight_test" "--skip=tests::node_test" "--skip=tests::parser_test" @@ -194,6 +197,7 @@ (define-public tree-sitter-cli ("rust-dirs" ,rust-dirs-3) ("rust-html-escape" ,rust-html-escape-0.2) ("rust-libloading" ,rust-libloading-0.7) + ("rust-path-slash" ,rust-path-slash-0.2) ("rust-rand" ,rust-rand-0.8) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-semver" ,rust-semver-1)