From patchwork Sun Aug 29 10:45:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 32375 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 A3BE527BBE1; Sun, 29 Aug 2021 11:53:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B0CA27BBE5 for ; Sun, 29 Aug 2021 11:53:36 +0100 (BST) Received: from localhost ([::1]:42832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIRT-0000c7-FM for patchwork@mira.cbaines.net; Sun, 29 Aug 2021 06:53:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKILG-000674-0r for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKILF-0001fR-Ly for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKILF-0000H9-Js for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v2 14/33] gnu: Add tree-sitter-bash. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Aug 2021 10:47:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.1630234022900 (code B ref 49946); Sun, 29 Aug 2021 10:47:09 +0000 Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:02 +0000 Received: from localhost ([127.0.0.1]:55576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIL8-0000EI-9k for submit@debbugs.gnu.org; Sun, 29 Aug 2021 06:47:02 -0400 Received: from mout.gmx.net ([212.227.17.20]:34677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIKk-0000AM-Nd for 49946@debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630233993; bh=6vy3IoYr/SLa/e4w/SsJaHk5Zl4lutEoaiNrkF5/Xbk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=YlVVCJ0zwhBuztSsnsAYAuZlJ50RiOOVYIloJiqJ+z6am6yVRst2takXx9C6IDU6h UhynGnJwoyXo5uHzfEtS6KFC+fxBE61LmPky0Y0nZIZnxaCNJXXASr3d96xnRrE7vF yZQRYzZrflQvX9wJOzmmt14670NDzHpnvTXO4R0o= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M2f5T-1mINK33bVH-0049WT; Sun, 29 Aug 2021 12:46:33 +0200 From: Pierre Langlois Date: Sun, 29 Aug 2021 11:45:49 +0100 Message-Id: <20210829104608.3103-14-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210829104608.3103-1-pierre.langlois@gmx.com> References: <87czpwzg9e.fsf@gmx.com> <20210829104608.3103-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:NRL9WSsc3depoe8ALyD3zor6juWzhJN0dGYNwnKxuzxEBCkHlQw ewq1yYCKIx3KBqTwEhOC9+6/l53B+KWU0iKuB5ad/ydsLH/AtbTNF0RIKd9yKrME/vYjUHu g5vLEYXFOCwUJPlAs5zYxW7+2pdsG//teyKrDsgsHpc+BreK9MgptSmPzULjNR7ezV1BKk0 sMWDrZQaxXxPLy20yP8VA== X-UI-Out-Filterresults: notjunk:1;V03:K0:aluFdWl3pH8=:qy6643DOpfwUMSDFZlFIO2 1aw8ZLe3WR8jILdqibTC4e0es3Tmo/xtpn2qy5+GoO6pyIVPrzMm+z5eaad8dOGLaV/MAxXk+ ygd6J6E5A+yytYZIxbAsQPDyKEBC7fRVzcgsdE1N86fb9q4YspZirsO1gz3ZCa/L70ihN494A HS+P/CmhBHJzhZHPeLfrLXJSnyI4Kgt9q2jxRnSI8rTAbaATnUX17IdlfOCJGYPwH2U33l/o6 ahmmmwMaYJwIOWILl5T0myjJ7UjG1tmNP1hWonL6jEhgPckQO94CPDzT5F8tcM6PV09B08SHf cZWtLgtM53+7+OBk/9EaqGEno22l/lYzlu+XhOab4kZYU/FJNoi39a7NuF7SuL0ULDoVzWt7Y lSDJ14o2ewbbWLvhE98yTnMNACCbkVGANjho+bsUsQogjwYOerdg4E4VHxmbK/DYGL5eGgk+U VUV39QnlkuTj0rcUiw+uPbR6nhELx1M6Vmlt6daG3fav2/rq0W79X1vIG7RbruA/h9ijykc5T Iiyi6VEOED+agbrvlqcAB48Rf7IUPjsmTLqCiAoffIGakTzd5pGcsjrpb705YW9x5eVipt259 J+0uGbg7nR9qhArocOOyQyvcZe8GnSr8Niywp80mWFovJraUR1kIiFXCYI9e2/7Yd9cIyU4y5 cKxTK6PKEaSzRueG72zmiWoa+mpKU9AejzRh1z8QXNf2EheYAvvMXSs8G815HIG35YRpoaz8w rm/YmhXkW9E5TPyfWYkpBtabZPkwSUV4B0vbqPEhjev/zksdMNopT4bkiwIqPC9p14J6FG888 LwEXWnqwIbgOeiUTCiMfVtqRE4ScYe/Cm4J7+9uL5cnwdtYAmOvMoXpTWIIPKJxjBYQZbMP1u ItomU7sSWxn8MNqtB3DbwWx56oOb13epOLyJYITQqLDZAgvv7sf8V4NeC3wsotD6xuQ5Fg5D5 WII6Zb5XjIxn9e+LnWlz0rZCjLY57OwBAJNKhoDIG7OqGMhOnY5F9mKK1YFBbBnYFquLLiaaw Ag3qmTxgYCroWa54NGqcUCodgAldxQCqpVQIP2cYryxUD9A/LYBbqd0tArxIoA4xHnmULEBgj HEGSePIWOMg3vnVV+Wbp8lpC1wScsNHVGq2IkmGwQCh57MZ/0Pii0Bqhw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable. --- gnu/packages/tree-sitter.scm | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) -- 2.33.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 07bdb54627..f98a7d392f 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -215,3 +215,44 @@ This package includes the @command{tree-sitter} command-line tool.") (description "This package provides a C++ grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-bash + (package (inherit tree-sitter-c) + (name "tree-sitter-bash") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-bash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5")))) + (native-inputs + `(("tree-sitter-cli" ,tree-sitter-cli) + ("node-nan" ,node-nan))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The `prebuild' dependency is a way to intercept the build step + ;; and download a prebuilt binary instead. If we remove it then the + ;; buid system falls back to building from source. + (add-after 'unpack 'remove-prebuild-dependency + (lambda _ + (with-atomic-file-replacement "package.json" + (lambda (in out) + (use-modules ((guix build json))) + (let ((package-meta (read-json in))) + (assoc-remove! (assoc-ref package-meta "dependencies") + "prebuild-install") + (assoc-remove! (assoc-ref package-meta "devDependencies") + "prebuild") + (write-json package-meta out)))))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-bash") + (synopsis "Tree-sitter Bash grammar") + (description + "This package provides a Bash grammar for the Tree-sitter library.") + (license license:expat)))