From patchwork Thu Mar 28 02:00:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 62310 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 8631627BBE9; Thu, 28 Mar 2024 02:07:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 574CE27BBE2 for ; Thu, 28 Mar 2024 02:07:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpfAV-0003FN-Q5; Wed, 27 Mar 2024 22:07:03 -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 1rpfAU-0003FB-IJ for guix-patches@gnu.org; Wed, 27 Mar 2024 22:07:02 -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 1rpfAU-000587-6U for guix-patches@gnu.org; Wed, 27 Mar 2024 22:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpfAU-0000L2-Bj for guix-patches@gnu.org; Wed, 27 Mar 2024 22:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70043] [PATCH] gnu: Add tree-sitter-tlaplus. Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70043@debbugs.gnu.org Cc: Karl Hallsby X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17115915961158 (code B ref -1); Thu, 28 Mar 2024 02:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Mar 2024 02:06:36 +0000 Received: from localhost ([127.0.0.1]:38602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpfA3-0000Ib-KG for submit@debbugs.gnu.org; Wed, 27 Mar 2024 22:06:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpfA0-0000IN-JU for submit@debbugs.gnu.org; Wed, 27 Mar 2024 22:06:34 -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 1rpf9u-0003Az-9F for guix-patches@gnu.org; Wed, 27 Mar 2024 22:06:26 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpf9s-00054w-9o for guix-patches@gnu.org; Wed, 27 Mar 2024 22:06:25 -0400 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-368a694dce3so1659995ab.1 for ; Wed, 27 Mar 2024 19:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1711591582; x=1712196382; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aClLCK0zBmqzlpjBCmyfuFN8GIU0kRAbXpZ8XXQYqLI=; b=hNHp9t9Zz8B4EQfFx96SDUjVsNH6SbWBv7oilS2ofRggBJ0FtMO5fGKVBavTSi7dGh GJEyXK6/uE/tDUdfCI1VMHjmCtbyfjkcGEw2fOZqMjS8HMGd4esunsayBakZCcmhSvCP 1nA4SOTx/0puTdWJvK0yEwshSBchj2g/chOwTULMC2IHIw6vKz7+PYabATdrjG5nQU4q tlv4Q2hBAkut2mWS4dqiGNSNSwXxWbWEtAhBW9VFkr4nudWAIQ0DxZlxGGsvahxJrOHO NsSFnnmln18YCp3YqcJu7Bj9P62R0s/QhUpW/ISqO6VJpy2PpsjVLoletfyDgsyoMKl8 Yf3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711591582; x=1712196382; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aClLCK0zBmqzlpjBCmyfuFN8GIU0kRAbXpZ8XXQYqLI=; b=bqF5xquSxgwFEuYVLJBML4zmrPeirFyFhd4OBBLmDjpVSeEpHRLAKO+lyDjutu19Dk 3kCcfEScJ9z8Uia681Wtw0/exuFHiAOjWGO3OXMPkJh6Ix9qGez1NeM73/IAJTzXHNzF +l184t1lNj48fL/MfrfgfbeiN8QekGR8xOxDchsI8DhZDGPud9urNUEakzs2Ybh/S1rI MJcuy0q98ozUwpSFKZN3RmGODGnj/emCtmG7Pvtz5YzhbDCHQKSsuA2Zt37RMQZXnSWB MJe9xsvRrU5W2UFFZrERyqk0ftNO0vhWTnlcheXiTyO95BhyAAsl3aYVVDWKP7Qf2XsY WWAg== X-Gm-Message-State: AOJu0YyJkReF+RhO3y3QBgfoHuZ43zTHDIc8pZhuyie3jaixUQwxY9MH 0Lyh0ESFf2+80hMdptDskDVMGuu7khrUEyN5XKv2l7256cEJ71lLXTNc7PeXGGFfg0GeAvooXjM = X-Google-Smtp-Source: AGHT+IHGmL4EcDC2NsId35KAQcn37QSHDskBhY9ig28fHVLhLqQpnBgVNS66WxO15IijKaD/0qLf3Q== X-Received: by 2002:a05:6e02:1292:b0:368:a7f5:55b5 with SMTP id y18-20020a056e02129200b00368a7f555b5mr1766301ilq.28.1711591582007; Wed, 27 Mar 2024 19:06:22 -0700 (PDT) Received: from avocato.raven (168-91-208-72.s2118.c3-0.frg-cbr1.chi-frg.il.cable.rcncustomer.com. [168.91.208.72]) by smtp.gmail.com with ESMTPSA id q19-20020a056e02107300b003689e184d94sm118741ilj.69.2024.03.27.19.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 19:06:21 -0700 (PDT) Date: Wed, 27 Mar 2024 21:00:13 -0500 Message-ID: <20240328020232.31322-1-karl@hallsby.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12f; envelope-from=karl@hallsby.com; helo=mail-il1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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-tlaplus): New variable. Change-Id: I0e66b87a872bdb29b3c01f4eaf4486dab3d1873f --- tree-sitter-tlaplus has a newer version, 1.2.1, but that requires tree-sitter to have a version greater than 0.21.0 (which _is_ tagged this time). However, naively updating tree-sitter to 0.21.0 or newer requires rust packages (most notably rust-clap) newer than are available in Guix right now. When tree-sitter gets updated next, this tree-sitter grammar (and likely many others) will need to be updated as well. gnu/packages/tree-sitter.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7515461993..f049ac590e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2023 Andrew Tropin ;;; Copyright © 2023, 2024 Nicolas Graves ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023 Raven Hallsby +;;; Copyright © 2023, 2024 Raven Hallsby ;;; ;;; This file is part of GNU Guix. ;;; @@ -677,3 +677,11 @@ (define-public tree-sitter-scala "scala" "Scala" "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz" "0.20.2")) + +(define-public tree-sitter-tlaplus + (tree-sitter-grammar + "tlaplus" "TLA+" + "1k60dnzafj6m9c2d4xnwiz3d7yw3bg3iwx7c1anhwr76iyxdci3w" + "1.0.8" + ;; Version 1.2.1 is most recent, but requires tree-sitter >0.21.0 + #:repository-url "https://github.com/tlaplus-community/tree-sitter-tlaplus"))