From patchwork Sun Aug 20 14:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 53042 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 B605F27BBEA; Sun, 20 Aug 2023 15:03:20 +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 C44AD27BBE2 for ; Sun, 20 Aug 2023 15:03:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXj1C-0003Vs-Jh; Sun, 20 Aug 2023 10:03:02 -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 1qXj1B-0003VO-BV for guix-patches@gnu.org; Sun, 20 Aug 2023 10:03:01 -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 1qXj1B-0002w3-3S for guix-patches@gnu.org; Sun, 20 Aug 2023 10:03:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXj1C-0007lX-NA for guix-patches@gnu.org; Sun, 20 Aug 2023 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64905] [PATCH v4 02/11] gnu: tree-sitter: Update to 0.20.10. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Aug 2023 14:03: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.169254014429668 (code B ref 64905); Sun, 20 Aug 2023 14:03:02 +0000 Received: (at 64905) by debbugs.gnu.org; 20 Aug 2023 14:02:24 +0000 Received: from localhost ([127.0.0.1]:54535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXj0Z-0007iP-Bb for submit@debbugs.gnu.org; Sun, 20 Aug 2023 10:02:24 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXj0V-0007i2-F0 for 64905@debbugs.gnu.org; Sun, 20 Aug 2023 10:02:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1692540112; 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=+ueFXSJE0fm2TEBwYNqGBDebjOCPvJb6Q7URBkKZTm4=; b=03WcZw1DIRcONAvfdu3yf/Ff8f9td9Zga5LoOQjfaz9wmGzUoBhZ08ghRQsAyA7WbTAPhS X9FnUSY9RGdDp0GGoE67dJLiIzMATASDamfavs0lCnEOXASKGFKtNGn9847FLhH8qqFvx+ AW2r+H5vgDXK6viPhdJ2oC7frkXZQNuqyNqlZHmBnvS+40c0Dmvkw9cITpGteQeC3z+WG1 mTkMd19Zf99rYDqqC3bRNG8ki4V6mxV4OF6l9g4PslGV6XQ7awpMIqbvcOTIWhEVWxxprs 05WJ65Y5LRZlb2g6fVOYZed68Mx8f3JjYei1R27l2p71vB5VRr+UdEr0tarJhw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 20 Aug 2023 22:00:52 +0800 Message-ID: <5f1931e3330ae7dd368c50fdefcdfb43ab4837f0.1692539095.git.hako@ultrarare.space> 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): 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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 117c2acb0c..ffed09d945 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -94,18 +94,20 @@ (define-public python-tree-sitter (license license:expat))) (define-public tree-sitter + ;; Untagged + (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad")) (package (name "tree-sitter") - (version "0.20.8") + (version "0.20.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tree-sitter/tree-sitter") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv")) + "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) (modules '((guix build utils))) (snippet #~(begin ;; Remove bundled ICU parts @@ -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)