From patchwork Sun Aug 8 23:33:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31889 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 4E2A227BC78; Mon, 9 Aug 2021 00:35:29 +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 D705E27BC6B for ; Mon, 9 Aug 2021 00:35:28 +0100 (BST) Received: from localhost ([::1]:41972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsKF-0008Oe-Tu for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:35:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsJu-0007qN-VJ for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsJu-00064N-OT for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsJu-0000vD-M2 for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 11/31] gnu: Add tree-sitter-c. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:35:06 +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.16284656753368 (code B ref 49946); Sun, 08 Aug 2021 23:35:06 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:35 +0000 Received: from localhost ([127.0.0.1]:54985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsJP-0000sA-0g for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:34:35 -0400 Received: from mout.gmx.net ([212.227.17.20]:33727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsJG-0000p2-8u for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:34:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628465660; bh=Bn/ZfJ1pMr7RtZSRK/RQa5qPa1DQ/pNKmpSA/pOMIsY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=YOhQ2GA3zXfjvLsA0msfCD3W7AJtaA/rUlBS5ZoEANIp3zOmHjGhR7PZOjpcKMHNW qbhvARzthkgTkY2pldeOUQy4uaFKt6qCKk2VjnBDufJ/s9rnYfi8jtN857kVTzz+u+ ruV4TWkrZ/Vv48/ssd4XaiiEBAL147u0P+Yu7cjc= 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 1MNKlu-1mSlWg1rZK-00Oogp; Mon, 09 Aug 2021 01:34:20 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:33:34 +0100 Message-Id: <20210808233354.6745-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808233354.6745-1-pierre.langlois@gmx.com> References: <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:DshNbg/inGyMHopiW2vQGA+kfKPDjgNZYevtXonudnoMNiu5R8R 9fKMN7EWLHqgYcIiQLMRnlsSNIuZE7SsPxUkAzZuvkJyh23Uj9W25S04oVSwfsIzS7y5+RO 5LEFx9D6d4KfRzJ8lQfMsLYfn3lrovA5UjnZkIsGADhekU8Bg+sVYEEpkFiLJStaJzVGvCY 7oxdwv1ngCpm0QZyaWU7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:jkq+sfHkCz8=:5GfvNC9JI2ckVtnAk/gsQ8 z+CVW23doos62rcD1W4ulBDsPK35IwXIT6q4HwX86p/RYAZ328cT50HF5ZXw7Ssu3Pk5msvjS PT1A/QtGtkzoxJiaBm02T/n2yIHtB9Ez1ieqfRqrkgTOG0HUozoPKS7z3UxmiBGxLrUiDK50E sTOvmN66bveKU8cIOLaAKTQBaYyk2+l7BF1mbotAVlU66XqHLRCqBysOJrSKIY6YOJMim4ZeG y4Heb7BPgjCBFg18SIhedVZA/5HToPDyMoU2t7eHkBhPLUJb/WnKbfysm8opgrwkyKgvsj0Ir 29XSc0vrWnO0vIxqle3HPmCxgYQqxuqaZyTtYAxWpR4itNv8HyWsGAwDSdsXgcXN2nGUvCIbZ Nlvza3Mq6GkD5Kpdse5Ibl0a7Up6abY8zV9cpztu/5qSD3ne36zpvawK6R9W6xPtFrSVw1FpL VCcV9Nxybhk6BDMnJMFC9rGbG38fA89NoXheGoLkCrrtAdSCd/eamqoEokBWEDKZluElhA16R DuRYgFkPWl/eHzrUKje8TE/pobf2pteQvnjeTOcRWkie2y77XY/8qMNGzAIHyejURH6fh78rz VNvLCl6+GuiPs0jbCHn6ypSZARbR1VyQ56EHCO50kydnpDf+rg9kLADzqMdxbI7CK4eC/KYW8 mts7xyv0rsNERm+rbNLzFGh9XwyTSLoMDLgZhLX19psEOhaTjRo9EyzC+7YvhzeC8FIpy7I/x biVNc218CDhjHZyhnxWrx/f7Rs1BW1LjFpaOS/XekLvGw8HKV6iQit+7gbGChd0VS1tampJ2i TxNThDKxCfiT7S9s0fxP3OzIiP3WX2aOV2rftXp62okWL4RKfDE5A6FOiogLheWNpaILwY06w sZSuTL5bPB5sRx106cMzuZ/1BBRg8EDp6tathx5rNbYrHhXvnyLH3+E3QE+ACyELnDd2LyS/i 4DCa7pbxa9ZS/+QWFrIdpmDQRwroDBVy7fpobYW1DziRzw7SePGsUvhWDszZQfnvrA+TfI9go 9oPiz2UdQlCw+Ubqiggtr8WuLzqGnbnoEWnvwQ4VL6uuGMesfFHJJXKkEUkizF9QtCuqJa95t oVm69xcTB1zJPEFE3iISgbdqzD8xhSFrERYItkFxmzO5ee6gzCb/ft1Yg== 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-c): New variable. --- gnu/packages/tree-sitter.scm | 63 +++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 2c749dc0a8..c855cba347 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -19,10 +19,12 @@ (define-module (gnu packages tree-sitter) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) + #:use-module (guix build-system node) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages crates-io) - #:use-module (gnu packages crates-graphics)) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages node-xyz)) (define-public tree-sitter (package @@ -96,3 +98,62 @@ can be embedded in any application. This package includes the @command{tree-sitter} tool as well as the runtime library.") (license license:expat))) + +(define-public tree-sitter-c + (package + (name "tree-sitter-c") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-c") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv")))) + (build-system node-build-system) + (native-inputs + `(("tree-sitter" ,tree-sitter) + ("node-nan" ,node-nan))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; tree-sitter-cli is listed as a Node.js dependency, however the + ;; node tree-sitter-cli package is just a wrapper which downloads a + ;; tree-sitter binary, see + ;; https://github.com/tree-sitter/tree-sitter/tree/master/cli/npm + ;; Instead we remove it as a dependency so that we can use our own + ;; tree-sitter package. + (add-after 'unpack 'fix-configure + (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 "devDependencies") + "tree-sitter-cli") + (write-json package-meta out)))))) + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" "gcc"))) + (add-before 'build 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files "src" ".*")))) + (add-after 'install 'install-native-lib + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") + "/lib/tree-sitter"))) + ;; Invoking `tree-sitter test' loads the grammar which + ;; compiles it to a .so binary that we install. + (invoke "tree-sitter" "test") + (mkdir-p lib) + (copy-recursively (string-append (getenv "HOME") + "/.tree-sitter/bin") + lib))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-c") + (synopsis "Tree-sitter C grammar") + (description + "This package provides a C grammar for the Tree-sitter library.") + (license license:expat)))