From patchwork Sun Aug 8 23:43:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31905 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 16E1A27BC78; Mon, 9 Aug 2021 00:45:14 +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 D65FD27BC6B for ; Mon, 9 Aug 2021 00:45:13 +0100 (BST) Received: from localhost ([::1]:45602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTg-0002uK-Lc for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTW-0002tm-Jv for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTW-0004em-DR for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTW-0001E3-A8 for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 21/31] gnu: Add tree-sitter-python. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:02 +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.16284662544516 (code B ref 49946); Sun, 08 Aug 2021 23:45:02 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:14 +0000 Received: from localhost ([127.0.0.1]:55026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSk-0001Am-44 for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:47821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSi-0001AQ-IN for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466246; bh=qHHF39rTjj3zOe5sEZGdsbFzOYpiNvenpM1cDgLUslM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ek02yG5mwzz/qw2R/fEC4DcBZk724D9gRKe4Tnu1MFL6OKeOBEmKOCwX198EJq9iW jsrR828Z8KpnPBpAWNmTLQqHuCChNB5pclkB8edALIXO2bu3n0V5uwxn9LklhWNqax h4Ks8FpwxQVdqhgB8PUEnHRItj+QzaPkJuASmBLg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MDysm-1mMjpa1F3s-009zYy; Mon, 09 Aug 2021 01:44:06 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:48 +0100 Message-Id: <20210808234358.7241-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808233354.6745-20-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+u1Odu3fK1NDlUMEaRmxOdq3NfCIdXIsNf+6S6Wx96XVsYUcccF 8iY8VtCDlPm4aG4V/gJsA7dqlz4wve2kMZ6lMpAElczXMmCVAw9rprmzz+nMbPVkgUs6rMj tvysStl1aARb3C22v66vLI8s4/S+ancYVzc2rnavPycD0jrXPvcNIwywtjkC76TYG/4mT7M rA0737s/df95oHeU27Vbg== X-UI-Out-Filterresults: notjunk:1;V03:K0:WmcXWCWC3YI=:c1n+pxYRuQeqPsc78Jnfsn NeY/JC4CDKtvLzKlcvhwvIXqngkeu/6KeMII6d4zEdLf7sxh3yKvjBQ7YxgkEao+kh18y8qcj Cjvk6SI02H8srRc6AuB4Ikvrr5sgVzgdVAQcf21ekBS82rxLc8c0vtLQMGHlvLGvju0I+T+vE hrDkyyn35g0zk1UJUydatBeO6er2/7tLUTjjQeBtjvSfejP0HmVumTcPdoKIPoabyMNco4rpR weR3V4Lvz/Z5JJnESInDiLxp8n70H1P7GIidkEdLVKt2gi1vNTQjKl/7zBwIqgHMf6+C+jm+1 FbYCPitKRAEVel8FlflEVolDx9hFRIWUXjgwHPvrvZNFbHHdxx8DtX/vyTu7xSOWjyL5A2aI8 YLKc/Ab+ab19bYi71yHLX9X/iTmbnqUJ6uyhoKrfynjlpxG6ica05WD7E+YSDNaWzIsTMOITK 15YnhqHoRjPq50hSRW30/yugjoaJKq85qtU8zt9LQTIy9cvn/zhYdJEqX6nbuZWxvUnqxXxWB nSgqurxP8GYUWvAyepzvdBeOgon/lN2SBH2YZr5WznY/PPo3dh6iJKD/+4H7GS9LNFG0RFYGC XQeEvLa4useiPIcsOa7iBEdhxF1j0tgKfsCqHBJDfLmaBsQN4QzPVNwau5BDfrbhtap/33Ebv hxCtwmr1z8Fe8E4z4PRlwWy0PWLkRgAS1gL9dARGZq3grIdCWYGFvkTK7vVOkyX+6lEOxT7O/ 2hYPSeHpkHpW+Hx/49zRljmJ5dh3rG94m0rSGF7dSnNZNCWK86WWYh4ZJBf8HFGWibZLT396u Ki7a190Fc0X4AGsKZl4A7RkE6eltLC8QE8tOOS00iG7oEhEKKi2zzyOl5rUFl393rKxC8eIX8 z80bp1m3rLHiDkdvBLtezEisIdJsamKtjkJwm/vTfmV1tv7SOIFSPgHvV5EL6dobXHdpxppdJ 8S/QieufMnJseM69k/q5GWPc84GGkMVK1v6kjfvT9vjUwVBqrEqhWltYaZMIU8AR5nvlVjlOD TUR9MJVSHROlECVrs4fz/iDbk0/ssqPOIMikJiAM3tMB1JNyWuUBMUBKfWtXQTO1E4RlI/eNh Z+U3ASICAfOOk6FTKH4zXhffByYXEvvaeaauqwsYRsqFL5PIPK19rCUjg== 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-python): New variable. --- gnu/packages/tree-sitter.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 9f1a30f0cc..d7c3468035 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -388,3 +388,32 @@ library.") (description "This package provides a PHP grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-python + (package (inherit tree-sitter-c) + (name "tree-sitter-python") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-python") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04b85qxqs64x6nhbpcgrzkbilxaiwvr9yd3h065rynv7rsdg0hii")))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-python") + (synopsis "Tree-sitter Python grammar") + (description + "This package provides a Python grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Sun Aug 8 23:43: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: 31904 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 BD27827BC78; Mon, 9 Aug 2021 00:45:13 +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 8B32527BC6B for ; Mon, 9 Aug 2021 00:45:13 +0100 (BST) Received: from localhost ([::1]:45600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTg-0002uB-JE for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTW-0002tt-V2 for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTW-0004f9-Oc for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTW-0001EC-NH for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 22/31] gnu: Add tree-sitter-rust. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:02 +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.16284662594562 (code B ref 49946); Sun, 08 Aug 2021 23:45:02 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:19 +0000 Received: from localhost ([127.0.0.1]:55035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001BT-Bv for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400 Received: from mout.gmx.net ([212.227.17.22]:59061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSm-0001AU-HD for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466250; bh=KWXxqbkkWjv4NWExqMuWMs0uYdyhLyDXMG9fPaI1Wug=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TGkC4bl4zJO1dsLSWHflN4+HBV0VJUrad4AGJey5q8Y9STU2Ffr06BWR3uTjt7dxk Zj64+JOpMt++nXGkZZ+IKWD+YWDX4QlLMeRglB0+2C0xB2C4O+GXd1/Whsj1JHW3Xh 3sMxaWtxAPVcFn7PInaREXvrqE+ZOIMfv3ftc/Js= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MhlGq-1mhpZC1yuO-00dqCG; Mon, 09 Aug 2021 01:44:10 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:49 +0100 Message-Id: <20210808234358.7241-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7nWXM/xzsT0H1dlyY2SGw4mvoj2TQoNR4Qzy/4qN2n6TKweRTky Mh07MWT3vWrk5nJjdBqKS2hQc+B2wrIsfSaEsHavei3iGB0YyFXqASsabRFLw5pciZZa2gw VBbRJFtNCaOt8LKkECm8R7mPuDk8Ub0VNTsI5B0FJJmbZQ7m4DBa1OWWo3z1aBGkKGWKNfO 4DHKW5JlS91Ofqa3w3PUw== X-UI-Out-Filterresults: notjunk:1;V03:K0:eGKMR3EEHOA=:NhmfjGgJ24HpVejdQoelf5 mZBaafbENaqVY50Df8iOwEAkywrGSDOszsZlI4aD0jpBFqKXEoPFRZ/2xB4sHPyl3K2ZLL2Ud FVedTQwf+pEilO1FhBfX0n3Jew46VXUc0fTGHUt/6lpZb9MkATXCIEjmbCZxDh0bEXXi+phZc IpQDOzfHjt+LAbdNLCWJ2041GUev4upNENpqoLVIn6EW1x0/19ODRFgEy3j+v8fJWIf/fvWE2 jimnu/TPIvrLI8a7OFFcB1lkn949RlejdjISUoxcgWQvNvwLwoC/8+9Dz79ootEO5zjHOm9L5 WQXqn91DMcgGks/FpqkFz/j5/9qTZloYFBDgqvdYLyxnZGWGjJ4oMs7AQ+vyneENGXjhd/2zB 1UKyDODfkdvFdVb95oGSTsqUyT8oQPBysuBhnXUQbnvD092DUIcgSinS09Mapp+TNf6zcQpUE uUvG8nxptm/3FkCh/mDIcSMVMEdhhWByY8JYxWUpOAxKUdc7rqu0WEh2CwJOtD2nwFamLdri1 IBQW3lkUNmQ90uuHLsKRF2up+YGeL9gld7TRbgHLx1tiK4j8/i05m5Q53Crj/4WKZrSstYLnk /ZZuEJepNwuMZTCF/5FeRAGa0uhDn0L/7btljyj/n8lof9VTsa0xRHSCZ1aa1rvwvVtc2FzcE KMHlC9aD1uFjWWvp/mWEcMWECgYYyJ3Me1E4tnVUviag1tcGW83MT/0ml3hzCS4KWQpRjqT+z c2BVLOBf+jYANa3bKTGOAdLMygcI2m/Oq8n4AWS38GnHA9JLFKwZYO1Iu3M0rqOU/vjTwA+QN bJ7ln9ZAhoUiNZWSYMoEr0x04aBKf7iSASdLYVPxTJFyvZjOwHgjcKwRE83nBliv6S+4Tq+U9 OQG99ySb+rJqVzQdTxT+xvp0Oec/cTzjVkNVtP5D67MTHFdtu0+3glg5dDUBboJMYnXUpmQna LVfFgDafOBeX1JLyUd5P9inU7INoalKulXVwItOS55zHR0slYHMEXtTFCc5pv3GQAcGKIvq0/ rhqjdUyKXgU6UKT1eV33lNcpiu3mFXf1VzFevKr4iIo+GMqHUi0rIncoVJXFaD3kw2L9B1f/Z rzoczQOtxowmPbNP6pakgreEf3iKaC94YnOe/JroMYl9vPOTryvJaJqig== 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-rust): New variable. --- gnu/packages/tree-sitter.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d7c3468035..6c2b2e7577 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -23,6 +23,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages algebra) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages node-xyz)) @@ -417,3 +418,27 @@ library.") (description "This package provides a Python grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-rust + (package (inherit tree-sitter-c) + (name "tree-sitter-rust") + (version "0.19.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-rust") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l")))) + (native-inputs + `(("bc" ,bc) + ("tree-sitter" ,tree-sitter) + ("node-nan" ,node-nan))) + (home-page "https://github.com/tree-sitter/tree-sitter-rust") + (synopsis "Tree-sitter Rust grammar") + (description + "This package provides a Rust grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Sun Aug 8 23:43:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31909 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 1637227BC78; Mon, 9 Aug 2021 00:45:26 +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 A39EE27BC6B for ; Mon, 9 Aug 2021 00:45:25 +0100 (BST) Received: from localhost ([::1]:46248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTs-0003OL-Oh for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTX-0002u9-PL for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTX-0004fd-Ig for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTX-0001ER-Hf for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 23/31] gnu: Add tree-sitter-typescript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:03 +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.16284662604598 (code B ref 49946); Sun, 08 Aug 2021 23:45:03 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:20 +0000 Received: from localhost ([127.0.0.1]:55042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSp-0001Bk-Gh for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400 Received: from mout.gmx.net ([212.227.17.21]:55573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSn-0001AX-4e for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466251; bh=ogMCDOZpYhgYne+HPX4ONUD/1czl+21nGVgXy7G7p20=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LENjyUMHfJLtJVXXqCsuc15Lqsdfwde1TEagJvW/9/t8Hhrb0YcMwRvWHO5NDftCe buzv8gtmRWyGDt7Aa3hOGzhZSAtebUBoKJNXDzESb+gVlQPC4/ahmJpAzQJB+itqjm LbtmxG5ApRsq5VKuXASo+qNh1yjwjAQY5zgv7dWw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MXp5Q-1mc4pS3So8-00Y75w; Mon, 09 Aug 2021 01:44:10 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:50 +0100 Message-Id: <20210808234358.7241-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:vC9FtyYfrjya7jZswpZOIvP8rsY5RrAA4lIK6069yqZQDCawY92 OV60shhcpblqUFgNRDcx822dk9jw8N6uzb34v1RtAh/A2At+R0+Kz6c0+AK7LRpYmwKjoHB VcWy9RhifpjS6Evrmw38ZdlA2m/O3gRpQWRO75uYia39YrgtEINyeJVmts2a/x1Nu7ZxibZ i33boqfGXEI4ZAI0i4mfA== X-UI-Out-Filterresults: notjunk:1;V03:K0:oghJLTr4wr4=:72bnKL10kh1OWXAwY/OyrR OYxLE7Lej/AYjR23q2aKnDMKK47ygRLC5cr7d8BsaN6cB3E2CcSUQ/6Suot0ghY/y/iXtfG1V c9iyUWNoyfPQqjg08VY89UN2jZzD/GdNuLFx06f/TGROi8kD7TEH50DcHHuGHC6r9l2JnwLKO dpoXQ+ydNEe24hGKaRwGpDLqzkopXfsVby4KuPCXjE4j3LzBcJRzTqxdy3PkzXqn8hxkK7da9 2RUyFzCEeAUdcMmaj2ZVcVVBCRit73ntPSDzrHkBBHYZRCSzMRkbuOSlPZP5Mh+XzHTTX2GtJ isofWjfFi8jdB7pFN+AzvP7+6/6fQH72qIv9ihYsVhq5GXWoOjQ33ZOSesDE/o9AnoFeAFthB j+3eQBOR32Ngy4XKm98oFEJU+wdf/EciOeEkfMWInT+HsqRpl7rr1omFU1kPcun3kbl+LkfOL dny8RnfXIHNhaKCZptaUSiQojPPAWeP0p3GlgEYUs2ZfUesX6hStOmp5cjIKTdHuxiISQAV6C Gl3ugABlsxl/7k/HtxNcrOv0PIc06UYAJ6sRnGcI5LIW7dNBrP7L79YLFKDudVqh/tGHddenc uHYc4hGlfbBgbtqxeiD6qeeEBlg4ClzAQwrTmL6xfENPh/JQdyqppPxoP61CxE5SufFACG5Vq heg+/4J8yS65d8DKIHjaVnvM2xEr1D1b4UMKqRmuASpZNQnh49BUXz79tOE9M5b2elM8aPdJh mU/y7UH2ZCsh+o6NdFH2uKPFxjDX81AQlF1NcEnqhoopw7NHSbkSHjL8NoXHwgypWc4+MEJYE TmRfUalJ/z7ozGv2n7RUWVDxZ5oIS0B+54k+/nhBUwPm8OzokOFY+7ZgmqjD1Ayd6DtjqAP8B 5fErA1os+ZPyP1RXs2l1813DPtgmEGAkC4NGN6LOABOHoNJbAkeSDl461xvfPVYQp4fziJlfS in2MkYK4Rs2wRebxorDNWbEgHl8Csy2tqqLXBk2qSfWs8tkjpknu0xv0C9MZo7+Hm9j1sm8R8 nWKYuhoq4F7zq9LpHXUm+RjvbaCiqeSEVo+iADD+lI+n3i0wRdiQep6vIhwoQCqbYCCf3KaTN VwfsaOeSg5QpglDsD2kAthED0/kpadqKyEKp07ZvuIPU/rT0XHnkFI07g== 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-typescript): New variable. --- gnu/packages/tree-sitter.scm | 60 ++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 6c2b2e7577..0f1946a77e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -442,3 +442,63 @@ library.") (description "This package provides a Rust grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-typescript + (package (inherit tree-sitter-c) + (name "tree-sitter-typescript") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-typescript") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01pkmwwmbv6kxda0n6g4cfg72ldmpi9gmp11a5gygn472vhrh2xw")))) + (native-inputs + `(("tree-sitter" ,tree-sitter) + ("tree-sitter-javascript" ,tree-sitter-javascript) + ("node-nan" ,node-nan))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))) + (add-after 'build 'build-gyp + (lambda* (#:key inputs #:allow-other-keys) + (let ((node (assoc-ref inputs "node"))) + (invoke (string-append node "/lib/node_modules/npm/node_modules" + "/node-gyp/bin/node-gyp.js") + "build")))) + (replace 'make-files-writable + (lambda _ + (for-each make-file-writable + (find-files "typescript" ".*")) + (for-each make-file-writable + (find-files "tsx" ".*")))) + (replace '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. + (with-directory-excursion "typescript" + (invoke "tree-sitter" "test")) + (with-directory-excursion "tsx" + (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-typescript") + (synopsis "Tree-sitter Typescript grammar") + (description + "This package provides Typescript and TSX grammars for the Tree-sitter +library.") + (license license:expat))) From patchwork Sun Aug 8 23:43:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31907 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 EA5F827BC78; Mon, 9 Aug 2021 00:45:19 +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 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 BC9A427BC6B for ; Mon, 9 Aug 2021 00:45:19 +0100 (BST) Received: from localhost ([::1]:45954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTm-0003BN-PW for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTX-0002u2-Bs for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTX-0004fX-5k for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTX-0001EK-4K for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 24/31] gnu: Add rust-bindgen@0.56. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:03 +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.16284662594576 (code B ref 49946); Sun, 08 Aug 2021 23:45:03 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:19 +0000 Received: from localhost ([127.0.0.1]:55038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001BV-NK for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400 Received: from mout.gmx.net ([212.227.17.20]:32935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSm-0001AW-Ue for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466251; bh=o3irwUCbEz4zUeaCJSf4r1PEJq28Tnb5USfkM2LeYfE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=lfDWC/kaulXKKDrXgctUY252yI6A08ElnOA1u7z6W7cCoCRNxcIPENCs2hMXm4goq OtF149JXYmDHB9OvkJJhtImygfxyVzx25pqI5Bv3QCplMg9BaNOxXofBF8RkCN0LxV Kuyz7RgJpz0eHYeXTTYx1mAPgKP339Cmsyn++HmE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MirjY-1mivUt0UPE-00ewey; Mon, 09 Aug 2021 01:44:11 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:51 +0100 Message-Id: <20210808234358.7241-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VUf6p0VN5Va2EddHNTLqpJ/GqeXeCdY0bouET7Vdxt2GnATgs0s JuyflBvQYFndXgRf8jWgwB08FlolraJbM9FLV9vm0JXckOPuNYJp0upflFCXfCAi6OeZWLR exgcmqJg869IhEme2Sbq6WibsEBaXzZMRvOjb0dwOMI06wyX8IFth92Wnoa7E8Y8fRJIKiv k4YiYJ+0faTpTZSKMyqKA== X-UI-Out-Filterresults: notjunk:1;V03:K0:EJszgW+FGos=:jT5VyG36ukT0TLdUVWqU58 254xuyfMQCfxhjWkHzHRxdglNXtUW6RRomHendP420DDrhue6iwa6ZECl4DYpTWaAmNJCC43w 0fNZ33dUhu9nChb7zLeRc4vlN7jYJH5u3XZqm19l+726GtwyEvpeb1mwMa4EZ/fJaWPbSW0wm N8W6d/kJKu+9cJKAIjCaxCtfFYBWqadqfcrKgExfyTlpgDyrL3JeSLuHiV3uS38FDIcdecvQ1 /TbuNJBeD1tUGuvKs9OEgQRpxO+rcYxyt5Ap2AR/lwBLN9X5LZHL1oo0eNY8V6pCwjJCesjAf zMQDtL+j/qnLTK4T/eukSVCGN6h8ForHoSgSVLu1+CxQtnEsSJoL46kRdxwmwDTSj14YPtpHf gsXjFdkp22yT16YffmeMW7O/JJong4ApltsJI22gVvi18EI0GczDqOVnkplobs3/OBBs5U0+t oiXaFzb11+xfjtg2N5onVdYpRsMWgDMiy8sj0lHwL4QK30uNU9bbSoIhg/5tO7XgLDrnh9bEz OVeRA9rJ1HtQgQl7mRTyuRP0jCJqizFBnhIms33wzOGxMqvKoLbPmE22iC/VUo1b7C0W1GJam EQ5ti3rFtPOjgqhEf5T7XXwEPFVnSz2BUe3AAK6GP0HnA7v9iLzLIAvAN5NAsxkpvNWnWimi0 gfgQdszr8bxlvuQBnlhyJ103WpOuUE0D6YRH7/Gu9cqLusaaJA2NIvC6V6CXrEVRAfqu69qnj QMy9V1NnrP4hDhjE8QJXz5wyAeOt53WJzLgmoW6bclTDy+1ZfE7Zqpsu0cdzBocPmkdeLRyrG h2u7W+z2MWLa9QV66SpkwaqEld+IZaU20BW29IejhemwxyBhNaInz63RJ0zAyxUn0SliYzLiN 6V11mG0jQ1qkHWWzhmA8H/gNjT9aV2JZaNYjFRbvhCD7GNP73FYZNAGVKK7xHIXULfpyl5lXy tUYcFnxxesI2IrXfcdKGAPPvZjI5DLjg4D1vBY3nq4XV1ZrS9ExG6P2IOhGX5zvTVok9PPos/ qqpyOd5+56GSsRyx+DzUP/P+EaH/6SQHWhrqLKAcGQpqfp8VK2yc9e07XeMK8v+uad1pkn73h VtX3Mgo07e+pnSoegHwikJ/NKQ3EG5t7kfSVeQPaGtLEzMDzudUWm1doA== 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/crates-io.scm (rust-bindgen-0.56): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) -- 2.32.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b551e6921d..44f8885adb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4482,6 +4482,43 @@ bindings to C and C++ libraries.") ("rust-shlex" ,rust-shlex-0.1) ("rust-which" ,rust-which-3)))))) +(define-public rust-bindgen-0.56 + (package + (inherit rust-bindgen-0.57) + (name "rust-bindgen") + (version "0.56.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fajmgk2064ca1z9iq1jjkji63qwwz38z3d67kv6xdy0xgdpk8rd")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-1) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-3)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)))))) + (define-public rust-bindgen-0.55 (package (inherit rust-bindgen-0.57) From patchwork Sun Aug 8 23:43:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31908 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 9182A27BC78; Mon, 9 Aug 2021 00:45:25 +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 572BD27BC6B for ; Mon, 9 Aug 2021 00:45:25 +0100 (BST) Received: from localhost ([::1]:46220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTs-0003Nb-Ek for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTY-0002uu-O7 for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTY-0004fk-DK for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTY-0001Eg-9t for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 25/31] gnu: Add rust-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:04 +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.16284662614612 (code B ref 49946); Sun, 08 Aug 2021 23:45:04 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:21 +0000 Received: from localhost ([127.0.0.1]:55046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSq-0001CF-KU for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400 Received: from mout.gmx.net ([212.227.17.22]:33013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSn-0001AY-7Y for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466251; bh=2gRDpeP3TIggo76wJJgVfCISnS6/NKTnCc1jl0L0k4E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=j1OCGimTIyggE7z7vlth9ULpSca+lq302ftRFDAXBAgeYew66q4122/7hSUSNW6NA 9lmXXuAC28fdKoewidcykyXZ3/FfynVf379YFLqreyDECnW1u4jIloVCLEwNWSTg7L zmvUZiffP9Pe4upoILd5VD6MQvL8t3T73Ej3y0SY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MIdif-1mIdEk1dAr-00EeGb; Mon, 09 Aug 2021 01:44:11 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:52 +0100 Message-Id: <20210808234358.7241-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:X1hd2F1V1cH6AR8HFZTxdTtkbfsjAo1cQlwaBe/dR6ljAP29bew yqapIL88k8tE039jhOFAfxlnvS05uSZEHZlxGJGVvhEhuqshfp9dyILlZ7MpXypUIOKuhFF L2GxXE+JYO+v6IDlasqSaZ0LQQvHurFNxNqE3uAmfm9N92QjZ4skCqwruwuCm//4/4Vedfc mNR+XYogO781rvSj6eCnw== X-UI-Out-Filterresults: notjunk:1;V03:K0:7b6E1Kwcrs8=:TpUexEkAjjo4k85MQ9QET/ wJEM0Rf2VWBbzVt5WRkCVb06+TRpEw/r3eg/i0tSNZkCdmgARfxB2o29FfiUGxcvODIlBjtI+ NR27+aYZTNNzQE/bdYSclTVOTklkaeZmfDCU96PTIwKGMztGspgP9x7Q0Z9e4X2gaozdwI7/B xnnNJC30sT6tjr/uhFuA2RrVbrdsjCXrsXFv20fQcqGs28w5pWyxeRT74EhD/nVKzg2edIees jvMfpUlK0MKLmevCZZczxqkL5+DTi/1zNCFcyf8uBleHshcSUWoNl82mRqeWQ1kPIZ+zg3kJu wSy/TK/XpJKjcBoCXiS27tDoYQUdOQaAAWh2qmq2ZddDp0+6PD+AG/larT6CNRmICzafiTsHB DJv9Vb7Xbf6rcThPzha9XcLYE/SDnwI2nLw2qckYE3Sf4N4VqCaU8vOIXNtK5pzWy2asLwuru LsVstTdle1hs1SfDLLKqaJA2G2xE5NMXMnIgEDbIow5AAKCG49xgt/PezSo/gqSctGuX9/wDL x4w9qx4pebvDwP8kJbTKK30YF54SPhQPjW0rA92DLO2UqX79srYC4VL6CY2X0ZSjw1gYZ2za4 P5qSaCBWM/gufHiGUSEMCNorWbSuxNNc6jWjfosRT6kq+SCESqI3413YgzCxLYcukFJSOTXnl bmQliTRCoSZwHurgvCJeTpSDbqRL49QTntQWxjL+7ZBFhoJNv3fp3Hy8isBYISj1y/rTq9psG iK7lzjW4C400VlaehffUdHHgW14/6TBJjxagQH3luLKMk126t6HjhVyk3OxvJvWwV0Ms+lAC7 AgfY5l0j3W+FmMrAjgfHandxFM52rvRNviPHy8M64L5KV1RDM/yZKjr78XQXGQAIoUTqcbP3B c8mxc/FEW0BfabLCadzeGwVsUGPxuLAi6vGAAQ3Lecg4CyBGWjXgadT5pdEKtKcRO4fINB21q bi5oi2fiyvL30lAF3ct3M0LgZY/BUOmrYkCEJCjKFSDqp3GG+whJY/X7Q/h6uNPO6moX+n1x/ oYSIT3Av07ROLKRBSNzOBfnFZrjBx/Zk2E0giw7VvtVdge/G2CS99KVINli8TfvgCJmRuQa7B SXBf3xW74PIZ4kgxOGn9tQ9x/guKU9FuyCOx0EyOFKrS4U5ceuxMGKP8A== 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 (rust-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 0f1946a77e..4817b293ce 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -20,6 +20,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) #:use-module (guix build-system node) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -101,6 +102,32 @@ This package includes the @command{tree-sitter} tool as well as the runtime library.") (license license:expat))) +(define-public rust-tree-sitter-0.19 + (package + (name "rust-tree-sitter") + (version "0.19.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "tree-sitter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h6adq5kqf4izzsklch5lfxx2aisxga463zz7w44rgwnck16wwmd")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;; Running tests misinterprets comments as doc-tests. + #:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-spin" ,rust-spin-0.7)))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (synopsis "Rust bindings to the Tree-sitter parsing library") + (description "This package provides Rust bindings to the Tree-sitter +parsing library.") + (license license:expat))) + (define-public tree-sitter-c (package (name "tree-sitter-c") From patchwork Sun Aug 8 23:43:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31906 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 69EA927BC85; Mon, 9 Aug 2021 00:45:17 +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 0799B27BC78 for ; Mon, 9 Aug 2021 00:45:17 +0100 (BST) Received: from localhost ([::1]:45712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTj-00030b-Va for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTY-0002uW-EZ for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTX-0004fi-VH for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTX-0001EZ-Tg for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 26/31] gnu: rust-emacs-module: Update to 0.16. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:03 +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.16284662604606 (code B ref 49946); Sun, 08 Aug 2021 23:45:03 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:20 +0000 Received: from localhost ([127.0.0.1]:55044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSq-0001C7-AQ for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400 Received: from mout.gmx.net ([212.227.17.20]:52195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSn-0001AZ-G3 for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466251; bh=OweyIdFpOsej25eRG7LiMOr2qN2MdLkbjhox/0X0Wlg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RZ0WsuYhFa6mbcEsINUqixCkLrAZ1qdRLVEp06Bo4PNftvI8lwaQoEXz9zryZN4Uj M1Blm0wNqy1tCLEyI0A9mKWL6hxKw7T4tqMaHQaiToy0ps/XgsyoRCxtHQrteXLYTh XTe0oHjy8BGQbl1LnY/vw7vQ/epiDApiFJKA/6VY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MaJ81-1maA5W2oVx-00WB9R; Mon, 09 Aug 2021 01:44:11 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:53 +0100 Message-Id: <20210808234358.7241-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:GdlYNjb43xyA1t+ARUU8kdc/yTAc4T9Z2BvqzXk3FppjMHVee0J eH+JVkC1/JlypM2OqCpDO9g1fkYvCRZ7ik8Mtcw4WTIzd0D9tpYgNk7XSEcJOwymh2l7xhT LjuRNrTMV9wFcLqMCHSJybB2vxi+nQtwX3EOjGdHwizQCKktEF11Yr3kNRW+nJi2Xjsn7/9 pKHFeQIlh2W/gnjHdpIdA== X-UI-Out-Filterresults: notjunk:1;V03:K0:iP8VSFFYCvQ=:yOb3lD31rdr/Y4mH4VoawI fx1dG6PNNqDsSz0qimlSpiDokF660zcZYwUJWR/Msoui+4BDdztTwiGVuxhT83Cjhrqi9uoF8 4atKMZWtoln8n6qLPlzBWzqQafQu8LylW72jqv2w3+WoYgPTOMs5sCRjKu8MEgdgY7XecB7Bh o+rbeSaG2QOAInJvz1SR+r7EQ4CsmqckXfTm91epoIpcTZxkSQ7cFuvwPjZ6PDZdH1fCdzu+r Xi1CUEgOyqWguJfo2eO3Wl5mApnibag4Ye+Ra1pROjxuCS3vldRk0MA6u9pRI+44xYP6kRa3M LsvVJKVh9JiaictlK4vb60FDGtc/xVvn1XhM9AsOnStf41omG72wpDIzqTeouWh8QuThJwk4m LckT1z0UUv9i9McbW/+5SI7lV3mxfU3Q1+QnOrvRX0ZCOt7Ik/SOBADQwCyQw5xQnf7XApO1R y5o0EOYdF3hp+mcrq4wk+tQeAGpoicDLZvoS0y5QPb/I3RbARBVg7BMu6HfAjYwcAs2KWQasC /M1WsB7u7mJs6iNnJYe/RUuGu6xqpCd16I9Z7XYx9ldEdZX4mrFZ8aypPQToWnKGvhigRM2cE w3ZxjjjidPb5GcTRoqnXceMj9U4FhDvvHCFT9EGe8Zm9WjGf/WP1CiySZCXXbJyBhMSOWRq/e ZIRIyhjXSOC4w1aoLeGXMpuprEuoJNixvX+IcaG1+o8xwIr+TvcqnfR++TcfuBsWD8z+J03oL I7vbf+Oa5TLhceYEpjQB5XlllTX5Wu3/m46s7KBlfJwumToxHlaH2/kUAf434Iqd+LrasGYwp 2zhfsAw4gD1Ik9aEkAN5S8cWvbUj2mbY6d0ZWLDXIuN3/cEXK8vVFPWLhmFMQWphfPXS+MY8N WmK+IIm9LK558c4oIyBSwtAKyDNQ/pCzlg6lCsIZujyETstEkMjhr3iZymhKOLRmIIMnlE0F/ zGKbpViSTNZh4mipKokSC2CZqXes+g4CNNQ+ZIfB0NpQJZ1Vx00LtNEzbyC3dLiux7kz9g4Xq iSSNjsE9QEMpioxFWlB5FRSPbC59e6uCCaipgKs/8IM+FqQzO5XNqwSBYaUG+kWRXqCKKFUoC Cky+5IMmodMWpDnv9J7KX9d26AvNTMeixoBkXQ6G+YUFlZDEzfVeK3Rsw== 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/crates-io.scm (rust-emacs-module-0.16): New variable. (rust-emacs-module-0.10): Inherit from rust-emacs-module-0.10. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) -- 2.32.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44f8885adb..57a287c5d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14638,10 +14638,10 @@ Emacs' support for dynamic modules.") (description "This package provides proc macros for Emacs modules.") (license license:bsd-3))) -(define-public rust-emacs-module-0.10 +(define-public rust-emacs-module-0.16 (package (name "rust-emacs-module") - (version "0.10.0") + (version "0.16.2") (source (origin (method url-fetch) @@ -14650,11 +14650,11 @@ Emacs' support for dynamic modules.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g")))) + "0s8qrh0ggjmqr04zkcf7s4ijmpd44rjcag78npnq64jv10lxvsry")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.48)))) + (("rust-bindgen" ,rust-bindgen-0.56)))) (inputs `(("clang" ,clang))) (home-page "https://github.com/ubolonton/emacs-module-rs") @@ -14663,6 +14663,23 @@ Emacs' support for dynamic modules.") Emacs' support for dynamic modules.") (license license:bsd-3))) +(define-public rust-emacs-module-0.10 + (package (inherit rust-emacs-module-0.16) + (name "rust-emacs-module") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "emacs_module" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g")))) + (arguments + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.48)))))) + (define-public rust-embed-resource-1 (package (name "rust-embed-resource") From patchwork Sun Aug 8 23:43:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31912 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 7547D27BC6B; Mon, 9 Aug 2021 00:45:48 +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 DF23627BC78 for ; Mon, 9 Aug 2021 00:45:47 +0100 (BST) Received: from localhost ([::1]:46994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsUE-0003wp-TQ for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTZ-0002vr-1n for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTY-0004g2-PT for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTY-0001En-Nc for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 27/31] gnu: rust-emacs-macros: Update to 0.17. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:04 +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.16284662654624 (code B ref 49946); Sun, 08 Aug 2021 23:45:04 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:25 +0000 Received: from localhost ([127.0.0.1]:55048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSu-0001CV-VK for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:25 -0400 Received: from mout.gmx.net ([212.227.17.21]:46273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSn-0001Aa-Qp for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466252; bh=wRfOA4cMk7OH1KhCIk4ifbmDuSWPpVGnU+0i5CBhz70=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Vkviyd5N0KO3fJiyCNaIXVXsKRc3oQ60PEvX1NfsEkuV8qX9OcG828onpTEJ9yO2g z/xVIKLGNm3oChAy9NPyeWc0EkAY/qRyE5eGLWcVRI9OIPW0MrBu62dA/4v+ytg5Cy c2V5Mdl1DKRGHuk9Tc4wHgS5VxmC9tSnNllQqcbY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MjjCF-1mxzvM4AF1-00lFn9; Mon, 09 Aug 2021 01:44:12 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:54 +0100 Message-Id: <20210808234358.7241-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CQ0RCG+nWDasW9M1J3XOREl6P+LMD0+8IzbTmt6Tv68nmD9ie4n Rn0sJT28fdujFcXRfootwS8JbSe/6KvUCMtYuUjaNVeJxL7kiViq0+jKAyOeQh/NeWA6KQn 7Kur67n5GSynmhhaAkBo/n3w5QWwt7TljoIBMkVLw8fEYK79NiscHHMGI35FcPIarK6ZDgd hdy79kyZAbAiH3y0O6xog== X-UI-Out-Filterresults: notjunk:1;V03:K0:jtChantIrqY=:XdBDKUwqdDluHSJwPXnpOO Q5AgnnJ/z3AJfcUI5AakEXLHbpoonvhUvqiOmEU2BB/dO3Wuuf9207UeYGxYspi9qbJj1cel0 6HpXa9Uuo3WAarpWTuXQZ7m7e1BbyLaZkiHooGVjvbgHMHXR3Adh9beiiOaSp4onlE3AqGKYy 23vBQedjCJ2+y61oZBx6nQ/UENup90v2Ad2ZcDKi8LGUsKoI7GHfqzwaLI8JeV8vD8Z0WfwMz dvm/LxmBOBlx2MHBwF6DgAJSVQHBgOYSurEiKGci1JXOwtkUg2rmo1Kay1J0jPIewGWS4Fxu8 7eBMkzcec+LPHTlPdfuinhS07UFfrtXefILmBDy3IYA5MKt4jZYzDlZNfX7o3HV7oKqgpeioY /RLcI/Df0MHBvesU+qDW55DhmB23ltV7/NGQDzINBmDVDyXxepOCkM9C3PYyaa/cuOojjqhqy ucVjlLXLtR2fRZTBjN1Cg60NDOFUAlQHsEj/JJEo7QH+LldtPXGIcgdCbIORf7tzAvhpi0tpY t94KOAjO3KRI+/pZj1uU6KYsOK+ybHCUrAMcjFgivWKblGX2zBOKgQ8cUE+beQdZL2gSmU81b HQ4tfewWHMTQ4cWcU7S/r23Pf5HhDzOj9zeHsZ1lC3rO+EDPr3qdJN/774NJGBnb4YOaSnM1x 2jK002cf29Ow2WxiVbUbCBoraQPivI2OdnWYsv/eUzlcFqCgHvIfndtNIvcpLlUqhHHlQXIlo 9pSqv0KhuwYz7bowAvgfGrmzHtCkQQmmLL1DLZEyNwZUQ2A8HLiSmeiXnW0vnfBwAw9cXO3gD XjCFNcA6F5NS2TmOcg/jbuJ+9aEXONIkQaNEHXizTBi99VpnJjtIRE1EHr3s2Cyjj4x0UBaYD On4buTotvApjRLRQG42ZI2LJBAj0995lF423p0AD25+6Qabp7VhtTgisCapebbxtaRPZfK/Vy eng0T0biIm/Vaf07RZEiGLaR4/FtWJHPt844klhXs6X+WR3OdZWB4Byx3VAEhPcbhZfjL68Hg d86eID1qkPfHMerJl0Lp4FmsHhLn3XbHNNzHQbK/rEf3WqJazhJlU/0v17OSt5KDcOaW4FbRF a74BslErs8D684rg7us0cd1M8OhJaXx9EFjc7Wz4uWXj/hpq4aSfuxdMg== 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/crates-io.scm (rust-emacs-macros-0.17): New variable. (rust-emacs-macros-0.11): Inherit from rust-emacs-macros-0.17. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) -- 2.32.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57a287c5d2..365cd6dcb1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14614,8 +14614,31 @@ signing, and verification in pure Rust.") Emacs' support for dynamic modules.") (license license:bsd-3))) -(define-public rust-emacs-macros-0.11 +(define-public rust-emacs-macros-0.17 (package + (name "rust-emacs-macros") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "emacs-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qg1dcn5acbirq617qq2fgg9adswif2dnr292s3qnq62wzgnyrb9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-darling" ,rust-darling-0.10) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/ubolonton/emacs-module-rs") + (synopsis "Proc macros for Emacs modules") + (description "This package provides proc macros for Emacs modules.") + (license license:bsd-3))) + +(define-public rust-emacs-macros-0.11 + (package (inherit rust-emacs-macros-0.17) (name "rust-emacs-macros") (version "0.11.0") (source @@ -14627,16 +14650,11 @@ Emacs' support for dynamic modules.") (sha256 (base32 "0390y8vafxdi334hhgrzvcqjq3n5ckcmvilqcfp8vajjq8irrly6")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-darling" ,rust-darling-0.9) ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))) - (home-page "https://github.com/ubolonton/emacs-module-rs") - (synopsis "Proc macros for Emacs modules") - (description "This package provides proc macros for Emacs modules.") - (license license:bsd-3))) + ("rust-syn" ,rust-syn-0.15)))))) (define-public rust-emacs-module-0.16 (package From patchwork Sun Aug 8 23:43:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31911 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 2983227BC82; Mon, 9 Aug 2021 00:45:48 +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 98CED27BC6B for ; Mon, 9 Aug 2021 00:45:47 +0100 (BST) Received: from localhost ([::1]:47002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsUE-0003x7-Lc for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTZ-0002x2-CC for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTZ-0004gr-5a for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTZ-0001Ev-4F for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 28/31] gnu: rust-emacs: Update to 0.17. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:05 +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.16284662654631 (code B ref 49946); Sun, 08 Aug 2021 23:45:05 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:25 +0000 Received: from localhost ([127.0.0.1]:55050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSv-0001CX-BA for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:25 -0400 Received: from mout.gmx.net ([212.227.17.21]:51033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001Ac-4g for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466252; bh=1QxP862Oy5nDbaMcN+nZ2PhUZn56ZAT1wUK15ZkZI6E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JKqtj1BmDALdpu1OeDqn6VroYl1vPRm7A4wr1cMfYKMC7JkoGlnt6zJ/rJ4rwVXuy traguOeoz0i/vu4jkLFtJVIZXk6kn9Wfpi5EXRzQQfTh8LpYus51j+jMsMV7QV/GN8 zbDkQpFglaHQhxPwB4JXhuIQUIKbphuJFHl64fXI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MdvmY-1mnrRK19cs-00b6u6; Mon, 09 Aug 2021 01:44:12 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:55 +0100 Message-Id: <20210808234358.7241-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:EdO1Z/T/05l5vhQ0Q7mLdhswL2TeQf/iiPx0rGm5GIQCJ2uy8+Y PZqiPYEOcyWBbFPfsACtnlZ9vw6Xytuyz7lJZZfmu5DdbIKfuqEgjDxeku1HlalzQeTcx6a csWUe536Wb9cMfZZ0KO3hikI9CGqdSoen5S6AJzO6h8mjReMQNjRQn3xqkhaVUg9+5Fany/ xnZj2wjosZIRTPJB6k+sg== X-UI-Out-Filterresults: notjunk:1;V03:K0:iAMdqVlrQjg=:7V49QE5WhMH/06pwZtiA92 QBymNrZ6t0w0iQFWhxTKRTQlNqqxi+3RjmHOdZuT/l7hv1rjWibkrTqdw7YBoxx0FXSWz9Tk3 W/V2uD1D7hL5SQV7Fvi/OVecnkn2Mp4pfbyheU2meNJtGQR3atoRo9GNPGmKYTIlaizRaIWxJ 1kgvMx6FAKoBALCn74iOFA35PMt9qsCA7j7EPr84/BQLCCy7bUWdHvV4P1+1PAkpjNTyJ4tK9 7U3mKPrNJe9BjWWpxXl6SB1XjGQTXxsZRxbJoUpdXHNsHlyHxC8CX+FgQMnRWbxuBPftVQxRs +xVbwC7OvbLMzFkCjRWeseLv2se6GwtIKPCn/uti0prqUIx4FpObZv6umyisFZj/EvAEHrh2Y lxHAU/h+P039IStH6aB36ORqE5GCGBvXjr4NROw0iDP6eCWPc33PnYi3vj/h+5zLGLOob+DgZ PFthvHAbyFaZcrx9fNtBwsHN5cn77NcOjJ7atbJ8QqYOza0WRLKIVkSQnLct8HH0luYAH5F7q ItaNizCIsoxAArLTPuDT24NohdJZZ0ZJvM6+z8dFxWOdEgnphJXR9G4Npatg0FdHCtXdnPZN6 L+EP7cORkIGhn4Tr0Lz+CUHaunAAxGghh4MWY/zYB59U6JftimQoHIk3aXx4AIidw+LlV1cjX fWRvq793oB8+/tVNJkXjuUcslkeq5NLnBrtCM5jZnaz2JLqkmMWsilSbqaEW/K3T9Pw6HreJi pusQtII1FSwM3KS2u41ZDNRiNLP/JhsB34pogYoTytwelqQIhhnwA/DYiIqZxARQ7JcjSUrUT xtei78A+UFjqIqHTL6L5DxYqj2cQApzoRPMmHAYYrWPV7ao29VndOQfTBmdxfh+7xGOfTd03m Q7zTZs9XCwZHpEv67hjzjWJF2BDh3RRrGc8Xne1xiTlepZ5W4NS3OT0zYD5Hs2D+wuJW0s9t4 pD3b3ukeN+Dl7SQr0De4hK9r/1OmmhSGhOtbEvUf1j425Cy9qweoxBEHArynToKx/YERdJgVe DxpeVpjqUdpgF3zSHpjAbnpZ4bu8Fo5lbu+yrIy4vz+JYs31ieuUT+hYfUHU8wKHQP6LJaqUe g4DE9Sel72Vc0sBvDsnyHBrODMMyXX/ffqR57ECW9yUdHTujqfNzrejlA== 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/crates-io.scm (rust-emacs-0.17): New variable. (rust-emacs-0.11): Inherit from rust-emacs-0.17. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) -- 2.32.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 365cd6dcb1..6b7dbe689c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14583,10 +14583,10 @@ signing, and verification in pure Rust.") @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) -(define-public rust-emacs-0.11 +(define-public rust-emacs-0.17 (package (name "rust-emacs") - (version "0.11.0") + (version "0.17.0") (source (origin (method url-fetch) @@ -14595,16 +14595,18 @@ signing, and verification in pure Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7")))) + "02f31apvz03dr0dwn5wyirdmqkk2d635iki0kmsh291xr6dysy2q")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-ctor" ,rust-ctor-0.1) - ("rust-emacs-macros" ,rust-emacs-macros-0.11) - ("rust-emacs-module" ,rust-emacs-module-0.10) + (("rust-anyhow" ,rust-anyhow-1) + ("rust-ctor" ,rust-ctor-0.1) + ("rust-emacs-macros" ,rust-emacs-macros-0.17) + ("rust-emacs-module" ,rust-emacs-module-0.16) ("rust-failure" ,rust-failure-0.1) ("rust-failure-derive" ,rust-failure-derive-0.1) - ("rust-lazy-static" ,rust-lazy-static-1)))) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-thiserror" ,rust-thiserror-1)))) (inputs `(("clang" ,clang))) (home-page "https://github.com/ubolonton/emacs-module-rs") @@ -14614,6 +14616,28 @@ signing, and verification in pure Rust.") Emacs' support for dynamic modules.") (license license:bsd-3))) +(define-public rust-emacs-0.11 + (package (inherit rust-emacs-0.17) + (name "rust-emacs") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "emacs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7")))) + (arguments + `(#:cargo-inputs + (("rust-ctor" ,rust-ctor-0.1) + ("rust-emacs-macros" ,rust-emacs-macros-0.11) + ("rust-emacs-module" ,rust-emacs-module-0.10) + ("rust-failure" ,rust-failure-0.1) + ("rust-failure-derive" ,rust-failure-derive-0.1) + ("rust-lazy-static" ,rust-lazy-static-1)))))) + (define-public rust-emacs-macros-0.17 (package (name "rust-emacs-macros") From patchwork Sun Aug 8 23:43:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31910 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 522F727BC78; Mon, 9 Aug 2021 00:45:32 +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 C63E927BC6B for ; Mon, 9 Aug 2021 00:45:31 +0100 (BST) Received: from localhost ([::1]:46522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsTy-0003ab-RR for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTZ-0002yA-SB for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTZ-0004hb-JW for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTZ-0001F4-Ho for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 29/31] gnu: Add emacs-tree-sitter-core. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45:05 +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.16284662664639 (code B ref 49946); Sun, 08 Aug 2021 23:45:05 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000 Received: from localhost ([127.0.0.1]:55052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSv-0001Ce-LW for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400 Received: from mout.gmx.net ([212.227.17.22]:45303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001Ad-DT for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466252; bh=shRZoDOWrmuUCP0eFRbx/3IRBHzxDu5IwQ8E55n4Tg8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=U5Qp3d+MTZKQCtLvd79sRSbuXr1PORDYFQJUO1D1AcX7gqA2yMCpANUoO2v8TqjP+ QYn+y9Pu20hD3Qzj9mHbJ7imBB3InX42fTbDzK4vpR+RS55R3a0VWbK4eErPMv4jQN ZacGeo125sISYHxxFlT3ojlKyVVeA+C1Cz805V+U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MeU0q-1mnJCy2KU0-00aYwG; Mon, 09 Aug 2021 01:44:12 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:56 +0100 Message-Id: <20210808234358.7241-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:JdM6uC038OvSgOPmM1gDwlmz6yWgeQvE9cOTcODMbzDuHVgY6gi N5W7jcmySGY2WTMnGGVA7ForejX1PG68KZ3oFYHSyGy8BZ/LeorzpA/ArMbTFQJZOHqMkRf hWRsiX2DpvX6dH5SB+gqRleIjeJCQcqs5qu5r3SXmGRR6xY/TZfXFfxbMXmX3c8RulkuR2D eY6yanlTQaZ9wsxLsf4bQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:z1HbeflHH54=:5zxr7ZL3RwBOo7uBCch5qp /iXR7UP/eaLjsqgkRCvccGlpc3GMP3qkjb953vz03q8SWqMzdPTXb17nRgpiqc6V9MTmobg31 A8CynvEBRN50z5RxFDEbdte7AdX9nGezF21yjwC9hMwRZSpimNPNtpbIfLAYDwgIvsfmVAFcT pRrJHujx3oHC5psBl4HM336vfdqOr7dn5B4lFT5Yg3ESWjKEMVuM10kdsWsMNSU+5glQqCYQL xXRlY4g7XS4Fils1TkZUYmght5QtGRfwx2QZYQmb5hFqZjKcnDByHB7RJ7Y7Rcpqu/S4R2sMY 3jtjJNnIGUxv0kANYl4WnHLxWuAWHZDxw0XyQZoj4D/uNRWQqJhPAQmvLrGxwIXgbjgrslmSX mhzpCSC4o5DhZol9laN+1cR4Q44ok5CRVQP/FmOtoClEXHYmK/xAyQmgIcbs56V/LuCCq3JjF jIQ2ZFSuERQ1w6Y3epXHdijDmjJl/kiVA0adNjA+3+E7TBLmXxrHZDPZvBCxzcvOItr3CWvQy SSyxSrPebEqb0VKBYwYM3k31AqsvO6ruVhF/wNSGm3uNa9oiZAoJXt9I1oUgFGVG1MgLg07My dvxQ9bokX0pHUpSpsFuhZKHl648ZeJUS3AWsYco7Ys9tuM9CX/IRp/3eSBoOEcYyj32/MgQk5 Uo83zK4qmywJx9VNHZQmmI+pZ58m4ST9oCDK9lkpzjLmu3MH0q9CBOSF+aVoK54NCKkxVUgvP bt1U8u5h05QBDA5Ik1pCGqjXdqxjkAvRqf96+NG/qtE9kx/UirKp5tleJCPhU6E4A4PzSiyLe PE1P5LkPguBNTwFO6KhcInTqUFaddFDuXNckpktGr5sUCxt8ks6lrBeZWqxuSDMhW1DCtbjjB wPa5i2Cn3lJ7gWXgz1wX6flWTtJM33w4noxL1sQY/PzHN2BsRnftMHv1BJ0VainZhnpbVK/qr Ecvcb4AsFeEOwapYlwu9jFIbjrA9iiOuyI3gagq2FQATFWflCYSbsy34dBpsfjosuq++E0xAV CjCAqSnP1gfZ/fGL4q0V5fPGythBdkActNAB9+jsg+bvkSI6nA6bhQvkgiYzehIJMoevIVqbV r2lZkVLB3Xzf8/RzT0OwertU+Heg9h35XVRkZyCJwsnq5mVj/7xMhNCKg== 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-emacs-module): New local variable. (emacs-tree-sitter-core): New variable. --- gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4817b293ce..a9c1714936 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -19,6 +19,7 @@ (define-module (gnu packages tree-sitter) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) + #:use-module (guix build-system emacs) #:use-module (guix build-system node) #:use-module (guix download) #:use-module (guix git-download) @@ -27,6 +28,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages llvm) #:use-module (gnu packages node-xyz)) (define-public tree-sitter @@ -529,3 +531,80 @@ library.") "This package provides Typescript and TSX grammars for the Tree-sitter library.") (license license:expat))) + +;; Local package definition solely for building the native emacs module +;; written in Rust. +(define tree-sitter-emacs-module + (package + (name "tree-sitter-emacs-module") + (version "0.15.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as")))) + (build-system cargo-build-system) + (inputs + `(("clang" ,clang))) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-emacs" ,rust-emacs-0.17) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tree-sitter" ,rust-tree-sitter-0.19)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (add-after 'delete-cargo.lock 'do-not-fetch-from-github + (lambda _ + (substitute* "Cargo.toml" + (("\\[patch.*") "") + (("git = .*") "")))) + (add-after 'do-not-fetch-from-github 'chdir + (lambda _ (chdir "core"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (install-file "../target/release/libtsc_dyn.so" lib))))))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:expat))) + +(define-public emacs-tree-sitter-core + (package + (name "emacs-tree-sitter-core") + (version (package-version tree-sitter-emacs-module)) + (source (package-source tree-sitter-emacs-module)) + (build-system emacs-build-system) + (native-inputs + `(("tree-sitter-emacs-module" ,tree-sitter-emacs-module))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "core"))) + (add-after 'install 'install-module + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out"))) + (module (string-append (assoc-ref inputs "tree-sitter-emacs-module") + "/lib/libtsc_dyn.so"))) + ;; Writing "LOCAL" in this file prevents the package from + ;; trying to download the module from the internet. + (call-with-output-file (string-append elpa "/DYN-VERSION") + (lambda (port) (display "LOCAL" port))) + (substitute* "tsc-dyn-get.el" + (("defcustom tsc-dyn-dir tsc--dir") + (string-append "defcustom tsc-dyn-dir \"" elpa "\""))) + (copy-file module (string-append elpa "/tsc-dyn.so")))))))) + (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (synopsis "Tree-sitter bindings for Emacs Lisp, core library") + (description "This package provides core APIs of the Emacs binding for +Tree-sitter, an incremental parsing system.") + (license license:expat))) From patchwork Sun Aug 8 23:43:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31913 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 95EA727BC78; Mon, 9 Aug 2021 00:45:54 +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 5BA8D27BC6B for ; Mon, 9 Aug 2021 00:45:54 +0100 (BST) Received: from localhost ([::1]:47488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsUL-0004M5-B0 for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTa-0002ym-Cj for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTa-0004iA-3b for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTa-0001FB-2A for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 30/31] gnu: Add emacs-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45: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.16284662664646 (code B ref 49946); Sun, 08 Aug 2021 23:45:06 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000 Received: from localhost ([127.0.0.1]:55054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSw-0001Cm-1n for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400 Received: from mout.gmx.net ([212.227.17.21]:49817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001Aj-Mc for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466253; bh=MxIIl6QtYgn2aURnCx6u80YepVwj/NjskypHsa1zeGM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=R09uuqvcxyvEfAB96JGyQg7MEnqh3pMeoudFN7Uy0DoICq+sEhqwYUFOCVrCtLh5O mE2FGlXMkLei4qXlo6xnTQU/5xo/hniQvPhVddVHijgkQnRRyvLZs/PiO33VTnarfK rZUqVpJh1croOdMdMZ6eNqXJsTeBl88KyvwOek5k= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N1Obb-1nFWmF3VV5-012mfz; Mon, 09 Aug 2021 01:44:12 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:57 +0100 Message-Id: <20210808234358.7241-10-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:b2/wn25vpd2Iyu+JYoHbQxJllVEJmT2BJRn4lZjErwZldMAbWjt A3affZXBHz0imNJR3r0nWHp5Lg3i0tocd+wsA3A8mROl+OkOPLftQQ4EX0iJZvrXacU7ped 02XWJzV40w6ka2jDL9CjCWXk55/7+8odlxQB1C/0c6A0ihUTvICGkhe67FCq05vwC//spOM TZkhVMuCfalNSQYdppCig== X-UI-Out-Filterresults: notjunk:1;V03:K0:ARNq+sFm4vE=:zjBVzJi7Z22juyfiX+TgZb tMiqzhawF7AxgZtJeQeuQSP+3MoQyoT9NvpxFfsyqzaHuOefHZ7ZjuG3uM8iQDJsGahpJ8wj5 7t1KRCffRftMl+lEK7TSXIvgt9gu/I2ljg1K0wcGJVKAkjQ8E2oHhw6Nfcs00FvB/tdekdlLg i7AHlVoXuaH4jbHKpKjodM45afULUAyjYnh9q46WPWHGIA5YiAETlfbKSW2MAbxEZA99Fkdwz VDtAVjOI0ByAUgatVeeNDTbk1KCqBcm7TN3es2TZYXsikvS3ej58G7FtcHTsVCggz9ga6T5JE GcPdf+tarHPnOagVntVXgW4/8Cs7AA0wKbgJ6u9sy3i3Ql1K+jf05bqcnZ8d2ZvQt+S/sZILx MXHCZuRcgAyW3B6TaJA8jsw9jp9QQTEkp9JvID/Xr9z0rcje+Ohkk5gMLAXwZuae6S37wFaue WF0CqMe6OuqyEytXw55S3fTzFJv5PVars38MKk4T4C/7IfzAYXv0NmCU9RFCTknhZDn0kvTuk zBgslpkhm2kRk7mQfc67FVcq2euYA1uj/0+v1wSHo1bwZtbPrYXyRcA2T9bJXrJ+bsIE8+YPJ Y5B7IhyiZVhBppMofUySTCE6idi2ABI+05gAk6bi0nqd4bWm6K+Pq3H5j4AxMqNCpIXZcnbAm 0Y39l84ZKeYpimgKZMzK8XuzoP5qwfXg9j8ndmCEGFWGTt8K7lRXZxCnF8aRJLf2pBxV7oc3U GxaXP+8nvjSMNv+kqnyAD2REvr8nkd9IWE+6BSOKpLzdalV9hCewNK4t8Vmjgj8veiU3MkuYv bga8766A6ck882kjtcdhk0oMNybvUau/GDdQEvQTCemMIdfkX4Qkrn5tS7Utfnlb2T/oWdwQ5 NC9WxeNLdut5xl0Og2WRZqyQbcgyAFeSVJ7x+/uSxLTXHRIwClr39GShw7P4r3D5bR4ks3kJ4 4a9oflSp9mRWGnokArjXeteQNbBhSfGVfOeR67y04+95yuRjBGQHuycHdZqVqre6Ek6+dY++r I2jqHkAz2gRSu8SK/O0UnxLMreLtt6mFZ4yu0I7VszCLzdCvbn2WwwrIZnK7srjoKltpsK1Zm +jT9dZR9DwzwIU0bIxKRYYqAV/wwXOuiMviS4C4nULDZCGezYkQxcePuw== 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 (emacs-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a9c1714936..22551d4482 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -608,3 +608,30 @@ library.") (description "This package provides core APIs of the Emacs binding for Tree-sitter, an incremental parsing system.") (license license:expat))) + +(define-public emacs-tree-sitter + (package + (name "emacs-tree-sitter") + (version (package-version emacs-tree-sitter-core)) + (source (package-source emacs-tree-sitter-core)) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-tree-sitter-core" ,emacs-tree-sitter-core))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (synopsis "Tree-sitter bindings for Emacs Lisp") + (description "This package provides Emacs bindings for Tree-sitter, an +incremental parsing library. It aims to be the foundation for a new breed of +Emacs packages that understand code structurally. For example: + +@enumerate +@item Faster, fine-grained code highlighting. +@item More flexible code folding. +@item Structural editing (like Paredit, or even better) for non-Lisp code. +@item More informative indexing for imenu. +@end enumerate") + (license license:expat))) From patchwork Sun Aug 8 23:43:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31914 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 AC8A027BC78; Mon, 9 Aug 2021 00:45:55 +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 30D9527BC6B for ; Mon, 9 Aug 2021 00:45:55 +0100 (BST) Received: from localhost ([::1]:47502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsUM-0004Me-8u for patchwork@mira.cbaines.net; Sun, 08 Aug 2021 19:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsTa-0002z3-NV for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsTa-0004iG-Hj for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsTa-0001FJ-FC for guix-patches@gnu.org; Sun, 08 Aug 2021 19:45:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 31/31] gnu: Add emacs-tree-sitter-langs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:45: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.16284662664652 (code B ref 49946); Sun, 08 Aug 2021 23:45:06 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:44:26 +0000 Received: from localhost ([127.0.0.1]:55056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSw-0001Ct-BH for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:26 -0400 Received: from mout.gmx.net ([212.227.17.21]:45871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsSo-0001Ak-Vl for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:44:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628466253; bh=cJ+smkilZ5hVatxqW5W1zs286emB7Qdg404pjqMfrdg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Nq0OjMAhS4cHAuCluJ1f+3ZV/TAANCOVGZfpwRlyM/yv/j1yZRi4Gyxz5wN4p0+2z tk/69Q0g2LvCqHbe7sytpCXt/m8nBIlny2lpw7bQYdfmKO04KELtajuQtwWJb1rNzp o/zio4pzlOxvFLKYuZvnK9mNoXhzELHcI7oh1v10= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N5mKJ-1nB9420Utn-017AOh; Mon, 09 Aug 2021 01:44:13 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:43:58 +0100 Message-Id: <20210808234358.7241-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808234358.7241-1-pierre.langlois@gmx.com> References: <20210808233354.6745-20-pierre.langlois@gmx.com> <20210808234358.7241-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:HcJDJDroOU3k8IpXLDc3hMMoSPMnAXN/w8o8rBUaUOwFX32CAT0 h6LvwyXgSSDLsSxPtTDyuusc7krSeZQ5k/J6YWEBjhxiacGvbMpf//gd9LD0zksR0I5NjTC ymb7crQhAQU8CxbWFELhnCqDKcPWQmXAit+9STLGaAb6v+RTyuVf42Gze59Yho3fNAox/Md NcU8VBd4IvWXhebhnLAoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:AW+t8HPvARs=:0Jmm7daJpNw3v8/k/5OUGj 4YYhYTFW2DKv2g3BkOhyyE4gKh9sNR73UCRE+/3RmyJynpzX8yFxahPYIwZYJi3yfB6f0NfO5 1DCHYKU5LeABOriDD0rtYg1be2zIJ6uvqcCyNC0p9nEigfs1Ss8Pb+7rEgXmsn+pYWu7y/jvd ZyJWo3jBos+5f0PaYFdF/9M01qh/gQpn3Yn6WZaJS3c4xDbnWnpzbkXApbdeelgwHIAh7lt/G g9OCi9zmmMp/L5V5aRExYUmUErpp1hnAEa7Yp3fICF4L2BkL2r4Mqazz/wLzgFVsHxhpAMoFH 7JJJVMya2ja9iHPmVjDYO75KUxQ/xF9Ti8soe07uqqVoLvhCNCAvvUNfz1/nEgQmNpvHppRzo 4xoWpG6+zd48cfFwZl214AXD9SEKhq27gq6R1wMbu0aL5OHK7tf6I26ra7LnQMZMrC7ObMl3g iIR+BjXNPHSaF34wnTDmqufz44I+cHIkd98L7JrCPreIG5JTXoHWqjK2VQxuBE87JWhEqiB9P 330mr4Wedh9r2uoXjR8G1DLwxSTN8I6COcLsfY8fawiITukH5GI7K8JPWcbTJvQviMEncbPy8 LajLh2PprMEGlfa65cCyVXC+6XrA7gmeWsybpfWrHsw8ptQXNVSUS9SsDLhrthNTGlDrrZYaB aNnAA0UKkCoLIwgo3T0f8JNzux59zuflVYIOHao6MXcawB0ya5sxSRzNSLyFjEvLvIIda2rv0 CxdxGrMgGhXGUrMZ8ga0iy5mTExwknSAGeAV71EDWkB93uAwJiGDhY8yR5G8pY1RfJ8akMOf3 JEtxZrO0MyZrMMVojQM+diQ0T0xeAmZ7NngM9eFxaP5YlBNSf9ETxQUQH8AZEcCm3GzLKhfcu LxLXWxqfXZTPyHMxXSyn8mnPWWa2fzB9QJRHiC/XvPSet06qckZh/G4lhhfkGlvpxb/cWAHHM cTBKkOMtZq5yZryDMdPgBkNX5H5hFsMHgCrV07nlTurpqIfs3Gf6VTr8oXHBVvfv0YAF1D1v5 qjVUM0EStXB2LLSs3TI0PmyfgUsvyzX54xphb8ePpxRP1dED2RwVv01HsQYxCVhrh4HqUuHmL UNLwTkdk9/V/efYSCwNnxO4zLxwadbVw5AW8JiyFAoumCPnJ+8rWiDLCg== 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 (emacs-tree-sitter-langs): New variable. --- gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) -- 2.32.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 22551d4482..bfdfacf122 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -635,3 +635,82 @@ Emacs packages that understand code structurally. For example: @item More informative indexing for imenu. @end enumerate") (license license:expat))) + +(define-public emacs-tree-sitter-langs + (package + (name "emacs-tree-sitter-langs") + (version "0.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-tree-sitter/tree-sitter-langs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lym09jnlb7kvqkwkjbrqpc24fkpv99f8r9139sw8g537yj5f8rq")))) + (build-system emacs-build-system) + ;; FIXME: Support for some languages, such as bash, is still missing from + ;; the bundle. + (inputs + `(("tree-sitter-c" ,tree-sitter-c) + ("tree-sitter-cpp" ,tree-sitter-cpp) + ("tree-sitter-css" ,tree-sitter-css) + ("tree-sitter-go" ,tree-sitter-go) + ("tree-sitter-html" ,tree-sitter-html) + ("tree-sitter-java" ,tree-sitter-java) + ("tree-sitter-javascript" ,tree-sitter-javascript) + ("tree-sitter-json" ,tree-sitter-json) + ("tree-sitter-julia" ,tree-sitter-julia) + ("tree-sitter-php" ,tree-sitter-php) + ("tree-sitter-python" ,tree-sitter-python) + ("tree-sitter-rust" ,tree-sitter-rust) + ("tree-sitter-typescript" ,tree-sitter-typescript))) + (propagated-inputs + `(("emacs-tree-sitter" ,emacs-tree-sitter))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fake-bundle + (lambda _ + ;; The BUNDLE-VERSION file prevents the package from + ;; downloading libraries at load time. + (call-with-output-file "bin/BUNDLE-VERSION" + (lambda (port) (display ,version port))))) + (add-after 'install 'install-libs + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out")))) + (define (install-lib lang) + (let ((input (assoc-ref inputs (string-append "tree-sitter-" lang)))) + (copy-file (string-append input "/lib/tree-sitter/" lang ".so") + (string-append elpa "/bin/" lang ".so")))) + (mkdir-p (string-append elpa "/bin")) + ;; The BUNDLE-VERSION file prevents the package from + ;; downloading libraries at load time. + (call-with-output-file (string-append elpa "/bin/BUNDLE-VERSION") + (lambda (port) (display ,version port))) + (for-each (lambda (input) + (use-modules (ice-9 regex)) + (cond + ((string-match "^tree-sitter-(.*)$" (car input)) + => (lambda (m) + (install-lib (match:substring m 1)))))) + inputs)))) + (add-after 'install 'install-queries + (lambda* (#:key outputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out")))) + (copy-recursively "queries" (string-append elpa "/queries")))))))) + (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/") + (synopsis "Language support bundle for Tree-sitter") + (description "This package is a convenient language bundle for +Tree-sitter. For each supported language, this package provides: + +@enumerate +@item Pre-compiled grammar binaries. +@item An optional highlights.scm file that provides highlighting patterns. +This is mainly intended for major modes that are not aware of tree-sitter. +@item Optional query patterns for other minor modes that provide high-level +functionalities on top of tree-sitter, such as code folding, evil text +objects, ...etc. +@end enumerate") + (license license:expat)))