From patchwork Fri May 10 18:28:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raven Hallsby X-Patchwork-Id: 27377 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 A4DE327BBE9; Fri, 10 May 2024 19:31:37 +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=-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 D822727BBE2 for ; Fri, 10 May 2024 19:31:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5V1R-0007oA-Bp; Fri, 10 May 2024 14:31:09 -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 1s5V1P-0007nO-Sg for guix-patches@gnu.org; Fri, 10 May 2024 14:31:07 -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 1s5V1M-0002go-0T for guix-patches@gnu.org; Fri, 10 May 2024 14:31:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5V1K-0008Rc-B2; Fri, 10 May 2024 14:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl. Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 10 May 2024 18:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70720@debbugs.gnu.org Cc: Karl Hallsby , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 70720-submit@debbugs.gnu.org id=B70720.171536581432411 (code B ref 70720); Fri, 10 May 2024 18:31:02 +0000 Received: (at 70720) by debbugs.gnu.org; 10 May 2024 18:30:14 +0000 Received: from localhost ([127.0.0.1]:43415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5V0X-0008Qg-IU for submit@debbugs.gnu.org; Fri, 10 May 2024 14:30:13 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:50401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5V0W-0008P8-DI for 70720@debbugs.gnu.org; Fri, 10 May 2024 14:30:13 -0400 Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-78f04924a96so164610985a.0 for <70720@debbugs.gnu.org>; Fri, 10 May 2024 11:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1715365748; x=1715970548; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=me19PG0r+Nrl/OSQir8H01tz1L1IWIU84V3pXBwDOI8=; b=gZ/p4qZKtpgw+9msF7c+q1jX7rKy5PChrLCgu3zS0AEUd9bNB7eTjeqbgkQrgylza6 ibYCqL8hQI/5hVJ8ONhjK+6rwO+AjUw35suTMUizu4t78dkV3+ntix60V5MyAW9g66fW UDDbkb0H8A/BTPC14RhTziom3zAqG3FPQlJP/OdOMNwWfPpp4fDoo8zAQjAA8/DFvScH Za8R4V1Ukbmq1SE61+XGJgBWswLIYjz4YFhMeA0PFrY+dpLztIy00zSxZKWq7BP9RUeT p3GlVIS9XJpoJqOYJvjZLaGSoCRXRKlvqe9Itcutayf+zx75Jh0hqz/oIac3pz9C4z9i DFbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715365748; x=1715970548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=me19PG0r+Nrl/OSQir8H01tz1L1IWIU84V3pXBwDOI8=; b=botxRLXk6N42DN3mVCB3UWopNI90J2Y6h05g2LjClF4PBO1pXT1cSy94j/A/forYKj hp47/XiGhxPtUonJi4dfbkIqpy54DcK3/MzQ6KuJvBPRmW5vejdtO7myUMzoWeFTetyt z6UUeRWk/UtGlAIvsbAsPJCLfMTI+rf0VjYXEjlLSxD70GBb4rHPdxTVcdtJdrqOfiQN +evfcSvB5sCmJ75V9MyyIzpGrfK87hsQ1MpEYOegTeu5X1opYjBVHmXnypqWF9oZLRct lao2IMFxg7TcH/4QXRG9QIb+3ZroH7eIn4e99GvPZWPkCjiZkgkB5S4f6nBJyT6MNZOI W+DQ== X-Gm-Message-State: AOJu0YzD3CLDJo8j2SM/tOEGJ4ZViS2gV545RbNHu6qOBY6T0LDWpmUo nOJqdWxL90/VJSQBf+PZ0AVtI+x9Y0iVxaPK0jaCl2L3zGdlCv7Qt72AYxj0Gp3+aHKrAPUJ5Lw = X-Google-Smtp-Source: AGHT+IF4UoYvgkud8Te0WCY68Hevm6+ByZgB564JPvUk5mmCeN5zTkwXNNAUx8YEz4bx9PFnnPZgOQ== X-Received: by 2002:a05:620a:2196:b0:792:93cb:7649 with SMTP id af79cd13be357-792c75ffc44mr359304285a.68.1715365747675; Fri, 10 May 2024 11:29:07 -0700 (PDT) Received: from avocato.wireless.northwestern.private (wireless-165-124-85-63.nuwlan.northwestern.edu. [165.124.85.63]) by smtp.gmail.com with ESMTPSA id af79cd13be357-792bf27584asm205049685a.10.2024.05.10.11.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 11:29:07 -0700 (PDT) Date: Fri, 10 May 2024 13:28:49 -0500 Message-ID: <4eaac81a00ac27ac39e4ff1a2c8124f7b10918b3.1715365716.git.karl@hallsby.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <14707a5b3202ef9d30cbba4a20c85c12a1547ed0.1715365716.git.karl@hallsby.com> References: <14707a5b3202ef9d30cbba4a20c85c12a1547ed0.1715365716.git.karl@hallsby.com> MIME-Version: 1.0 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: Raven 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-vhdl): New variable. Change-Id: I07b2b89f878957af1544344122cdfe8970efc9f7 --- gnu/packages/tree-sitter.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 206fd7268e..3863558883 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -717,3 +717,35 @@ (define-public tree-sitter-verilog (use-modules (guix build utils)) (delete-file "binding.gyp") (delete-file-recursively "bindings")))))) + +(define-public tree-sitter-vhdl + (let ((version "0.1.1") ; In package.json, but untagged + (commit "a3b2d84990527c7f8f4ae219c332c00c33d2d8e5") + (revision "0")) + (tree-sitter-grammar + "vhdl" "VHDL" + "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a" + (git-version version revision commit) + #:repository-url "https://github.com/alemuller/tree-sitter-vhdl" + #:commit commit + #:get-cleanup-snippet + (lambda _ + #~(begin + (use-modules (guix build utils)) + (delete-file "binding.gyp") + ;; tree-sitter-vhdl does not have bindings/ directory. + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter") + ;; Fix a query error in the highlight.scm query test. This would be + ;; easier with a patch, but this works too, and we still get to use + ;; tree-sitter-grammar. The fix is taken from here: + ;; https://github.com/n8tlarsen/tree-sitter-vhdl/commit/dabf157c6bb7220d72d3ceba0ce1abd90bf62187 + ;; This is a documented issue that has not been resolved for nearly 2 + ;; years. + ;; https://github.com/alemuller/tree-sitter-vhdl/issues/2 + (substitute* "queries/highlights.scm" + (("\\(integer_decimal\n") "(integer_decimal)\n") + (("\\(integer\\)") "") + (("\"0\")") "\"0\"")))))))