From patchwork Fri Feb 18 14:39:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37328 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 D45C927BBEA; Fri, 18 Feb 2022 14:47:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9FA2627BBE9 for ; Fri, 18 Feb 2022 14:47:32 +0000 (GMT) Received: from localhost ([::1]:39074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Xj-0003if-A1 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:47:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4Qh-0004P6-Uu for guix-patches@gnu.org; Fri, 18 Feb 2022 09:40:20 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4QV-0004v0-7b for guix-patches@gnu.org; Fri, 18 Feb 2022 09:40:15 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4QU-0008OT-Vx for guix-patches@gnu.org; Fri, 18 Feb 2022 09:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 01/31] gnu: Add rust-smallbitvec. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:40: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.164519520032237 (code B ref 49946); Fri, 18 Feb 2022 14:40:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:00 +0000 Received: from localhost ([127.0.0.1]:53749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QR-0008Nq-VJ for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:00 -0500 Received: from mout.gmx.net ([212.227.17.21]:59547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QQ-0008NJ-9a for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:39:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195192; bh=kVGHjSsFJYxzxkYOQuHrKk2xHMc2pMxVI4f94yFrZLY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ZkOEUdCZDnzHl1XETartI4LXx3/MvoUumJnS7Ok4HRZ+yZQfWi1QSEkuzGlWDyIwi /55tmIDYikLcAKdVByqRDIbUWe7oacUn3vw3oMqwbgVsMQKUsngWFRuIC1Sy3RHrIo +wUMT/7oBvBAZ14zL6iHIxoToc/hzHzTHplbWgbs= 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 1N1fii-1oIM2C0Z9k-0123Ib; Fri, 18 Feb 2022 15:39:52 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:18 +0000 Message-Id: <20220218143948.28989-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <877d9s2qa9.fsf@gmx.com> References: <877d9s2qa9.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:4bCALqyxQMDtOmTF5Y3f2svle3u6kRGKkIeZK12A8hSg7985M2e +4FermIToTCB/1nJZdHlJI7ALBvkTTngcuoXBZzAS3CC9rY+vPEZCeWG+6ROjjVoVwZZWq2 xvhpRBmirB0+KgfdXuo6jF649U8xKf7Pj0wxH+OAgTC7bBvDL3QWn4ISrJIpMBNaZm+G9Mc K0HGFx/4QrgRtTix5CBGQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:QSQ6+FS5Hgw=:EGBtJ15bUIwbBP8IhGR4mV FNARJeqLuUFVj7R2BMHLvY+GYRAzo1tCWCb2y4mcGeuiMZyH8RT4ILPl7JyNqFkH37wm/pCD0 IhZhbOvcw1HA2hxXtcqS51HVcL0pOxuA+6+sT1zrP/pGVsmUSfJ0+RKvnQ7PCRsekyS6mFPJ1 1y+wv5g+EY2x5+diQGZSvkueWoDRno/KRW6XPLH6cnRc1MEi/c+iCpiAIM0wqW/yYW033s2MF do74DLQOZiIYjMAAwFDIjzeveTepdBkOY28S0sssGns3DED9NVEg824RSZiqtQMe4UpSUmQ0G Ck4uS66clrkKqyLLuWpF3++0JIaDafszmd8ANSEoMqNAyoNmcbfNOlAwljBVOHakJ5YU5DoD4 Osk4LugpIN1YChe9fADDLyGGh3RRgSPMNZilxhg6ldF9DBeUd6PpeYRL5Aa6OLFXaAZLBRRN5 eI6HxKnuQZoeCkueiH1eEfCUEr3G8Oqh6thwcF3UVfPI5Z3vpBqRosH7kKLqfTkgY9lUN/jzB TOS6ApZjtQp3KOr/mrV+gtzbhYMRj8+2ZKJINjW3z9OT025wKLDPIqNd/brnszvW4VY+dxM/1 M2ulXju65nGqM9jVWo1wQW85UL2ly3RSebgJbyBZm7hAwwY6etMa6sgCmQ/T7ml6O3PRUCqiR xhbSsCsbXYyHAQ8V4A3pkRfBFyADvcEf0tJtvC4+GFL/yEeqQkGySp1hV9hY+El9oLFhGiwBS VE1rjLlMi7BugJIXnyrxwR+eQZLTrylfvudFoVkzFsWPUavuhFbAhsBFby0DodiBMt8HK3Ajn xDHPao1NDWcZ0ElcK9ABstFjFiZAfJa4pUWWU0ZU3VbYk/W9YG5aubWgLrnlfA1ivxnUE3Hke GLx6w1OxTrmbHm2PJi6xNl7TQLTeEwsY2ZZuUwidQtY56bhfvlzdrVX/2uAbtuSEQntydCmSo kuiCsOau78lKLMtxenLb6T/9N0TG82Wau03DA8QP2D/9hrHN8TBL2kSZa+b9uNN3PvidQGNb6 srEft/dL9/2f2i9Ng6FMzk7ufN6jVvsvaNtcyqnRpDGB2E0Nx6pHexJfKcHB1VW2/IOB84/KA u/Njk8cRaLRBxQ= 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-smallbitvec-2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6024c9c57a..291c289b5a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56109,6 +56109,28 @@ (define-public rust-sluice-0.4 ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) ("rust-futures-io-preview" ,rust-futures-io-preview-0.3)))))) +(define-public rust-smallbitvec-2 + (package + (name "rust-smallbitvec") + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (crate-uri "smallbitvec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0plrbldsjpwip3afbzd8fgrnvdhizcg5z4ncfqs4q6x4qjflzkkm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-bit-vec" ,rust-bit-vec-0.4) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/servo/smallbitvec") + (synopsis "A bit vector optimized for size and inline storage") + (description "This package provides a bit vector optimized for size and +inline storage") + (license (list license:expat license:asl2.0)))) + (define-public rust-smallvec-1 (package (name "rust-smallvec") From patchwork Fri Feb 18 14:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37321 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 A5EC327BBEA; Fri, 18 Feb 2022 14:44:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 75E0027BBE9 for ; Fri, 18 Feb 2022 14:44:09 +0000 (GMT) Received: from localhost ([::1]:35056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4US-0000kV-K7 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:44:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RS-0005O9-DH for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RS-0005Ow-3o for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RS-0008UD-1v for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 02/31] gnu: Add rust-html-escape. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519520932390 (code B ref 49946); Fri, 18 Feb 2022 14:41:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:09 +0000 Received: from localhost ([127.0.0.1]:53770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QY-0008PM-7h for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500 Received: from mout.gmx.net ([212.227.17.21]:47393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QR-0008NL-C6 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:39:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195193; bh=ztAS/Uq3oUcCLvcWVi3pyiK/pDt3DRLlgc0Iuz3thXI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=W77uDyJk5XTjeq/XzFGd3zTfPOq2HzpL5FOBh5loVWNOw0ZqMzqZrU9YoNGebs2yi Tgnk43xCR3YTXuwRplip19nJoHm+K/S95Kv1DfhjeVndUwEgKB8TTNV0ttVM4dIRYv r27AMzapWWFZYioS9+laOgpjtnzpEjvZXhjLiRo8= 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 1MacOQ-1nrMyB26V0-00c6CV; Fri, 18 Feb 2022 15:39:53 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:19 +0000 Message-Id: <20220218143948.28989-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:yQNpBc4yYy8KezsQGRLhkq7eqGoQFCgpRqkCkgp4hSrD8CbZ81x kl83zioFGpRT2L05TD3t0iN7T6WIcPzbyqVdfXsz/0Gw84krPQGpEKKQdvhQkU+nIPeBhyJ a9pxCLa0duwsYrlL18fsSA9mDlZxwvsEsplPntyHTlCRqlDGJwSmTkOcSk4HvWaBy0/KJ/C n3W07WJb4U+bv8NcK2TkA== X-UI-Out-Filterresults: notjunk:1;V03:K0:slG0PwYZoZo=:YjP2EJCFPsrtcM3L70sXHe OYQ0eTknGJdj8ouxdaCVlugFPzPlLtGjDeBDvAMbt5VmDG8slFA5CfUZKhb1qcietAorOKyEQ qVf6MFG8EWdZC5MbvfC+LlBBlG/xzXbrjLpkElL7CwjRG/2IWvAPm3LiFoe+wvtH7e2t3IfDB vaRJbC0I5MXhWKfhjxNStoNCThJbwtjZQrFkY59ygPGo1nxRzD+/XJE+MTjgJjDUxOcplvJkR jUIdIjN/CKWB7Pnqje9jzn7UYaGyuMbsrsJDSUEb1RYK1o2q7RRvSC7icT93iFnQcNjqamOvF uGfmqismLqFyjcy/4CdYrXV0n3WWEM4EDFTgxunskbfzqvvkdhs82VKyrSa3T425uL4NHZloc pFEaVfN3eRhgfgy6tspWPQoWosgrc3Nq+K7adxHwnc+BZnlm7v556tBsS5s1pDYMPwNTPChde 6C9qbSUccu41/iZtfiBBxgbAyqE8LeSs13r+s5yXaVJcVs2UxrFzYpaB9F3gY+GEnzNY2/uPA FU6OCB7942dJpHVJg/z4ma1a96ZqrLd11XKzCsnfx/KbdIxwd3FxL6WVj1VZADJjvOuRZ5T7B ZvyQH55zIAlLnOC5/IV1d1ghvBNsUGEEF5DfU0ZtwF0H4cODlwkTiCrd8yJVe7ATsQAC8mQQA Hi7Q5VeEol59wj7kxDoljI3D8yJ2TMrmVDMArHEzcHTW8/LwW3DKDvsd+1cjxJ0QIWXe7TQcP ZfZyefWkCk5TtgFSti7Go2Oy21pYJEVmjIvi8H3pZv8i2+VbQ3EFjxHbgHuhfTsi96A9mmZpF sR/TopzpalUJ7bhZeVQz586Jq28kIfmhTqdQ0+fZyeZn6N2LK/UMe0C7YwZOvfgp7AqFfjDKX LFzAlquvvOdjQqk0SZbeRP/osFUvU2R6tWDefbmx/SWWYB44LP8QM11rKBksRiQb4sHQZ/fKo eJX54sbVxd60XtC/RQT8uEaga0DTKtRDYjm7t6LftHZidV4l6abx1vg7AT+GFyZfR5mO9CB8x Fpdlia9ZtjiQFMP/YWUlySust5TGNmNvk4MnXXXZMLWFlhlxi1lxPX2v3Pf24rAPEmNQQRnPV HYdEer7zALj/sk= 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-html-escape-0.2): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 291c289b5a..986901740a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26943,6 +26943,30 @@ (define-public rust-htmlescape-0.3 "This package provides a library for HTML entity encoding and decoding.") (license (list license:asl2.0 license:expat license:mpl2.0)))) +(define-public rust-html-escape-0.2 + (package + (name "rust-html-escape") + (version "0.2.9") + (source (origin + (method url-fetch) + (uri (crate-uri "html-escape" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dxw9lpckrqzzqgbkw64ckbajr4b7xxnjdn8adgzqf2mm40shvl1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-utf8-width" ,rust-utf8-width-0.1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://magiclen.org/html-escape") + (synopsis "Library for encoding and escaping special characters in HTML") + (description + "This package provides a library for encoding and escaping special +characters in HTML, decoding and unescaping HTML entities as well.") + (license license:expat))) + (define-public rust-http-0.2 (package (name "rust-http") From patchwork Fri Feb 18 14:39:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37330 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 78EDB27BBEA; Fri, 18 Feb 2022 14:48:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4287427BBE9 for ; Fri, 18 Feb 2022 14:48:09 +0000 (GMT) Received: from localhost ([::1]:39732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4YK-0004C2-CH for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:48:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RS-0005PD-Qq for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RS-0005PD-GY for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RS-0008UK-EQ for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 03/31] gnu: Add rust-spin@0.7. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521032407 (code B ref 49946); Fri, 18 Feb 2022 14:41:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:10 +0000 Received: from localhost ([127.0.0.1]:53776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qb-0008QL-Dl for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:10 -0500 Received: from mout.gmx.net ([212.227.17.22]:40583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QS-0008NN-Tw for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195195; bh=nD2EIQeuJZRMOeTOyJcEFGg0xkzHQqi5uKDOcJU7kw8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VIpXZAba4cgxI9rNOSzONyPyTEwVIrInHjqjvwvvwhzRpif5j9070epbgu75HqBaq 0wwgZ+f6UB3ElybtHhrNre6rKjpxM7N7Lt8XRQJWncUXpRsMtgM+6cq+tPA1gX1JX7 lWbvbqEBzdVuFh5XFDCzVTqstYubS83mwuejAarY= 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 1MgNh1-1nuPEi0Cxb-00hsxm; Fri, 18 Feb 2022 15:39:55 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:20 +0000 Message-Id: <20220218143948.28989-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rrPGDiz/4H5Sr/I7kfO4ISSQNi8/G4xniDTU7d4Llr/5Vxnm6eG CDVn+CxUEh4APD1T6mqFxvh8Px0zhuVGHpPqIt30R2WYzVi0wT8FRF5Ml1QuL5tyjTvZvlt 25TM3JJwTi/usbrvjtXbn3olDfZLH5JXblxSnl51TPTc41PXL/SAynLbGPdBQQijYhtqio9 vTwOUbpYAxCEa6lvcd0Xw== X-UI-Out-Filterresults: notjunk:1;V03:K0:7hXRquGYioY=:BDzs4XKsV0Czw3hz3sZCpt Ka2ePHsx3rTZtnh90UDwcYdGUJLSiG7AD/ShJ0d6nHrpVNjnXegfh/pfpXlIRGIffnnpLkiaR BzRw8g6c3t99qnTg7Wod5pMX/vHWARNk2/vAIEgoWKnMVLr/kavzXsppJWKSl0yhda8OpTXbA 1V5SmcgorwGKa2sZaVxMyqK8x/dZ8s59b0ewtqp/yNIWV4KtzxrYJ39NGT6tNcT78CrXlkCG6 v8bp/zXxk8qs+wu768M99yjQIRf11LWTvxhlS/ykP7RTgIW/usAwmzLSask+mRxLMXULV9QGI zMIjfoQrhZ7IhDyxPjdElJV57xSW04w6s2EVc+TClhraI6/LXdPW/gnPmcUxGSJfCN+an1pql kFDgK4Ph7FrHApFsB0HFJ1Yx7VVLCsAtYwwkXpb0pLmXQIWJoZBBu+TXKA4q1dd5vAt6HFAek QPHwvPihJNODCodRM+YonugCBC7CzVkkXpsblcWKCq5esbuPowkLTF13tWAI5QcPgTfrVo8T0 9GYiJ1lw6xBEHeSG4NLCoSPxANZoYXDwxqWzOIMQCd1k2KWT0zFw2cGM+jhmyw58XrgSxDdP+ U0mc0WdJ7E9MablvfvtgVfK4it9fC6V8fp2dni6/pUhqWCecsFAkpzxWrDIoeMxX4RAx1EAMW VK5BZbaYT3M9M1Wly/vE1/+2fqheqczwNQdJYxxkdEM2jSSnXuV/L1loYjW00rKh4l2Aq2v96 WJQTGmIHE1MvDkMomRj7iULZTyL66s46AIfP5CIrNO8LGehdSHkZD2kYZgU+mpBu6OLpTrziU KjQKt02HJ5OG2pGxYSKKSpFJXpcqzpZdU4dX/1Zvf1YwpFpMK6VnxTqFk6v7ZVIbVVtOR7B7G 8E3vhCQ+ha45QUncfTnDtc6itPH/s8fu3hCc6P2nc//aSfeZTftKqWLrVKE05HuEOeC3LQ0q7 V6Bed/QnQ954F2UaHEPY+tVhdMPabGc5z3tUvW2cIAgsUIM30k5RTLdc9soGaOu3l8zTX3xoY CibPBKOFqFK00jZsy/TJBcv0phIaoKs6DxYwM43wcVIig6m9313LJxYg9Ynx0M0cgvvUHx3ZT cTNPrcq78bL8tw= 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-spin-0.7): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 986901740a..a4bd79607c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56726,6 +56726,19 @@ (define-public rust-spin-0.9 initializers are available.") (license license:expat))) +(define-public rust-spin-0.7 + (package + (inherit rust-spin-0.9) + (name "rust-spin") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (crate-uri "spin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qjips9f6fsvkyd7wj3a4gzaqknn2q4kkb19957pl86im56pna0k")))))) + (define-public rust-spin-0.5 (package (inherit rust-spin-0.9) From patchwork Fri Feb 18 14:39:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37332 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 CC5A227BBEA; Fri, 18 Feb 2022 14:48:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 45BAC27BBE9 for ; Fri, 18 Feb 2022 14:48:35 +0000 (GMT) Received: from localhost ([::1]:40368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Yk-0004dE-DS for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:48:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RT-0005Q4-6X for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RS-0005Pf-Sr for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RS-0008UT-Qm for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 04/31] gnu: Add tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521132420 (code B ref 49946); Fri, 18 Feb 2022 14:41:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:11 +0000 Received: from localhost ([127.0.0.1]:53778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qc-0008Qd-Bu for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:11 -0500 Received: from mout.gmx.net ([212.227.17.21]:41161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QT-0008NP-8J for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195195; bh=FUfcvCDVngJDtA0Uuce9Us8oVgDxmUluH8uD2Q1n8GM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Pf4TizqN+2MMebCVfw8xLKD4tLq4BI9o4L3xj/G1zCInXNm8siL8/MXVoo9mbO72b RJS5o8FlnmH4GwzsLmgpQLgZdRADPE21zvqHkC0i0UtwDXay3HZ/8OHT1grNpPx8PN WMuKlMZJU16/5P/7Atctt/e4VXCe5BwpxBStUiCs= 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 1MpUUm-1o400d1OQO-00pthh; Fri, 18 Feb 2022 15:39:55 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:21 +0000 Message-Id: <20220218143948.28989-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:M7CP+iJbITCi78Trdem2z9Ao6I3U+A46ItFlsvl4KyyQipXyKAN zvXoAFl4OVTcMqG8DK/aRwi4Sv7UyUKGAs+7P2NVqst467rUKd3QQYk8/9XWFruoDE1dv1+ CPyYwO/ItOOcAmmeJt4abjX7UQh8dbxwrCnS7u5dc/K7j1Pz3gYrTgP8zl1wxS+2MUZXbvY moSOlN9gGShceTSOspGFA== X-UI-Out-Filterresults: notjunk:1;V03:K0:QDiYPcHpuEo=:OQGBFV44EwMfeEdIxmCdDJ 2ggn7WqSQtlhR/vDcSSvFbY/ryACPLBYhvru/GuNfAUfb8tp/OKaMYKPMDN4HPkW2KEZ5U1Pb /VlNxAcLxdCa468YKPz1gdn8WKIdN+Mcqo6hY6xAUYtPbdcFndMmHKI+WbreH4Xexwin1YTTW tPPu4XZdDIGMdowyEpxP6LcC3S8tjfY+v70EeTiaFx9TCxMC5Sa3p1WC/1oHIbcYdFwO15yp2 97tBCd+Lo9+WqvIimPwRHr2tm67OFF6N3zxvwtGlSsmAnnaa6HZfz88zzu15OENcGZWgJiRXs Byr+pp75hRetDaiCGwvNwYBqLE9RAa1V3vxYD7yDgpmC48rmoEslKOyZtOpvmy91EX1Yu7Wus qLnYtp3xrrYlH082tw689FnS87oaK2Skz9JLKQo+dYG1cEhmBzeNYb11q4y7KuJdo40jxPiw5 MaBNKUR9qpcqf7Q64c0iRempPUc9OLAqNpFZYPY+lPH6Bg2sTmd9QmBapy2Fnd3goCe0RXby1 lH8rG7tJDUVOzBZxgiTCXezPglkJ5Rh1wvK3kFKOz50xsIKw4M7C/2fMd/C0Ost8ftbVqbWWf gb0q4bAeol840yC/p+8Q3tUZfASJVUGhgvTQKhe4+E1xbde5n8xn2JsS/7hlQvE4ajy2gL0H3 InBXL2mhlRL8WNNgYydipOpuoU8L0R/EuHb/kB53PrZBBqSYSoYSM/VAr60b2rj7WeyQ/nM8M 6G0wz38f9WPYAPUwyGzAvgq8wsW4gBJcs++su59Eaem9pv3LzKPA/XiEfBSvpVzf7AON7zvDV WfMjRjIcF/3qfD67/HVeL40VLnDNgcqaXojUM44GILap+3G4AtJuKOaOqxblPUmMNsZx7VDoL HXbFr+gcjyIOg10du76C4jx1R9A8PX5Y7vXCnPdehHQm1JAEgh3KiMGlw5671HFLFnjQo0nZR k9AnMJunBw1wrcDrdfSwmJl/W0lX2tR6t36T622gkwXqbr8DKjnslf17S2SHNAbtvXDaJjI/m ZkH42/Pcrb7LeFoaFMluf99X4n1dFF51BOpBqDoUSOerlPnZhbfF3sk9jLreafUxOxZDglwNv 8xaCmXPfxBcXEw= 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/package/tree-sitter.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Register it. --- gnu/local.mk | 1 + gnu/packages/tree-sitter.scm | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 gnu/packages/tree-sitter.scm -- 2.34.0 diff --git a/gnu/local.mk b/gnu/local.mk index 433467ee39..97ab160c3c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -584,6 +584,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tmux.scm \ %D%/packages/toolkits.scm \ %D%/packages/tor.scm \ + %D%/packages/tree-sitter.scm \ %D%/packages/tv.scm \ %D%/packages/uglifyjs.scm \ %D%/packages/uml.scm \ diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm new file mode 100644 index 0000000000..10a3a6e57c --- /dev/null +++ b/gnu/packages/tree-sitter.scm @@ -0,0 +1,83 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Pierre Langlois +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages tree-sitter) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages icu4c)) + +(define-public tree-sitter + (package + (name "tree-sitter") + (version "0.20.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yldgdbf3l5l4ki52abdf81nwkcbvg219gwr3ydcjwfsg7hf7zhz")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "lib/src/unicode"))))) + (inputs + (list icu4c)) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;No check target. + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" + #$(cc-for-target)))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) (lib (string-append + out "/lib"))) + (setenv "PREFIX" out) + (invoke "make" "install"))))))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (synopsis "Incremental parsing system for programming tools") + (description + "Tree-sitter is a parser generator tool and an incremental +parsing library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@enumerate +@item General enough to parse any programming language. +@item Fast enough to parse on every keystroke in a text editor. +@item Robust enough to provide useful results even in the presence of syntax +errors. +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application. +@end enumerate + +This package includes the @code{libtree-sitter} runtime library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37322 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 ED13527BBEA; Fri, 18 Feb 2022 14:44:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 76E6527BBE9 for ; Fri, 18 Feb 2022 14:44:20 +0000 (GMT) Received: from localhost ([::1]:35496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Ud-00012v-KN for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:44:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RT-0005Qg-II for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RT-0005Q3-8j for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RT-0008Ub-6t for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 05/31] gnu: Add tree-sitter-cli. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521232427 (code B ref 49946); Fri, 18 Feb 2022 14:41:03 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:12 +0000 Received: from localhost ([127.0.0.1]:53780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qd-0008Qr-EH for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500 Received: from mout.gmx.net ([212.227.17.22]:57453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QT-0008NR-RV for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195195; bh=2zNsGflsbIMeCw5Z/VXAGLuxeE6NQq36yK7lwf07oGM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ZtUzl5JJjVDSv2FjVtMpCH+cdwWhtOAS5VmeUddqULtI3ezmgX5T2zvRkPrBybefZ xkqGbrl5oaHxCeHc9RJAvjyb/V9IcmShtP1v9MAmaQursdTHRSTJD8a8+CKExXikWL MZilXfOa/WMh3Wq7J4qV/Qtn49gHgxFjTH8hvUvo= 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 1Mw9QC-1oAh4h2fkC-00s6c5; Fri, 18 Feb 2022 15:39:55 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:22 +0000 Message-Id: <20220218143948.28989-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:g+q2+EGMD6PzKSnAVnvmJRETCXRQdlobPrR3Fou5pREa35lDJEX oRFxcrt5Vzf9dQBjypA51PC/FMpULzX0NrvVQzkIVLI9IB/a9Dc0Mo5YooQP5aZiTSBWSXf t0UZSVAj1RjLBl2qPspXMu4t8dEbxlu16LOgF8fWe8mQx3l55u2SEIAGDQtjLlBiPhURBIP eHJ3PSBIYj6xqNtgXkvnQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:D4YhnqBy4eE=:xyXF/oGpI88uBV4K2E4ybi E0nZHY7Q9niNqSyQJ2FhohEGHr38QsoI00CXzpShW/rC+lmbSMTAU2WrEmkMMD2QddvGKSJOo A1TDF25phRWmV4Bcu+VItze3akndXeskt88yjyxQhN1v4s3/7OWkLIINcbyf8xJwh/nJoO0Mt oQBGxGBEYyC9e9CbkIvveH4/LrYbRpUODjfIpm8Z4bxXVTNfNib1w0Ik+rFKM1WMHWfgFaqhA xOLXU9ktzn3LAQ83pN7XwI0/Qm697uhZ1cG3Cp21Kdh96PqJAX579rabqXoKVDlUmSC86cEd+ mE49bxcsEVNSN2UyrlZocCzDTGCrBRc9MuXtKILkOoXGduLrb23S2C3ZCwB0SlsAE1urjvLr+ mOyKrC/+AIOs5I18YCIWEDiFT1kxvF42F92V+8F+pjC8SNtApT6NoNjJ1bH1zAvx5bITqtOu2 L1h9ykUSAITJn/y+P70OVVKUZR81hhLO1M16c+w9k4ERexh1bD8Scj8HcFkUcp3XJuE7jV1eJ Vhn4hncWPiGUQ8cLFc4MpV/SuypJ8WRnr8wgwWaZvqEDv6+E/fEASUz7z076MzT6FUAfOi0v2 n9ZRspcNsaZFSwv8xfzE7jwuce9tM0wD7Cr9eean97SSJ1Q4zYGwpySNrtMNHsVLvXC6C0zNo C4uoFTWFaxtUkwTMCvdt9nBHfLNQN8rwjGVoZQOgVXx6ziWdtnfiRjTAcDVaJGWvMFX5n/bi6 B7lFMV3003FPepqPGFrGaIxmUtm1AtM7VKA3Ok+Q0xzzlshhw7zk06BV9/+60z0z9YqtvoQKV w9OkJc0BoCWZYVhb7Gdfyb9+JkIBFz8vguzE0FMAwThvgz84EtssZ2vRJWmW9X1OUJz62oVFw iXAX/Y0fduXCFh1gAugIQ0BCV9GDrO/UawLRKmUk19nLMvew+uPMwQB1ZtIDTrYDyA3Rn2xfe dsdp4SoWwnnhAAGygprE0NMq1W+Ekv+mGCQ9XiKXm0EgxYDnqpCyC2jSm5WZdxm2ot19ZFPTe 54ZYipRIAQwI9KN4j2zC8CPxmfkQzVoI9irWMx3BynfC7DMO0FcD+VE/5vWzTIXX82JO3rDZm n/3ILToSk1rfcs= 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-cli): New variable. --- gnu/packages/tree-sitter.scm | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 10a3a6e57c..cbf8ecdc6c 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -19,10 +19,13 @@ (define-module (gnu packages tree-sitter) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c)) (define-public tree-sitter @@ -81,3 +84,66 @@ (define-public tree-sitter This package includes the @code{libtree-sitter} runtime library.") (license license:expat))) + +(define-public tree-sitter-cli + (package (inherit tree-sitter) + (name "tree-sitter-cli") + (build-system cargo-build-system) + (arguments + `(;; Running test requires downloading fixtures, see the + ;; script/fetch-fixtures script. + #:tests? #f + ;; FIXME: Installing the sources for the tree-sitter Rust bindings + ;; doesn't work out of the box due to tree-sitter having multiple + ;; Rust packages in the same repository (bindings and CLI). + #:install-source? #f + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-difference" ,rust-difference-2) + ("rust-dirs" ,rust-dirs-3) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallbitvec" ,rust-smallbitvec-2) + ("rust-spin" ,rust-spin-0.7) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tiny-http" ,rust-tiny-http-0.8) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-webbrowser" ,rust-webbrowser-0.5) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (mkdir-p bin) + (install-file "target/release/tree-sitter" bin))))))) + (synopsis "Incremental parsing system for programming tools") + (description "Tree-sitter is a parser generator tool and an incremental +parsing library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@enumerate +@item General enough to parse any programming language. +@item Fast enough to parse on every keystroke in a text editor. +@item Robust enough to provide useful results even in the presence of syntax +errors. +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application. +@end enumerate + +This package includes the @command{tree-sitter} command-line tool.") + (license license:expat))) From patchwork Fri Feb 18 14:39:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37311 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 0F26B27BBEA; Fri, 18 Feb 2022 14:41:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8B1A27BBE9 for ; Fri, 18 Feb 2022 14:41:23 +0000 (GMT) Received: from localhost ([::1]:58086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Rm-0005aG-Ta for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:41:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005TL-D9 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005QL-2Q for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RU-0008Uq-0y for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 07/31] gnu: Add tree-sitter-cpp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521332442 (code B ref 49946); Fri, 18 Feb 2022 14:41:03 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:13 +0000 Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qe-0008R6-Fm for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500 Received: from mout.gmx.net ([212.227.17.20]:37753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QU-0008NT-29 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195196; bh=9b3JstqJKboLpC0xTBVeqLwgaF5qUcJyg1BzS7phgtE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=M3EC38LJP0DecGKn2ScARfUMEy0TJ1sBApQezkofMVbWpQ6VEDOWMm3hKUXlnu9Gl jyh2LLlw/79n9MZoG8yjEfFA6rirLL/Du7LpE8yskkjF411fN1dZGta+jLKjvb/5TB /XDYUiOsRfdSvCYVZlhQJH31ZXMC9QdXf8wj/sgE= 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 1Mk0JM-1o0gcu0sS8-00kNvJ; Fri, 18 Feb 2022 15:39:56 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:24 +0000 Message-Id: <20220218143948.28989-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:FNcUoZyMTju0fbHF3fRO+RvY1GlPQ3u5WPBT4a1vwvva9MX39D4 LIZ7VO4wEiLq2T8ZhYPytZ74utVc64DYpQC7hg/xrqB98e/LszewzZy9rcjGCIckRQssUDk re7HoGKv+3lP4MyErOiPBIJ3Ztnk6M/xlmFlUhXrFA44O4n0outCy4+mUEZ/70T9oDrrxA+ 9AOU63soW7bXmRiOy9E6Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:HKSS18iNR/Q=:eTNclZ3lH8/Oku5oHh//l7 y9QLBXblQTvGQUMa/EdMaHSQ3TuBB3sbyDrxR0fcu6tM5aXCqiSOh8kTJ+iu8FNUWJB3iXryJ 1KKdKnB/YGiTTkhj9WbAmkFnySrjBYnq99yFGofupmjBg/Sm06CLGEWAYoV1fFbbcsh9Dv/Do l5iGcmS/8rHIDq2/kyMiChkxScZ71ietMKvWi0FKyN/AuuXWq/GFyf5oWFYItvgzNmso1M7fM xa7VBEm1KL6AcqxT5RGIvUE8Q032xE///oyljJrLDRSwv+k1xRdgA3XJknYrLRQ3E2tXqU7lz PZIYXAtXJl4ZBsD3Jjxa27xa7YeUV4f2gtMmdAG52sYx08ilSIS3gEO+bON99R3oyMQysT8Kd buhkNQE8SwL3NXCJYMnntXnLblHlB8BEMMvQJlnYJaASJVjcTG6uuETAjv8y/bwr/Sp2FyVNT j0zsit8J8bzL9w8ITRAGej9Pc6eiYLoKYbe7GHiXi+IbcP9FxUCU6dztU3PoVbK4sC3LeQa31 /teobCcTIkL9441X0SYe4mc1yZKqrk6mCqTK3/gzfwfEuYBckumKkTG3vHfIAxEa8wlPeKsrm 08pHwc3uMul+k3JSNrZT6P1/qXjSCaAzzb/Wt8OTb8OBGri03ZcODmqCtpXNoI6B3ouTUiulZ sOK2G+VAnCgClqb42vrgf/d82zIN1EfkwD/6rKg7eW8gW4WJE0asD5PyzSzBlltnpT06YoSy2 CTI6eV/J799OxAXj7jo0B+iBaVmpAk9R7XREljoC413j+Wr+kH5rNWXBtkV50qFZLEqGCB5cW DQbTWPTWPFosMsgAcpoQIsO6A/TeWrfRTr9npPOl0SgFevEJQR7OJ7mt22cDSpmZa06u1x7uz DqE7qca2gNL2+rhkLI8dKFz3UF7k/J9K/0tp4bt7kIPusMUl90IU1a2cpObd132+nZ5VJGIcu HEurxvFN7LMxtuNCTYfPnip5PUWAB51ATHTx6SH8Ryh7sFup5ddZZ66UmPRdaeCBFGmPVMKS3 VgXiXxZenzJL7tTT3vTuxg0rwa89rgM9+c+Cg2U1YrrqaV/UIO5IvYVCngYcMYSV9CsJQbZJt DwL/DSbOGTDE4Q= 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-cpp): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 920c386fdf..e82c6e60a9 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -243,3 +243,27 @@ (define (source-file path) (description "This package provides a C grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-cpp + (package + (inherit tree-sitter-c) + (name "tree-sitter-cpp") + (version "0.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (inputs + (list `(,tree-sitter-c "js"))) + (home-page "https://github.com/tree-sitter/tree-sitter-cpp") + (synopsis "Tree-sitter C++ grammar") + (description + "This package provides a C++ grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37314 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 2398C27BBEA; Fri, 18 Feb 2022 14:41:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E457327BBE9 for ; Fri, 18 Feb 2022 14:41:44 +0000 (GMT) Received: from localhost ([::1]:58956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4S7-0006Eq-Te for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:41:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005Ui-Ok for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005RD-Fj for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RU-0008Ux-Di for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 08/31] gnu: Add tree-sitter-bash. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521332453 (code B ref 49946); Fri, 18 Feb 2022 14:41:04 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:13 +0000 Received: from localhost ([127.0.0.1]:53786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qe-0008RD-Ug for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:13 -0500 Received: from mout.gmx.net ([212.227.17.21]:56625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QU-0008NU-Bw for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195196; bh=UyZLKXnSl3H/JZBo7Pu3i8tuXPtRKjonSjHWh59fzm8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=FUc6yGF41u+GH0r8ImgVWrpyifysR4WXKif8vwfOyj2cYUnbLUisV7+kskvgppphi w9B2CQr7Rk06Q9TIhSagIt4v5aadaleWxPKnpr+3kJz3nRgaw+f186/zgXrwvHOiSe 1BifBKgiy+ilfWrsQBW09tWg8RbZLlgGNx3QdESI= 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 1N0G1n-1oEHZT267T-00xLPe; Fri, 18 Feb 2022 15:39:56 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:25 +0000 Message-Id: <20220218143948.28989-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:mrxxniW3giwxxHSn679avmaNDQvfW42vFXnLJFaAK0ovXcVtMuR zlIYfWbcmJ3qVv8DZNcBQVDk0Izma8TSadlxeVt45XZcl3xbpZpuKpKggD1Vh82i49TIZIP o5oOZQbgXSGiqGXCY0X6QDLlrETL9spvxlrXlCGvsVxh8XF8kISpBe+TlNyojK9EHbw9ofG InwzEymco80Ansvpufdmw== X-UI-Out-Filterresults: notjunk:1;V03:K0:XmnZCQPO8s0=:gyWreAmzJQI3qGx7SSQIAY A++7fC19RZDcs72jUG/HMtQJiDGxdtKU2W97tUT2CULxd+Ytrg/is6UVasbcFljUZ8nKv7x7o LO5K9P13eFp3GEWLHon6Uc7dA4Gtw48hjMApDyLiBnAqYP/ouKCBToMT7uFd5m0Hp+t6BBGLh eGh95IcuXZCIR1tV20D6KgLTKq+leBsIMbYGAuAWhbZ8Z6pHKrgQIzD/og9vpapDcPGkjoLWb YRaXkmWyMTd/Bm6iwO927i0AtJW/wuqox9U7b+n3uE2ubxgEc7vidX1ccCGi8x5SLEwLi1nw+ //O2N7etpMZXSwD8NGTGgI0cTCquEOSCIHYc5YKDIEgfxM5ktbCpvAQDSWUN8mg0XBPHbVdhD Bnf4ISsG3xNHHUsTq5F3STsqPwkWalRCF8gFOQk7EEnTZckKOQiLrtATrCpGBQI09smx5LJrR F4eW97VYhb+lCijw/crPz+iQsc5Cd1U2L6rNf4cVxQ6zemVzEJo7ATPMk+0RoX7PYLhQDwFMw 0XRhyVUOJdvvlzX3WYApyu/pLnEQ0hrTyg4HIEsVSplqguD24I8w5x34zgznqMs5ffBqWlKdk CeHIxTzzAqnAyLv2GkAgLnnapwIo+E8xeJhQRaG0lDawRkeIRmuynaEA+CTkrTO+Uwd/A9ilE WlvmsV6EPiwkVoIS+EiY+qPWLryG3Qwf3WJ3hU/kwHpykVZ3/QhNbL48pXsh/CF1IH5mpxvRa t7sYmfh8tbS6A7P4iyHEQqFVJ+npA3gCdPB2HZI2GKxKtfD/EC9qCoXHM+RgN6ALT59ntzZR5 tE0jPUvkr1Gt9rJH1CIhkwFKsZZdNWAy7t+BGCTxZONrztsSTuCMWwE1PeiuZWwg6SL89mz9a eyfMoxYVo5HMzXnXEH4oiuYJnuod89YwKXs+nFUhjWCSlMM/SFia7XBrqqaKzYaEDd0ed8afJ 4xIIrg6pYT8wGfi7z2Jnpr25BUFKaWk8ssCFOwRh5t54DZTipd0KuZSF0kkwzaPFtySowX2co 8Y41JoLlPPX4uZXAZfBfxxvmkYcT8ZYkVWn7vIpgXQJFpUbYcS2al8HM1y/PxEu2loVcfNg6J mL5unfacZpSF5Y= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable. --- gnu/packages/tree-sitter.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e82c6e60a9..8f12559dde 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -267,3 +267,35 @@ (define-public tree-sitter-cpp (description "This package provides a C++ grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-bash + (package (inherit tree-sitter-c) + (name "tree-sitter-bash") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-bash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + (replace 'delete-dependencies + (lambda _ + (delete-dependencies '("tree-sitter-cli" + "nan" + "node-gyp" + "prebuild" + "prebuild-install")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-bash") + (synopsis "Tree-sitter Bash grammar") + (description + "This package provides a Bash grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37315 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 1207C27BBEA; Fri, 18 Feb 2022 14:42:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8C7727BBE9 for ; Fri, 18 Feb 2022 14:42:44 +0000 (GMT) Received: from localhost ([::1]:59872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4T4-0006sT-6c for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:42:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RV-0005W2-5E for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005RS-RK for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RU-0008V4-Q8 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 09/31] gnu: Add tree-sitter-css. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521432460 (code B ref 49946); Fri, 18 Feb 2022 14:41:04 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:14 +0000 Received: from localhost ([127.0.0.1]:53788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qf-0008RN-Ij for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:14 -0500 Received: from mout.gmx.net ([212.227.17.20]:51195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QU-0008NV-O0 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195197; bh=7isz5VBzfbzLN3UGyC9HWjJrngGIMaXZUIL6/jqlw4Y=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EtVAUMi+8+rt/R/aGhKnfOIWKMj0sz55lz9F2evqFAqesEfSr1DpL+ON4OrX9w0QO A/HSWq9SDPZOfKJOX0QCpu8SPEsiAXc263rKRLXLbnqXjEGgtC3BO6Ek7eBdh0gLqt adL/OfQos9DSweqBUVwW0kWQArOu4+7nyT2Rxo3w= 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 1M5wPb-1nMRzr3GGJ-007SDW; Fri, 18 Feb 2022 15:39:56 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:26 +0000 Message-Id: <20220218143948.28989-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:WdRDSKGiM7voI0urEfX54aXn47B8fpnzSMmTeVe/BJ7hPyzO2AV CeSu80e1qMFema3xmm3Ei/Ck3J7ZG2tmfhJOhkre+3Br1pMrcx1PF5gfMknTozcnbdXCDmr gLCsC0Lukp+1JmKDnHvtJHIEtV9SWSanja3Z5tdEHue4f8GwpOnxyZNt08nad67cAJxLIky 3Vz3pDn+ET2nRhvxgCMeg== X-UI-Out-Filterresults: notjunk:1;V03:K0:FCXdvOOCoAM=:KdlJ1ojcQcf01MVbPcYo16 fYof5FHQzYA4sgMYj+0nVOo0mdK9oGv0Hqr+SYXZCFCYxXTxzPJITKX/IAbz8zZBvHUvvWS9j ozHnk0SWIDlfpfjjX/oXNJLvixDnwpMNkEwsEcYBttYFHqyltVABLrVsG9sdk9TBVu2DzSBGr AkfuAOFhReaqjwKV6/OFv0VmMUjlADJryW1CkrKupEPQNTfHzXlqzvdlQNYB/oQbNO+uCC8UI 8JoUKRI47POkg0KJ5//+XoHzeStESxU05o0p7L+74D5hdew2OGCrd52BwvOz28+RwRT/ANQo7 hVWCqrne7TY7U34tSim4nuXmH0NvL8xIzEZ5ZC5DCnQ2E50Zocm0EDrfF+mCHM5OUPrcUUTwe 2YZc0BMe67AzICOOfO+rh1/oNqKSD2/yQVGIgY3FKz997UoH8z+D4hnQa1hSkmVVDTgQ+lwez emW7yPQU1CB+59esU5xMEwxLPIeqIW4l42gZpViLewgAjrEtW5K5ShVyn8eZc5BadNjmtynhu VwTB6TH5XQIbryeLLvxx2SNg9BPCT1YBlpbvTwvCp/h5wc5UauZWS0WNPnhb9dnADn/Ezrc9m 5/HIRXHcN3D99DCbLhgdHT6HmmdGIa3VtbfrUrt/JzoOkwaTV1w7LfDALzuqffmg4URBCo3HA FYu8wNOGzA8VhPGExOP1N3zU1X3Ul17GueBTw0FO9ESNmoPrYQazMT/ttSPiNHYzllNLO46SE KhFSkj2UJqsX57puDO4/b0x9Y1KQwwbj2aVC5HamlD+N0wGyqp5OlQqlXEUU3ybG5xGknjpHQ aHSVhLVHjP1VW2Yh84DM9rqVj/XJJOGwT7zTjuvYr7W9kcjNBlGNyJZ8MHZLaybNSHMk+Y7e0 bNG3xcdRhFpD8b150dmFasv7LW2GmuOKXU3gkr8TeDyW7CecDYLNVfyFxkmV4GjouGORc2R2+ 9nCIcMiUwmrl/qPfMHft8AaEnBgKQPVBMP2Qb+vZYxF1WBcuo/9iVa850v4+9qVzuyBAS1mtj 6lSRua7zFyH03vfJVTq/rzcGCoWB7SM5JhvBGvHFjJX1v+bG7EN4qbVlbGfAs+tnUk3YjDGSI yWV7/8PCXiqp1M= 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-css): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 8f12559dde..f26732197e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -299,3 +299,24 @@ (define-public tree-sitter-bash (description "This package provides a Bash grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-css + (package (inherit tree-sitter-c) + (name "tree-sitter-css") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-css") + (synopsis "Tree-sitter CSS grammar") + (description + "This package provides a CSS grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37323 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 7FC9927BBEA; Fri, 18 Feb 2022 14:44:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4AB9B27BBE9 for ; Fri, 18 Feb 2022 14:44:48 +0000 (GMT) Received: from localhost ([::1]:35912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4V5-0001Jp-DP for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:44:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RU-0005Rn-1M for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RT-0005QC-My for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RT-0008Ui-Kh for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 10/31] gnu: Add tree-sitter-c-sharp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521232435 (code B ref 49946); Fri, 18 Feb 2022 14:41:03 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:12 +0000 Received: from localhost ([127.0.0.1]:53782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qe-0008Qy-2y for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:12 -0500 Received: from mout.gmx.net ([212.227.17.22]:53811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QV-0008NW-22 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195197; bh=t9q2xXaUdZOgm6EDTL8XREA/zj5Tfvkl3Jtunv/slmQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DGeZSv/kTJ2vpDj5OatMuVsLaUepIah+Gx+dggy72bvgKr2tPJbSP0B1H0IWU6xVO zqSMxCF91R1xwmJGQBg+AnKT0Ul3w4/owIL0Y+VWupVAVEpG1pi2yeYdp2cIvxrT84 TbrAm+LY2+OiqKoj150S0K6Mud6cOetsmZUFP/vI= 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 1MtfNf-1o7eni0DuB-00v8UE; Fri, 18 Feb 2022 15:39:57 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:27 +0000 Message-Id: <20220218143948.28989-10-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:laIlKGYtDJr/ouO6QDT4OJG9uveKV9U3j6bnIFzDE5DLdkBIrKQ Y33JmpdAuHM9vYS9EpoVp5lsws0AgOiA3yeQbXFDMd5KJAedCfAJWTiBMtH6EO3JNFC4gmy BpW45ZEQodqgOGJ3KCM3OzsA7b+CMyGvCSj70wdalzRq2CIoTJRmPgCUcbm84vtltoQWE0Q 16q0FURcmTXlAQ8PFWWLA== X-UI-Out-Filterresults: notjunk:1;V03:K0:UWHbVWrVMPI=:mgT4CIkimAUxAEaFjjQSVr OkG9DmbEMzT1dPH+r91s8x48hzXROugvuLuAVd/62Wh8Rp18UDybH04hPeyoAIsTTO+B85g5z 7Sp7kgQTKsaqq4HnGGIURcQiT0zIAhYnwcKUWT2wN0uU7K6d/ljU3qu7xNZpt0VctOYfipomY KT6YqCTULs7rKN95wpoemO7ACXCnHougRgv2cmjYVAUZalsQ+MvbIfzjDoUmvaGowBibJJr/u TbhHmCM6nqCdLZ73Yel2gTRLRz6IA+0SAVNbYne3vFoyITq6Nj1asbCURcat59BkoPuIQqsZs sWsLZzZTSYMBk1JfATmwfm1L25L0qj2yXkv4PVrDnZMerO5M1sHkxkjHJKD/0gVbnsU/62pp4 2PQQfPAcUek7iBD69AdpmG4xhgpunB/k7RAmVWic6gyBIcecPPo7nO70hzCACiQQxNKtBsBwz dMwA2hVUdNcwBvcJHhEfxJh3LMmWoso37Zn0Z2wiT2Em8suu5haJOS42lxvl+jRLFUSjk+v+P fIFf9eq0X83mbui8tEcw7HvtpduAlfFT7laWtIT7EGay4Jv7t19OhY1rfhRjs0QBkXsH/kk/w /Sh1fZH0ueBA7l+9NXKvzvH4eyOqurie1syJskwoM/f5ev3gdqI0ACTJj71vyfTwz/s/DGrxP XnxizgKyEui1imRqIFO2FNTPUtj5GtfGzlGNllsN/U199EyV311SrLQX270k1hB127bIXWJUR 20+X5rbflxZ4n0BouCwNGPpA0eWr+Tn9bG23BV4XKJ9aN09h3leueAJVtaBFQGhK08n2wDDZW dOsSvjwF0pi+ZF/31h23oUfsPNUxfiBxXgFimcXMB63E4Yhk4/oi0zqOIvWWzd2qSmtEvCy4Z eRrT/IVEn+D39iLUnIqdlvseciINflNGVZHgKtjw2XhyFRgvq6jZsojvtvI0QISUUenPFNJ3G KaSodkuEdk6Z9JqfbBK+MccXPgR1RzIkDQMKJ/e7Mcfg0XEHJ3sjz0GNw0HDAmlq5RplM0nGr RO2YFSGx4C5pd0oxSTPhb0Bj3zJispt2PFr/oDwCQEZvFNpG+uv6vOWIPvKlRg7tACB+HzeW/ GFq4hEDljvqu/4= 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-sharp): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index f26732197e..5bb7e7549a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -268,6 +268,27 @@ (define-public tree-sitter-cpp "This package provides a C++ grammar for the Tree-sitter library.") (license license:expat))) +(define-public tree-sitter-c-sharp + (package (inherit tree-sitter-c) + (name "tree-sitter-c-sharp") + (version "0.19.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-c-sharp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-c-sharp") + (synopsis "Tree-sitter C# grammar") + (description + "This package provides a C# grammar for the Tree-sitter library.") + (license license:expat))) + (define-public tree-sitter-bash (package (inherit tree-sitter-c) (name "tree-sitter-bash") From patchwork Fri Feb 18 14:39:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37312 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 3494427BBEA; Fri, 18 Feb 2022 14:41:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F219427BBE9 for ; Fri, 18 Feb 2022 14:41:24 +0000 (GMT) Received: from localhost ([::1]:58122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Ro-0005cF-0c for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:41:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RW-0005Y1-DN for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RW-0005Si-2b for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RW-0008VQ-0j for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 11/31] gnu: Add tree-sitter-elixir. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519524032516 (code B ref 49946); Fri, 18 Feb 2022 14:41:05 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000 Received: from localhost ([127.0.0.1]:53794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R5-0008SH-W0 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:40 -0500 Received: from mout.gmx.net ([212.227.17.22]:49609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QV-0008NY-AI for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195197; bh=VJsdUN+bfzVV1vzGAwmqLHRk10gtWE/kYHPDYrChqKQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IQi8GWOYpPLQ3SMJ/7apfgsSk57qLu6OSm5wA3OUlvJnzWzLvfCnjBSiBSQB8sy/7 4+tVp56H8dhQs2AqedVpU7cUrOUHRt/8qJ7bnycFTCqDaiFWt1cHkDvYAbBgVFhU0F f9sRmKkq4W8ZG/ud7Ok9tCWfwgdP3sR1skOOb5G0= 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 1Mz9Z5-1oFO2A1PIR-00wFU6; Fri, 18 Feb 2022 15:39:57 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:28 +0000 Message-Id: <20220218143948.28989-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:E4hVVQkcUsfvNFl591+XGTeobS+Z8U9FHyP9Kpq4Pi5o8BnKE7Y z0ivov88R/kMBRtlgAa7pluxNGiYaDatsvyIVdihSD+352Ttr2rvTvwKwk3aoyCvisEoDwr Gkldq1e/a4xTGEXuOUhJdDls3nsSyHdtWnmuYIRJFT3cjuYGV8HAgN/fwy082eG6u+kMYnj p36j79N876lGu153hV7XA== X-UI-Out-Filterresults: notjunk:1;V03:K0:NVQMIryPM9k=:wHnZIBnq2D2aeKc3KaJAhQ lYhx3bz81wkZW7O7WMh4u2xiQ2MjIuW8jjt1Ng6Nvg38Y6giCUyJU/M40uN10RguCe63emOO9 QdFy/i3O6+3YO+umx3Z0CedkDympttTV/FVQ0SrNpiTKjjtReAlZCUNgcWCAT16nbjD8ctsjY 8dzIesQDRAmp8xRQAoVfjPger5KjKwrVZUZDvlfbj9bF4XOVu1MrqXMjcnONc+cvh+lG78AMS 4YyQ7r0lWujQe4BN1PDn348tj3Kwv1HxvzDQFpLscVLApy/kM8rHsjPnULNCQfXUb85pd8wWv mrvMLFbZP7XyJbcJlOrKJDp5S2kQobU3fa1JjTYpg3tWc35tP1cUJSngwr4XgYuV97/9fZFlM MXBaxveR+bGtMeuca+lLc+Km6i4nvk6PNhX4IrP9lHd5DM9OZKBW/uYFXdvhJV2EiXlJkKg1g Gq/7iQj2TOB6gaRLS2q5+B719M0cFqqoRhnRwakSH7rAUtFQfVu7vZ7/jjq7X52Th8ns2p+3s kLcfjuF2IQC96bGAsT/nqSy7Zd/6fcKIg4Wp47AgALmW/3azxAvfOjxMtWoLklymuS3bLahDR mrgiHQD/nIUwOieJvSss0k0DFINI/WeZopwBtOVNfTW+/jguImruE0JRjD2jYzWZOObaL2eeR ltiF9VKKbMJ6I0JBWOBO+Hbzo3amBDSGlD1qhWwGGmvAePymVwoWWFLdaFmukqgVZsYSrLR4c jk+3EWiGsfUqohM28BlDouOZIMr9Qt2DBvKg/M4+q1xnJ7Utwqfser2fgcJBAxt6VbS5PdTAp +C0cyl2oujy0ccQXgN7sqFbamj1IRrjOtxFh8TbZwX+5I/zvf/3tq9lw4VPTFClQpn9uS4/vc ZaGXoWEUeif1k999qtdrC+TGMNDeObLBkmAbMunhHQbklNWedfsRsR6Srm/LE9xzhfmZFPvtS d696/SbB+84aTgrwg1AvkptBvQeEykCj4upDE2s3wORX6K1f6mNLl28BhYAwgCxrglvMplr4O GDx6ys+xyN1rodnhge3PlnVrN4CNT1jRh7bX20ibdS2KqRivw/+YKptQRHMuxE/xIo0DjSSSa M7rW6l6gk44UXo= 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-elixir): New variable. --- gnu/packages/tree-sitter.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 5bb7e7549a..134d2768cf 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -341,3 +341,38 @@ (define-public tree-sitter-css (description "This package provides a CSS grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-elixir + (let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869") + (revision "1")) + (package (inherit tree-sitter-c) + (name "tree-sitter-elixir") + (version (git-version "0.19.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elixir-lang/tree-sitter-elixir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + (replace 'delete-dependencies + (lambda _ + (delete-dependencies '("tree-sitter-cli" + "node-gyp" + "nan" + "prettier")))))))) + (home-page "https://elixir-lang.org/tree-sitter-elixir/") + (synopsis "Tree-sitter Elixir grammar") + (description + "This package provides a Elixir grammar for the Tree-sitter library.") + (license (list license:asl2.0 + ;; Files in tests/corpus are under MIT license. + license:expat))))) From patchwork Fri Feb 18 14:39:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37334 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 82B5D27BBEA; Fri, 18 Feb 2022 14:49:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4B55B27BBE9 for ; Fri, 18 Feb 2022 14:49:09 +0000 (GMT) Received: from localhost ([::1]:41324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4ZI-0005Hi-Ea for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:49:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RX-0005ZJ-6W for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RW-0005T4-Rl for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RW-0008Vf-Ps for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 12/31] gnu: Add tree-sitter-elm. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519524232531 (code B ref 49946); Fri, 18 Feb 2022 14:41:06 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000 Received: from localhost ([127.0.0.1]:53798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R7-0008SW-LW for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:41 -0500 Received: from mout.gmx.net ([212.227.17.20]:50399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QV-0008NZ-FY for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195197; bh=UxRTXAxYZoUGi8KYjX2qz5kFiIeBYqcKccoSXQtExSU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=lyoyAJOll9AXqMm9Qb2lJ1S0T/VXw5rB3vePy2EEZ7mm6ZJmekZGeRU/aLdqEuprx KvMg8GOby6t6JYPfFiqjAUUqMMNrSrHyHtBSq6E2JeyDgTrC5YUqts8SlRnkZPCckO Ycu6oUWI55W43LgSH62OvN9N/Vx97lL596Gp6aLw= 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 1MEm6F-1nVDQE2bRj-00GHuA; Fri, 18 Feb 2022 15:39:57 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:29 +0000 Message-Id: <20220218143948.28989-12-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:RXQesLBIJ2dnAWanGMXAYYGjYCmQq6QZDBTEGPOnm8eJLDAQf2m PkKzF5uopgC74q0d76miVd7HM+S6XH6/HDvELjJYTTXMwgHsRAEpZA6JEtoBr3yxHw6EgY9 fLoBPMt3mQ3aSmmbeoydqXPCTCX2acwEtriCkra1rJwioEhXEeTsM+7wTBNnRpY6ZVXPNlr WX/kTcnMvXcsx+YjDU4Eg== X-UI-Out-Filterresults: notjunk:1;V03:K0:X5Kd/FM6lG8=:jEn8SZAjl004SqfEEiq3pN wSjfgwQLBEq1QRaRiH7uLDWVmhFhBQzyF9K0lT3klKKAUD2aBUolDbyyJR4EYldeCO3POtoKH mIktGtBsldvUZsQDpHpAHuov+m1g5PeA7KKeioBFVPA8NbIvhXht1SN6I7QQOHQ5TIGTRFhL7 KITfIDbmKNGLiTAhRmtw57jBfAhLD0IE6dXS88MsWwQ3P/1ObiWqJGy4eW/VHMas+UA7Srx6N hrOJ3jW10bw6c/FNLC4FYUeSuepSawwNkGaof9pPXbEyIQ5ZB42NR81H9E7nZVvQacyVBDlgY VMXHIY0zSX8BHXw5GaGTNC+uPRn3hv+Drc+Jdho0DJdr4L4gamPXjHggSForVKQc+ex+uTchz IxO7bz38ligBBcLqRl15V0OwC0EA2PBq6Z9ZIzB93a0yzJ2AQ8O5sNN4Oji3/NoplMOjIe7kS v27aywsVCUpFJhN0Okbz8uoBwzfliXroFjb3AmagHcwUNqjWAaUye3JU8PqXhY5wiLBM0mIRa BqLmgSIVkKz4pJOk5Lsd8V7s8lZQNKIlCRJs4g79LiDJLNJzjwRkox5+fd7vZmLtBUsRk4LY1 4bOmSgUVAMdQGzRtisj4YopOz6JxZQo60C74xV7iSoHNd4FTRycHG6tMqVHV98NGW88d4uUDI 5QKODdZD8RoPFd9bpGXhG7rubaVAlAO17N2kGGrKp7ULDNHPBSBtVTebB1weMAmgZdotEsqsb v0GlLNkxxw86XPvNvAd1ImyY07nhv5LvqgyjEZOW/T5amsScVNE3RqR43kBup/PxRURyzROJG cQz0TqGlHar2uge+cwB7NTqp7xyyfGA13b5qFXci8USWvCLcPRYRtKv4v9HqaNcsBES7+Y1q8 EtaP8XCEKG1GMwSHjZqY1Pcg4eOYtwydPTTkQoY58A+dFgDaKyzFDIt5YAGFk16R8W7IkWvgp k1y8sGTfA5ENwJfK0BwR1KaVPtFHCbi0fQ+2UQAvEgiAil9JScSu4UnBVZtjhQMFEKfDEGX6u AhC7+TdSSgDHixUtQ038ab70pst3qUhpp6u4S7M9vSt4xGz4EXvb6PyStNerY8jyGs0qXkk26 QvQE0BuyyYv/r0= 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-elm): New variable. --- gnu/packages/tree-sitter.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 134d2768cf..5ade030283 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -376,3 +376,36 @@ (define-public tree-sitter-elixir (license (list license:asl2.0 ;; Files in tests/corpus are under MIT license. license:expat))))) + +(define-public tree-sitter-elm + (package (inherit tree-sitter-c) + (name "tree-sitter-elm") + (version "5.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elm-tooling/tree-sitter-elm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + (replace 'delete-dependencies + (lambda _ + (delete-dependencies '("tree-sitter-cli" + "nan" + "node-gyp" + "@asgerf/dts-tree-sitter" + "prebuild" + "prebuild-install")))))))) + (home-page "https://elm-tooling.github.io/tree-sitter-elm/") + (synopsis "Tree-sitter Elm grammar") + (description + "This package provides an Elm grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37313 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 81A1D27BBEA; Fri, 18 Feb 2022 14:41:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56ADD27BBE9 for ; Fri, 18 Feb 2022 14:41:44 +0000 (GMT) Received: from localhost ([::1]:59000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4S7-0006Gp-Bo for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:41:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RW-0005Yg-Ry for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RW-0005Sv-FD for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RW-0008VY-DW for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 13/31] gnu: Add tree-sitter-go. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519524032523 (code B ref 49946); Fri, 18 Feb 2022 14:41:06 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000 Received: from localhost ([127.0.0.1]:53796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R6-0008SO-Bg for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:40 -0500 Received: from mout.gmx.net ([212.227.17.21]:33933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QV-0008Na-S5 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195198; bh=3DBVjgQ9zyW0mpZCQUaF/9VAW2pThHXr9hk1vhPgxog=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jirThsySHrOidzR7Rwx4KoZ2k8f98CAzh3sbmILVBZBq7FiJSQUAST3rD+JNeeZMW wbN8L46NolfVttgTxgWWba/w78dhR+Vn0wTzfPSSGLfy00WLUEtsPkA85O/RUsFcg4 mj8RO+Mgrms6vJr+dEuLOepRK1dJAAWr8efMqROc= 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 1MOiHf-1nd0wU3keF-00QDWM; Fri, 18 Feb 2022 15:39:58 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:30 +0000 Message-Id: <20220218143948.28989-13-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:eBxCEyvMZbu/V/c4Cqnh1E+qIBkFaKVQ2J/EfW3CexEH8sNOquR cpdi26+v9ZPjNVGzNlRACt5m2y5I4WjiSL8vKt0vVoB1a4m33oiyLcj55fAgLsbU8B0GW0K 3J1oj8n+W8T2GJgXWu84BG5T1awWVmMKIoaA9NTVhyQLmXR1GEF6PbnhczRn/qAS7ifmKkE 7JvyaTv9EyaFPoGGQuHQw== X-UI-Out-Filterresults: notjunk:1;V03:K0:8xSQyr+CSXA=:MMBOUKp9Z4BVb8nR1BLUz1 TwG+ntC/PXZ2X2m8WkFmHZ4880y/Y9lMnR/aFaSXn2tcCGLoXFvA2VEgobPqmRsRFM/KxsJ10 P9hHVxrIv497aBDrQrTnbSkul/eZTrXQegHKFXS+Pz9Hcj2eAvvVcLtzGh/71ABCSertCW1UO iOFLxMlstvugmXxBbRlCsL6esoz5h4WIUDLImZlYG7MG6+LB5eKCu+TJs8DE07AxiM7//cyRs zenBfzFv8sYyMArhtr9au9lc1oXGHqFcP80TSLLuleU8Va89pnOvEarjH5rWSoiLQ1FgPgmQo VOMELwWk/a57AHmDD+j3pPYFnW4ugWGfxXoCU369IJkx2Az6HWkEH/gmrF5mFHX/68VYACrJ1 6ucRhjVt3JAT0LqD6WlzwZKqSODkmIGBPeM6Kl8yR/WnHaBTPFjSeLmTygAWJ7YzEiFJw5Afq yYtPCdOsnwee1BqApjt63OhdH+6/JQ4OiUez0cj9D+fvoSvIM7Q6NhW0EuPw8RjErTwjSKsu0 stmDz8gFKY1IjQ3AihE8RHarvxYRNJQrusIVTvXJUQ1270rBzlw4RLBgZ5eBh7PzzoXitc0Df fqVFn75OwHch8VRh6d7u5ucHBiw1bLsNJxlzxYwUDnh5NBpnG3OHi4wRrh94oTdg3jf/1n5bm 29Hv+tJ3YDK8QpDFCWvhmUgBfzOSFx2PokKBHZGYo8ksJMSKQBimiMcvGCiBu96P3S2Z39bCq YHvOcWrCBPkfkPOQZlA3uuedZ1c04vGggnFtF5NyPzxEBExoBNugqNe0pH0R04x7e5+WpaJlL nU1D2kgFxhhOgJ7jr7Rq5BlS+YMQH6yebJgokvMOohdW+w9E/xvcNL8j3jMVhM3jBYNpHgwGJ /ECmB7M9rXEj3UDkAWfns1PDrDK0PnGh2VBFFgEIRjI/CO7tVa6GQJdVufhOG2taW3a/HFZ/4 NrxoaMZACL43MJbxdj4uP4GVdJBhcYGC67HulDWihz8iO93PzC8gav6SjMGEgRNZmjVIMA3LB M3kFWD+IN60VB++GF7MbOpm/WLzlPbrAqKkeBmtWiqbNjpxURvRXnCiB5slTiQUajuUiusae6 zvNoHFgDW3Vj+I= 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-go): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 5ade030283..c1e58d9c8e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -409,3 +409,24 @@ (define-public tree-sitter-elm (description "This package provides an Elm grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-go + (package (inherit tree-sitter-c) + (name "tree-sitter-go") + (version "0.19.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-go") + (synopsis "Tree-sitter Go grammar") + (description + "This package provides a Golang grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37324 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 6E87627BBEA; Fri, 18 Feb 2022 14:45:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E56F27BBE9 for ; Fri, 18 Feb 2022 14:45:30 +0000 (GMT) Received: from localhost ([::1]:36436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Vl-0001fL-Bm for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:45:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RV-0005Wh-IQ for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RV-0005S0-7o for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RV-0008VC-6A for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 14/31] gnu: Add tree-sitter-html. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519521432467 (code B ref 49946); Fri, 18 Feb 2022 14:41:05 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:14 +0000 Received: from localhost ([127.0.0.1]:53790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qg-0008RV-5v for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:14 -0500 Received: from mout.gmx.net ([212.227.17.22]:36475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QW-0008Nc-0N for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195198; bh=QEkRj2G207ZRBXzqNXf+9ls5TVwcsqF5AoaAlPJSKao=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jfQ5VEkBvAWO9Xlxc2GGz7IJqb9gzmu+Z2n8yNX0hLldO2Z24A34JwLX7upjSbDIT /d7ph8UVpMVWYm1vWwyUvYB6s0vna5NdhyeUVfwq1lzFjZ3sbpeSaN53KD4pbrNa/B HVeXllaH3oHHunEsh7mbKHSub1HW91VUHP83j6Mk= 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 1MybKf-1oCcsN0lH3-00z0NE; Fri, 18 Feb 2022 15:39:58 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:31 +0000 Message-Id: <20220218143948.28989-14-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7Nyo46uJfKJeORdQfkFIt9YpE3hg/7Urc4A3DFEat9gDm5YfBRK gp1FX0xwRtP04lYHi70jbMDDbeYfO0s+ggZth5cUJq8fNAvNdwKUH+Dw0pIwHZR81ukqVPV Gre8ZDUz9i1BnakYj4RujB8lM+8Z8hBUDSSVdsRW1eEoMv1GdcVm7OV+WSUVVI3fhBttvZx dfJZ18uc7u/XUpb3trAaw== X-UI-Out-Filterresults: notjunk:1;V03:K0:lTI8FBZ23as=:v9+/2RQq7GSogptvv/Vbh+ 9OdyNYCvIT7Lv1VoboSypRPkGtOE5h21sqRQ+RwHV1j5Su9rvgEqUpxTKmJRmbEWila6SjDPA gDk1RhtX0PXZqqVrbRYwWVX8k91Lhkznqj6fCELk5tRNZSLGmvY8YWtELAQz0lYGqdCpBRrn3 RCz5RJ0jahRCNxyeGvGMF1VlFKx2Da42OYYGoXm6rcga0UBj+oVcY3y/wHjxgbxzUoUDfrvnn DyUS0oZ6Nic/PZTMeN3EwbIdWHBE9zeqfSsVAEOZAXIFcYybEGmNEjg1htibnBZ0re2mexuaU 10wr/NpUrRduuEfOL7bWWxWmiFYql3luPoXQOBpbI1A216U6pdZ1zRkk5tBCy6HEGmFRAW2h/ +X2YPN9BoWmcLyIRtU0H6U2WfNjIRA0Szg/W6fl6xpmGp+ezBaNut+zzaVVCNuBnVonMiPqam txXyaezqAIR5AP1Czr+LrXKtvALiNoOBDd36Sl203w4cvnS6GRJuDzm3AwbFlUP9gGinl0Wrw GyeOEaJ6glSdvUcnxyTv0r7Jw4zQzFoMEOFaNVXgafT79poy3lfKSaVW8EehHAtwaWml9+6CD r+61Rvzzk7FHjn6eTSOFmeKcEJQelBcHnLvMia3P6FoAUUpgIH44dd656/bp15muPNqlfYcLt A9QQhdHKofnqt4VuT7YgvRKxYeV9xqXegEamfy8eAUEqsx/T6CzWTX6ffQEWf5aY0XjsohSko aj76VgkIF5E0SdnK+Rc9p3QkIgeSPuOeO1WL1EXdI6r42t7oBRtGyO4eG7vRooDhbc2ClffZS nnXR0tH68PM2WjA1jwaAo+b7//y0RwjZ0SBtDvzNuhqZAFTZ8kTkA70ulvWpT/ew19c3I2Y2Y 3NVUGbD+miMkGNYq5bfmOSjjPiGDjnO3OFMSrTc/STWXxuwNVL8FTWOD/1o4twQHfw4LKXS06 +zIINWOCbwfCkBEPC1wIEmkNig5Am/4l1Df1fOBHAdNjy6Gj2DxvgyGBnymVwVb0ZeUBomZWt sD/FRk9nsp2x8UanOC3wnZhX+ugyP6z8VxoBvwepMRe+JidrMcQhobUYdGq/OJfoLlrb7ar9M EgZahcV1V7RZQ0= 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-html): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index c1e58d9c8e..4bb9425eb1 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -430,3 +430,24 @@ (define-public tree-sitter-go (description "This package provides a Golang grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-html + (package (inherit tree-sitter-c) + (name "tree-sitter-html") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-html") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-html") + (synopsis "Tree-sitter HTML grammar") + (description + "This package provides a HTML grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37333 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 BBF6727BBEA; Fri, 18 Feb 2022 14:48:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8804927BBE9 for ; Fri, 18 Feb 2022 14:48:53 +0000 (GMT) Received: from localhost ([::1]:40884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Yy-0004y9-UO for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:48:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RV-0005XH-Vw for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RV-0005SG-Ln for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RV-0008VJ-KB for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 15/31] gnu: Add tree-sitter-java. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41: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.164519524032508 (code B ref 49946); Fri, 18 Feb 2022 14:41:05 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:40 +0000 Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R5-0008SF-N9 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:39 -0500 Received: from mout.gmx.net ([212.227.17.20]:47677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QW-0008Ni-Ak for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195198; bh=XVSix6YzYvtttcXxKR3GOxHL6tllPi69jI6otcFg3io=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XdRehzaXlZvJVQcYabmwDNbSFpsZiNCvdLd9NunjTTkP6n0GwQsllZcWenM0HwU42 MPOIdbdvF351Y7+UzfnHCfYo+4F6trWBssbbpm35nNqYkijdAxjf/sHhBjcwzRwEjg Rfwxq8GRBPZ+CRs7ay94sPoBzC2eCQOnmpTkIAEk= 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 1MpUUm-1o400Y1vK8-00pthh; Fri, 18 Feb 2022 15:39:58 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:32 +0000 Message-Id: <20220218143948.28989-15-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:nOhY/UfZ7BAbJFvFgcQ0CxdblHtP6Hkrj/kf2M9+EuCE0rFQxLL 7R2znJRGMd/mkIZ747vLtRLrbQq0DY3dCABLZhRnMVFzffzWNk6ZhYTj8gcSWgPSb830TEF PsRLt7DTe5uNSBqWBwUrwbL8ujd9klYBZCDjQ8CF2kL7ul5vqWOkRcF676uQZms6SL5MPpT j95z0JjEZqq2HHlcHNt3A== X-UI-Out-Filterresults: notjunk:1;V03:K0:T4KKPXqHpDE=:GOR7kI3AR3vkGgm5Sh9cG3 1xdORDO1zUNuhM3cae1l9/6FDvpASUIk7q/QnrBs9P9To6NbhhJ6ixI9RTgTonlZjeQ0fnmwP 9XtowEme0LIGGvrSrOmgjgDhAAiTHysEq4VQmarfVLS5O7MZi5wtlV3TebB14h7aK+xp5CCM/ Dni+2g1BrYulVIZfvq+YvEIyZpfAyB20A2EoC+e4cns5R9rbRHtmEkv8iLctop+a7b8Yzuezr LO0Vg9pg8YvjcIRd6R8VGuifXOylJFAX+XsQgd/hW+CLc33f5DZPue6be2K87nEwmDR42884b QCSOI0M9t1XPoPHeyAziy+Kyn8biqBf9qYIoAOITeZbYLONlkmF6F5aJDVuPw23yrRPc6SjvQ KDentk+2Yxr2nes9RFCl05COI+T3Figg3/fHgfHscAmk53YRVYkHoNxkYA6RTNZ8ZmYE15ekE 6/bvFA98MjJM8hV38JFbj5bKBXX0C8a8uNbHMQAnqrT8yYzpgGH3h6Ze/SXczTcVa290LLSf8 8Q5Yv0RAkiM31jQH9bVql0Ppj/Tt6r6zsh0OW9jNsaA48RaB1p+c5kLVkIs2pV38PWSexC41n a+y0y8iAfUBv/g9PCysMwemYqQ3hLyWo+qsAUa6MQdos9ma0EgY0WWogxqDVzOijyD7wRsGBG xcNkYS4XUc3zqMs1YRgzMB7SHj5dPKsDyaok+NKj1hV0yjZ8EHj0fXqAC6DdpUMtua0BDgm76 ttmAMdk7z9uI7VXg9W7DF6T9x+rSBbrQHYf1FD1OTxB9Hb0GbxR9CUGKafgmLD/JLyRyC7i9h +nGAdTHcriRt65Yll7mOMsyYAAk5SIPIqXujHq0USLLohsC3gV63QuLgn0izx89USPNBtG6bd s0C5QSL0Tqb8fhnZ5KdDVEpmN/qC0zb8oBrEHJx7/boAXdAyRmIMQo3KucguHFgdSZ2INHbis 486JhGHf5Up2mzA6/MDngrsIkVv5GkaXZur7sJwFRskZANTyMzZEEua34AQvpuKLIBHmWWTdd xhHLjdn1bfGFuGai/zEO5DqR0a4rJeNysb0upS/sb7trU5CeMZPF0f23qcJiX4ah9wSnEqG1m ot+fgSsBM0a8Pw= 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-java): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4bb9425eb1..d93f6a584a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -451,3 +451,24 @@ (define-public tree-sitter-html (description "This package provides a HTML grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-java + (package (inherit tree-sitter-c) + (name "tree-sitter-java") + (version "0.19.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-java") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-java") + (synopsis "Tree-sitter Java grammar") + (description + "This package provides a Java grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37316 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 379A127BBEA; Fri, 18 Feb 2022 14:42:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0BFB27BBE9 for ; Fri, 18 Feb 2022 14:42:49 +0000 (GMT) Received: from localhost ([::1]:59904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4T9-0006te-Ux for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:42:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RX-0005aE-LP for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RX-0005TU-8D for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RX-0008Vn-6M for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 16/31] gnu: Add tree-sitter-javascript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:07 +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.164519524232538 (code B ref 49946); Fri, 18 Feb 2022 14:41:07 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000 Received: from localhost ([127.0.0.1]:53800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R8-0008Se-03 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500 Received: from mout.gmx.net ([212.227.17.20]:55707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QW-0008Nj-J4 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195199; bh=zxxQWIkw8qs+oBn0TKZSs1eVn0vk+ROb6ROmKrliY1k=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RyViOSA29lhcNt2PPPHNBRNO8Bx2WC/JLLbp6tWeSMhzYgya5jdfBvRFL5/cZwXod cUeOtIBFu3SNw9pIJU9+L/nd2zdrc79MhBKlPCtE7DVeSGxX3EoajLCJQ3XZ2Re7bt xdmg5ImjNpWLEnAiPWUgNl/YsHsDXP9hmKQcCr9s= 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 1N6KYb-1oMUlT39zd-016k8K; Fri, 18 Feb 2022 15:39:58 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:33 +0000 Message-Id: <20220218143948.28989-16-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:k7MBkNM1f1hwMAhhpqaZZYSDLj1p++2UMDuWb4+wnuzJasBSWBz BNIl+lVXcqYz55iGhgaPD0N+sO74WZnxjdW4iiV+a6PsCDsvU4X+eWqGtuiP8oEmEINaO+x cZlPcl+rZFX1pV2+hkFlgnP+Qaak14WoylI92UkU3mRxcwnvYmQU4OLKVurPbyReWTBiwVd Rl7dz8NbOsaXGVBC5T6Hg== X-UI-Out-Filterresults: notjunk:1;V03:K0:P1EUHWSMeaY=:WHC+OuTMLYwicQgMjIpBVZ udLQzSbr3Xx/H4Ox9sIfdhpZDYrNFO/XkyJVJP2JFQTKP+so3X9RjlI7FnSlkEOiAyPScxNT+ EdLrbgN2NR3n7DIodH8/6kN9TRs1dCuYmmF2oGTi8o8GD7/HSdHYQmpdjc4PUh8Zt2xkPYtWm qSFv+rzlhdfDEREuNVXCznocvdkkysDr8ejT3KtxQupRe3/QzceMgQk4mC/nmagUreWSDs+HE SFZvw741lcl0uXtJKcBI5s1wxfUTtNQOcHQlXA7FXBEYIoaiUqW1WNz80yHpcdQTrcmJXqETE umWOC5/zI0ewq0qwU3Bvrqr1vVntfbLTpcArmxBk5bvDa4m58aolc3iY+rlTYFC1oQvyaXD6K PHlmkQPx9cMr1imSvDkyiMbbyGnZ0JLNbW5dvQ1/Arh9f9FH63/nZmuPJGB7JJfF+RQH1RYlr +51rzPyPq9G1V1GG0gtM8DKES84wVInDZZrkRskcS01bS8ocu+ipJB6cWpKU+vLSfGmGWieIB 3zqFnIBNhrOOCYVTfdzXqcmhejTVUuAib3rO2XySfg5lVPXugkdg4L8JXk7khrCOctOZyVLZa oSscxOZgR4F0KphkELm3ImUC2xbOeVIiDPVfppMnWbfaWIsWWe0c/WTV/GnGc7M9mV9T4BkbQ cGF70i6R2nXODhBxzoR0P1ClqtFIbV+jui/EqiuJWeqPfbXGDZbHuLfGsyGyIhkdnkxKnPgwb 3mHylkcsM5D/NTl6qkw2JfB3jAMeAUkfVwVa4v/T4GiHjziq1RSD1/q0A+09ruO6lknv8Wmv4 H/PWsTDA0DUJYL67IFZTSKtXoKYd4H2k1J/+kB0v3QMJgItHERnIJ4OrZDc9L5XsXsTus0wLO ZsdRHxD6qkjnXjnzWuprrZGriBFKl9t5a/E0Qc3ygPh83EBVngWc/X2m0mmhgtxcD/2Bnq8QA zZZB03tZxtnwmgBSdH7ApN85muTnpoKaxXa6rVoZF/ufiaMQDmhPWqK1Pv5EF8wnSuPEdBqkV dSucrPclxeSURlUQprLFORVRGgVrZrY3lUpsxbfEfe8RSwuDytWMAIeJ0QNPH8vtVhtkC4MMM n2ESdljRaN1v2g= 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-javascript): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d93f6a584a..976e4cf9ae 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -472,3 +472,25 @@ (define-public tree-sitter-java (description "This package provides a Java grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-javascript + (package (inherit tree-sitter-c) + (name "tree-sitter-javascript") + (version "0.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-javascript") + (commit (string-append "rust-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-javascript") + (synopsis "Tree-sitter Javascript grammar") + (description + "This package provides Javascript and JSX grammars for the Tree-sitter +library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37318 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 7D75D27BBEA; Fri, 18 Feb 2022 14:43:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 45A7F27BBE9 for ; Fri, 18 Feb 2022 14:43:25 +0000 (GMT) Received: from localhost ([::1]:60752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Te-0007T2-Ow for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:43:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005cA-B2 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005Tj-0r for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RX-0008W1-W3 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 17/31] gnu: Add tree-sitter-json. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:07 +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.164519524332553 (code B ref 49946); Fri, 18 Feb 2022 14:41:07 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000 Received: from localhost ([127.0.0.1]:53804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R8-0008St-MV for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500 Received: from mout.gmx.net ([212.227.17.22]:38647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QX-0008Nl-3M for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195199; bh=OTNKndmXVb6PWPWF70EDSZ5UIlgaSBkaeU8l0/Y/Pe4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=G4G7heUHJJO1LiVx37xVPSX+7+hpIjWRe9um/lyZl/eAqz+JW6qzfS/jcGD5rOCfu NK9iuIviiNLSJurMr6xTqJEBl3Xvk7nWt7P5c0gZYNq6jG6Mdm+/CcAq90sQ6hOWK+ y9iVsXUwp2sn/l/klKxxeHjPIA9wPJppXD4rK6ps= 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 1MG9g4-1nUwJ107LA-00GYsz; Fri, 18 Feb 2022 15:39:59 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:34 +0000 Message-Id: <20220218143948.28989-17-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:mYK+G109TkdlsjZUP5/wDxEaUdtVlO9XDFVfmM+20zPXCSO14rJ ZM+YjOgeF7++lo4nEdrUQQI1jMtOJG+Jk2aATKkHYbtwLz+iaQcv4xeycuXmPX8TqN/utpw 6qcD5Wj+cG3GqJ1P4MipPVtJa/dqaThUX7cBXW4yoQcDw8DmlQOuJUmREpQmpP8QgeLIV7J xqnE/vmpzoVXkw8UDuU+Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Jvze+3P2SUo=:qcrMcWNZxxQW1M8hAbtXuL /HjRO6E6ANClXm9fWk+IOB8vfdMMrGYb3AQScNhihub2uoW2ThUuQSmDjXgpWSS5embo2g8fr X58ki04TsnAKyAin3VQd+EMB2QDqXyUHOQZzOQbNAFQNkv9I2Gcy2B3nr+tyOBVQIohLid1q5 VzBUKGHVgf4CVOIosekBU9fmINYtZA4MePlegjfNa9OiD40ZINn/egqtV3QC9ICyU4cFeKxil 5ZbOVjxL4FfWbn+YTY+RAcL87IVRm4rfvaSdw+lSceCHPB4VGnMjC9YBV+Wy3/6KbrdRIxxZz 7Ys3vdoIb1QfS8x5QRRii9eJDmHAUUr3bIgt/5DhzCAw59Z4oj3X1KYYSqqLz3w3uhac1iRbr 9Z6L06ID1j54NyirzQBaHUuHGtP/Wv9dpxdRZzapK1PhEnW9loKkErok9Pdnf1FNQzJA21iC1 xtjFFbkzECThiTD0t7cfRRZooKTQH4avX+czy5xOZh4WBmjkUnS2FCJJrRMM21Wxjom0jzfeN G6y7nT/h3FMUkdrzrqK1PQk10plIf4/pPZNL60rFK+TzudTbvVEShWrXeWS/XdyWq3sPpcNb4 N6ysgOVhzG1axvRBAg5k8CydnXET3wfuhCoxI+BeYVL70bB+vXEm+gUOr4d2g+sMoaFACI7gd nXsVKaZ/5LQGsq8HKlp0Ac8CJlMa2Dqxxw/kIw14m36Bve0Sf7Pt4Mi7uaTitxMAh4denlMV+ xVmhgAB07mcsF/Vn4usTxE2xNGIQHY7WdxwQzOblBnKFxznPj9yqn7bqgWWFp7pTMO47KyEvA BZ7u1N18WavA4NoRXG2nYeKKhZvLy8K4rcag1cyPZKaksbMd0s12/fAs2XtMNC39AxZUo+3zZ dGHoHIuCRkuQVznkb9AjKi9BHvR+/IUFoMlAYLag8XbPT1mDDEMgFT9O6TWHHxGatElLQwNjF W42ibWcBXb4Gwr9qmdKlw+k+UZo97cneqcAIiBGIdNcmNIGVJKSZacAENIOQ81Ck5/MCPdl42 XnKfv1j6IIM9+6DMeTSJlgIywiLdbhsdsdb76o5Il8+oP2GotyM4GvnQMtYGsYGeG1ugSr1pD UznuViuiuVb5V8= 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-json): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 976e4cf9ae..ea5a5a5156 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -494,3 +494,24 @@ (define-public tree-sitter-javascript "This package provides Javascript and JSX grammars for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-json + (package (inherit tree-sitter-c) + (name "tree-sitter-json") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-json") + (synopsis "Tree-sitter JSON grammar") + (description + "This package provides a JSON grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37317 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 E651927BBEA; Fri, 18 Feb 2022 14:43:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B66F527BBE9 for ; Fri, 18 Feb 2022 14:43:11 +0000 (GMT) Received: from localhost ([::1]:60694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4TW-0007Qr-Tj for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:43:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005aq-02 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RX-0005Ta-LH for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RX-0008Vu-JG for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 18/31] gnu: Add tree-sitter-julia. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:07 +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.164519524232546 (code B ref 49946); Fri, 18 Feb 2022 14:41:07 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:42 +0000 Received: from localhost ([127.0.0.1]:53802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R8-0008Sl-BF for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:42 -0500 Received: from mout.gmx.net ([212.227.17.21]:59195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QX-0008Nt-Ck for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195199; bh=fxyWEIVFPYU+j70gfgw7PfCR0WsN8YaTl+5OAZlgjkQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=la3orWir8ku8Dc1yIywaK0QU6Hpvb6SlVOJOootl1ny6kofRdT2EWVQdv+POk/Bgz zPVK9W5bzD7xj5yAy1b83MYxi5/7v90N6JiDQRCGEwkkoJWlFuZk18d/z+FvSSkO/g ZaI05XAeZZCTfwiERq0Spxdbk7XcMct+g4E56vSs= 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 1M3UV8-1nKWC51KNe-000YSN; Fri, 18 Feb 2022 15:39:59 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:35 +0000 Message-Id: <20220218143948.28989-18-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:yi0zkPcTWTZ0teTW12Rrv75AhnFSMKYvMjxpOTilegNgbmqYWnd FHE5bLh/W75cifPgmJnkpouP4XI/RQ/2AI3616KdmbwFriPeUIuNm0JylnyVxEAE06/CZ+k zk6yGZjrPczxq8RU1QUKgeUMN9r0Mi9OcohYTRFOubPtkobv51RFVek7QmmVRqj4efKamc8 L72EAho+C3bS11yTLaCnQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:nqsVUfVVnnw=:hzHwKoJCszJ4E8P5YsHVff v99ZHJc/Up+/dSPCBlqm55bJD8O0w03iBbI0s9HgeluO/DeI0yt//729kNl5v9Upd69sck1gs pdwzQbSPXAXIRblQhOR3WhvN7mvdq5RQt06ndZwJKLFHXqRTpliDU6wNJ8vBdf4WZkubH6TYi KA/bppffpR8fuBypNBXtcmluEmFATX7+mZ3TgtwCJ5rt4g0gTw8l1oERHg36nfmBRx9k3sjRF Tmlr/mUzvPH7Xinu99JGegNNKz4AFkmspIezHc/lwQW7Ic9pdi2O8ynL7x71lWDuxAMWKRWaY o8ZwM+hR0ySwNx+mC2Jtu6lMtZ3v0C276Ksa7ImsEI/hr9gi5jW7QDNuWeoWZK5gViZ21TJMM /BHVB0cJXJ1+bjNPjUDw+9HgiTD/HeY1A8Vg2MH5/89zPgF5fjqpO8JoVJAKTGYuXoiypC33C /6cn0O5gKjBPV7zhtN5W3MB846npBiZVYIEzlVtfe/z70Yd+tr+KURyFkXyctIM+xef8Izyvs pW2TUbn6PWbTJAYW0agkRhpB6jzMJgJANZrHCy3jOSjel+AGhE6+Md4r52PAr1CUub0lv4N7i CdQzsdTWSspMQWvehLqJh8YP4iiyw/tVwC/mXc+zP6mf6eYxB9k1I2bJan0/A5Sd01T3eoXrL R/68Dbza0lKKggvxPrqPHu0+QtO4LlhZTTKaSau8PEKOjaELJ+SHHgbmMaI3EpIcYTSZzThlW vFmz46jtHqEbpoC0f98kQfhkGmZMQCOjS8cQ2QGuSqodDKIfVuD/EX2QFY98B16rN2F5BZD2P ZFA7rJA5xCbXjztZuc/IGxDUi3W+c0XWvofugEvLj57ywKvp71hQ1JnJOqtmsLM65C61fW/d3 /jlhCD8U3zJVLXVuLVD9ZKfBS4jSZLm979ceiRd0E6BQfryJ5TH0TNlBqJHX7CXiZXkEQnIWy GTTakBI027cUwKtOMlEYZDpeSp4uwspT0jja+RdkZSdNi1I3aWkhqUe0kcKIxU3J/TSJM91BC iohqtj1gCqKG1dJK9yUhuPCn3PFCd4sqOAFPI+kKe8LzFon1j67lfbV/m8HaIPAUvYFUWfJQi j6Qaw8CPWcbf2U= 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-julia): New variable. --- gnu/packages/tree-sitter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index ea5a5a5156..081ec8caa0 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -515,3 +515,24 @@ (define-public tree-sitter-json (description "This package provides a JSON grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-julia + (package (inherit tree-sitter-c) + (name "tree-sitter-julia") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-julia") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (home-page "https://github.com/tree-sitter/tree-sitter-julia") + (synopsis "Tree-sitter Julia grammar") + (description + "This package provides a Julia grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37320 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 CA6BB27BBEA; Fri, 18 Feb 2022 14:43:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 96CF927BBE9 for ; Fri, 18 Feb 2022 14:43:38 +0000 (GMT) Received: from localhost ([::1]:33322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Tx-00081T-Mt for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:43:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005dr-Ns for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005Tt-Dg for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RY-0008W9-C6 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 20/31] gnu: Add tree-sitter-php. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:08 +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.164519524332560 (code B ref 49946); Fri, 18 Feb 2022 14:41:08 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000 Received: from localhost ([127.0.0.1]:53806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R8-0008T0-VZ for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500 Received: from mout.gmx.net ([212.227.17.20]:51233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QX-0008O0-Py for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195200; bh=eOSEF1aqo81mbSHLldmurqTzWHacdSxUo9buWxcAAig=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gEp2X0QjOhrXrgAd81SsLycHZuCdXqCzEutBfivBgZcA9tmAoMvjToH4UfIKfDwQU pXh9eOb8aiDFq+LOYOHGZGdKAJ4Qwik76bsMYfBDvjmZ1cgZPmC5pk+meak1Oyn4Vp KYy7DS1ZsExpbu6IViePlKZjzKg5FbaBPrWBW+/I= 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 1M9Fnj-1nNYSW3h6F-006LDe; Fri, 18 Feb 2022 15:40:00 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:37 +0000 Message-Id: <20220218143948.28989-20-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:wVROAKxSS7YTskVtXfry721Q1DOE0Qt9+rMOgUXP35hEslRDw2h flcccc5qbFbRreqWcYqXy2o9PKaPv9d6lrx2DdkMFcYGsfy66rNCF4/6mgihWdMa/H1SLG1 qvZ7WCFeP2YfTaygQcE1hz6CspdKhBa2oryKf09j49APBq1ZtwFU88xCjYvoXWi/Rr2KNi9 /jH7LL2Te/IDlSnkmQNZQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:kmeoWLcrFvM=:cmOSRmtUtz9Ya9lxrQmuwy 80GgPppOUaxD2Q7zSIAm9HCnc7/RCYHXE8C2fY86Q763hZfK92o7HDuoDzWBkFkcBlr8nfcja QpL2llBgOfMb8xXGgluT2OD3INOomRoRuakA8BHDNXiiOkgb5Ry8Pket3MFGcQyR2qMY8YLvj KcwUoqa6mBkao0CIT7JefPh7Be/LwuPs6CogzJFfsWJumMpVm1mfREjtQtRBWft16Lu8qdXW0 iRj/VnqHD5b4QinaJ6ZXDgVCyDMQtJ+yGINKOEwXiQ+H46ajXCd2G0w+1fcjgt+QJ5Hv21QiH uT0clSqLO6PadrOOe4jwRJQaLZWSkVvj0xXTYScZgc5nMrbo8sTDvvCeECAIuQxfJr769lvU/ G7+Y6qyqSSJnP3fF4z6pndLI7IxbjfpQkqgCnNCMKYyJA/c59wu6Md1qsSy700hr0ms6yqe1n oNJ1o8LQ2gnBgCU1PATMWuEfOTscMJs+lF4iXUi1oL381uXPMlq7pqiZxRzLGzxnJCNSZ/Zoj id0xC+j6UsrEsfOvcJdV6hX6rC2zR5WqtdWkW9P8F2hwYMuB3XrSFkAFllMyse9/5S/yWoAHY QTkpE7mCQ/gypgCRzda0BTP8O6JhemqM45uOCBKmerwleKpeG31M1c8uOmngCcd5fqk7Xtfcb 5JA0mUDSQK8wd9KBzN/GD8apBIs6O6OL09o5mmN7aEE+m0RsG40roUWq1toXGWyic3KEeYVWz /PU5iZgxitasQ8Ktq9lSwnXIbtLQWdZlVf8379ZjMIVR8TB6TbUyh8SM84ab1ntFM48H+wxa4 POSu/Q1FTPGbSDPvj8xxo3XbYZ9Rte0cr7KkaepdesLJzXNFFvptucWPqyJV796B+bNmDFb2W 2SWqptIgM7DEIxn/8Xr4Yu5T96rHT/0erU430LU2jMG11rkqNVirIBLtCjc0Z8Ea9AuY//zwF /4HjaKGRlXvPffwzpVW+FrC7YF1UIPXWbFdpEA80sxsUuhdYLlYE0q7Jk+FqALLl3Az9ti5ip YHk4fv/Thzo1rJ0YdRgAqFex0k9jrMUyVdRQpWg5H22WheM77nssqR1F2BsshammIY7DrFgGN bsStznOWya2UoI= 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-php): New variable. --- gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 904697154d..e64e248215 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -613,3 +613,41 @@ (define-public tree-sitter-ocaml (description "This package provides a OCaml grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-php + (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab") + (revision "1")) + (package (inherit tree-sitter-c) + (name "tree-sitter-php") + (version (git-version "0.19.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-php") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter") + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + (replace 'delete-dependencies + (lambda _ + (delete-dependencies '("tree-sitter-cli" + "nan" + "shelljs")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-php") + (synopsis "Tree-sitter PHP grammar") + (description + "This package provides a PHP grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Feb 18 14:39:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37335 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 01D9327BBEA; Fri, 18 Feb 2022 14:49:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDA2827BBE9 for ; Fri, 18 Feb 2022 14:49:47 +0000 (GMT) Received: from localhost ([::1]:41776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Zu-0005aC-To for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:49:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RZ-0005fB-5r for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RY-0005U0-Qo for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RY-0008WG-PE for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 21/31] gnu: Add tree-sitter-python. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:08 +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.164519524332568 (code B ref 49946); Fri, 18 Feb 2022 14:41:08 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:43 +0000 Received: from localhost ([127.0.0.1]:53808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R9-0008T7-9t for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500 Received: from mout.gmx.net ([212.227.17.22]:50687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QY-0008O3-JI for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195200; bh=HQE6RfKRkML5WrNo2X1EFl6xFkux7yBjGX4uVG8jOxM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=je/Vq0uqmmswpNaBmK0bp30TJ3YhLuLOr9CnoLKyo8ldxIziHluE//O2YedCEb0ot z59ZmDyq2dETHNKXnjKajs+ARek2BOqfEWi6L5j6Eq5DHcPK6iju5dndINJa1KuQqU YFKlc36DSi9SrBxHEKqMXnH2UrIsbIzCZ31RmhUY= 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-1nsTR82xyY-00b015; Fri, 18 Feb 2022 15:40:00 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:38 +0000 Message-Id: <20220218143948.28989-21-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:kb38W1NsIJsIhnJBfPRe3ad8c/1Ro06mLIgPxgV/JU8TyNViWmz GyTLb8JxfIDlbXqwjhGmHpQGnbeWR5ImuGsyk2sGvi+W0Mif0pODFVWKw5yFS4Ohz/Na8j0 r903cOxOHp1eo7jU1+sZPonpB7vUxoJYHst0PULv/0XAAAQJzargfDuYS0F+J61e/S+F7Lc FkO7pjWJcbtCFhrNre3sQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:jwu81+EXegA=:K0HajytcYvmWXR4tlejv4L 2R3y8bSlPQ+f4SnIoz8D+j1X3ziUiIUCIt6jStrzoRk3DXjubb2nBBAZxG957xrpeA4ad9H+D 8CU/ET0L+gSjxHTqzrUz/5zmxgD9CVKZwKu0/xd7RvsCgg2lCaEKhAmadVpyGcnpbWv/9GoWp JaBu7Y0qfpyL42I/SnEASi4aoGKuryyooMMb1z8C0arDthFGxG0vL+xW9mF2ouqZnvZiwCR4u l8WpF1Jlapi8ePa1V+W/rIDzh55MJTeotrI5fq9g7IrLl+b15lPbEwNMXvzbM5n6jEkHIDawv EA+UbqEWVFtmMVcCUWuAQRao3ep4z7/K8KH3pLwKBtaJf+dEbmEHhX8MZ+GvQCN7uvyRpL+kf M1B/8Uabkxn+k1Hfz7JQOKGiDvV2w0MaIfGshAwiS5oceGaMwQxpeVML0IuK1YgvYIqB/RIOM 0w5qNQ0xWjCX4IYIvztprqJKpHDMt7XuiuOaIGD9xIJOi3X5+CIwPS+0MbwccCH29YNG159M4 3T7IAKa8j6dEYTv5z0ahOyIOVK7SbMdf3Sevahv+Wpo0SWkrkvymxzpsghD9n+3EBgC0XkJrn QkFPpUbSZFZBDavuaY+NqIj/N8PViIQ+Kce63ER0gqcG9rpnU98IuLovVHKKNTRBfIiMpLTDS d5FVyrE1QZuOkOVGl7LGJCuoc0zzCi4763bG6xEVahi4sAGfki3INylS0MsdrOadm2xN0MAjp cov8lidiWUr6ZN/puht5tEsSD6QaQ0LgHAAoP9NQlbB+4cwpmpoUwcL2c8KRrOkRWO+7nSN+Z 1ItKZn0XZ4ZbZnQTJRNWjdmBF3/M7AbcKeeaHjS6V3JYhNGbcy8Hvk7GJY82AhhVVlLXzYy0S xAf9nnHFIDlKtXbk6YzJGx2DX+3mH6pPN1deXx9DZpUFKk/LZREaxk5/Zj1kTGmWxieknHM/P PARHVaM5oWpqTTy2/0aPhxHirdLpEPbx2ZpEmkGhKr0H7yaFfzgaj0zO1G3JvyJcRh7NNRZ9H 4PrUmmk+brLgo2IVYyDaWjiKtdgBuxY4L1tAU5KhIPxZPBtb7kXywUvVrU9ccWcz7ihlIwPuX sUstS3n2Fqhg9o= 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e64e248215..cecce9af50 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -651,3 +651,26 @@ (define-public tree-sitter-php (description "This package provides a PHP grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-python + (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42") + (revision "1")) + (package (inherit tree-sitter-c) + (name "tree-sitter-python") + (version (git-version "0.19.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-python") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wrfpg84mc3pzcrdi6n5fqwijkqr1nj5sqfnayb502krvqpjilal")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (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 Fri Feb 18 14:39:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37319 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 272F927BBEA; Fri, 18 Feb 2022 14:43:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E7BAD27BBE9 for ; Fri, 18 Feb 2022 14:43:37 +0000 (GMT) Received: from localhost ([::1]:33374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Tx-00083P-2j for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:43:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RZ-0005gQ-Iu for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RZ-0005U6-6s for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RZ-0008WN-67 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 22/31] gnu: Add tree-sitter-ruby. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.164519524432575 (code B ref 49946); Fri, 18 Feb 2022 14:41:09 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000 Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4R9-0008TE-L3 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:43 -0500 Received: from mout.gmx.net ([212.227.17.20]:46809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QY-0008OG-TW for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195201; bh=dBBgBvkWthiEN6iNvJpZXCK216Xa+ZU2nTsDnV6s6Vg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eGQVps0OiTdKrixrcB4QZ8k6xG1qgRGimTzDBGsEyXvvSlJCtyOohf9mmv2+cI8kg iCyAVJRf2QxUShpy5UoObfxcIRTTGqm6uSbVOgRR0WlfyGyiIrONsxsHZR/weFPud6 qLW1ilBLu1DxExOzMMTzaEmySv7Te0g8KqjPNE0A= 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 1M9o21-1nO6hY01bR-005nzc; Fri, 18 Feb 2022 15:40:01 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:39 +0000 Message-Id: <20220218143948.28989-22-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:bacu7K91GMa64ktG5DX5ubN/5f3/5ztN0wmc4nozDAmbt8X1dlN JFvvg505TsdEuN88NPbcyoUCzNUfMzRZght2D3Z/yp5m2TdICEneqIvQh3gsP4DYrw8oklP whdy3JTicYg+b4qLjcbLe3/MX9Ra1DhNU8+tg85J4GWBMOojLCXM6Z8EcYOpBBWnMNN+tkQ UE0TWqwyzS41geQj5Lslg== X-UI-Out-Filterresults: notjunk:1;V03:K0:7/1fb7e0mLY=:6PScilyz+NQLc85547jGkf unewJ9fyU/bUDzyb8bX0wNCIJMF898DznBwqYLoJLjqUnD3nbMA3/FHyH08BUqEdo5RrWklzk A+NRInNSlGte8N8c4mnnTShmMxO93+vCUk8raSGagQV1cJ5NAp09F+aZZGx1WSp65Tn9cB5kO UHybC/MJhcMgTOp7yt20gt5Z1wlFB6T3beFI61UFO9EEGeTJStz7nm5dZtCgvF/V4TaWHZ4nn EgqlfH/Q//A3HJlxZzoVX17YG50jL0NQ+aYrjHlSExhDJIWHkDtmEbEYP2W7rGujeRVop+n9t eFflr0yeG/ol+k3bZrWkyY8y7NbE1O02Bv5BApJGIpb0n9YK/PxbBpcEskhWD/dMew2TqREVh mdQwgny0kQdcyq81Eo11WE45BIggfYOfU5wmTx6WINjc7zH45y1fe/paUi97SWku+bfuaNW9I drO8QHtn9J0wzTvWsk6nEpQwnauckPYYI+Dq48bA1wE/y/DjArQmXya6ae7PM3EcWl/Wr1kB8 YTUilFmXgi0Lvsh54hrkKinBcD7EWPN13KDF20hfPFFltNa7kE525ifMWT1RhnK4CUEVRV66d VzZUssdXfN8iyj+XZTHokoOJkZatl2b7fzaLrmb60bLS9z5xbrHGjNvOnwD2dEWHUYNRx+7Tp SdSZnQZSfM3qxQ9raZDtk+ktVgMTLwv7K6Se8+dE7Cb5STWbQ1rWySvnHQb/13tooO1ml46R8 KW2a7B/DNiKJaw/gKALYEQVBiDSEixK1K2znBTBs1taYfHO7DcThTgIULN9sJ2r1lDVuzEXrv f05Tb2X72fWzTrp7d/OmaMMxbjHxyKJlQUAZzgBCmGAiK1Imi6m4GNE8ehVTa2OITP6f64nmR sk9fPOwO8wsB5zr5nIgmiY8gfZ3PSTCr6mBdeqNCI67z64KXQiS7z3hcmV1lTy2WVQakzDOkO ruIaY31HShJqMujHJx4fH0sS7GAKpw5x6yK7IDT9XojOI35JzC+LQWTvTGVkj+Uwg+5vAOGmb iKABmpkBcclPE6v9N0wHMavFmsPtzU4qXVWV3SOWh3UzGzAGHbTJtRWYtXErsX6c4V4cWuqJ6 rDakEjMsFm2w8w= 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-ruby): New variable. --- gnu/packages/tree-sitter.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index cecce9af50..6fc9a0c91a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -674,3 +674,35 @@ (define-public tree-sitter-python (description "This package provides a Python grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-ruby + (package (inherit tree-sitter-c) + (name "tree-sitter-ruby") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-ruby") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + (replace 'delete-dependencies + (lambda _ + (delete-dependencies '("tree-sitter-cli" + "nan" + "node-gyp" + "prebuild" + "prebuild-install")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-ruby") + (synopsis "Tree-sitter Ruby grammar") + (description + "This package provides a Ruby grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Feb 18 14:39:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37336 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 D46B727BBEA; Fri, 18 Feb 2022 14:49:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A1E1627BBE9 for ; Fri, 18 Feb 2022 14:49:58 +0000 (GMT) Received: from localhost ([::1]:42274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4a5-0005vH-Qr for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:49:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4RZ-0005iA-Vk for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4RZ-0005UJ-Kx for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4RZ-0008WV-JO for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 23/31] gnu: Add tree-sitter-rust. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.164519524432582 (code B ref 49946); Fri, 18 Feb 2022 14:41:09 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000 Received: from localhost ([127.0.0.1]:53812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4RA-0008TM-0K for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:44 -0500 Received: from mout.gmx.net ([212.227.17.20]:57007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4QZ-0008OI-6e for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195201; bh=PqHFfoXzwIj9gC6v2bUUnfpIGvrN1B2QtpMAp9GgQBk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=OEKN9hNbzW1F+7STHUUeDmi8k7VlSXL4iDhJZnTvr9oeQn0bb6ix5Jg3+9mZQHXEX Xga30UcZ3BxVRfi4RsDucyBeoMVitnzHqIuPzFxYN5KtwNDqQ5RRq8+l9TS3rWc6k6 nMR7OJSpdWmLGSrxfCbTL5QVVYlOrDO1X5g9427k= 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-1nxRWH1HHw-00erd3; Fri, 18 Feb 2022 15:40:01 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:40 +0000 Message-Id: <20220218143948.28989-23-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:31dLGtFUaBz8QV23qB6s8XsijKzrGYx3HSpKVYFsvnFBHI3Soeg XHi7sNxu0F4SqlObreQz2nrWg/XF+G3I6PY3eC4i8iW1rBQGwA8KLeoolR/8vscHqT/F+E0 ZXP0qImkNrw287hXZOjTvQ4GoW7fsxaP7aHIoSZv9QBELzrGzA18xA+290IVy+MyDlxhA1f e9oHUAMch8u6W3F9WTPSw== X-UI-Out-Filterresults: notjunk:1;V03:K0:S4wp09nEGPY=:/5o1cSuU9Y/PhuQAaMTmhN YVEPPpqmkEQRQOXe/ebcdqKjFVfWkNdhDTLiu9B3ieZgbalygkZAwr4AQget+IlPkmlAvH5ix K0oxrKGu2Y3m3M0Mx73mcHu2l91BRTx+kHWdNHdqyZAJv3K2Mn3QuSWf8UX44Z2gtyjP2VHcr +UN6AojIU8t4JPBKNlzIGfGunSZlXjADBYdcikW6v5Iv0GfqjN8OxxtVBXF2UGI96MSzf1bLw JvLUGOkiflHVLe8YbpsFKn7Cr2Ev3ivnWBoJNQ14GUqFfcnrW7ABuEZxwvWiBvqQ4t3gd8nDn qnsiohqlMKetYNjxQd4PTN2jeK1fwbDFglTGJGUlBBhSMCDokTpyw2ujmigjNyrPrvfGmSh2O HfULCKhVyMcKuJZWj6/JZsJzq3Uqo4F2o1dc/gII+1dHp0m7nudT0ffpHs++hkt4A68k3HXdd fXZLm/Xf1EPNUoH08/CpZ6qSbC94GtJnImkQPx8ZvKGuGmo+NClMu20nROoVABKZ/FAVRf/nh jcbxVWtDTrQnhXpWrvq8XU+/c3jslDQCqzG0o/LZ3Mt+WD5KOWuhjqQjXNn67vojFrEIRtohd FTKtwXP2+XvwXvAX13ABL292FsQJy5q9y3pA2sQ78IN0yC4Ml89J3bR41bOHmJtc+19W+vsNq Pc16QYZf2KiWhHy2Qk6QBDrBsKaer/KWG8A85yVgyLDpdJ0hs+Ouj0XpQ1572ZaWjFmY7OtG3 CTRepDnAS94OMf/Tu0XxoXhGGgcXIeozWjHLZXT3jeqGhC0WVUiwCcaL84DOJ7hAQJNkX8c4a Monm0+p5kjwYj08N8n5vbNQkVYnb+5fbPWy3Wy2O/JxRt5wEt8cue3bWH66LjilYvTDaLo/c9 J4NaWdfqRlQzk7iKYdZefh/jmyuEhBTfDM5YjfNCkn1vIeRQ9UI/gBw3l/xoODjAOk7W/u1Vh LbnDMo8HZ3FnjlzG79zmRqiEz0mR5SaiYe39+bpM60OwM/c/MmCurkZLhM5kkyIX7w/XtlrEE 7U5SMeYhHq2bIHaf3sRNzsBOt7M8KrUIkHLSuXtvDH1tW7MJGNEG4jBe/0/xUHldXC2nkotTd tEWfrANdZBwVfs= 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.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 6fc9a0c91a..f4df5c5335 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -25,6 +25,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages algebra) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c)) @@ -706,3 +707,27 @@ (define-public tree-sitter-ruby (description "This package provides a Ruby 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.20.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 + "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (native-inputs + (modify-inputs (package-native-inputs tree-sitter-c) + (prepend bc))) + (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 Fri Feb 18 14:39:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37337 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 5E87B27BBEA; Fri, 18 Feb 2022 14:50:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D7DB427BBE9 for ; Fri, 18 Feb 2022 14:50:56 +0000 (GMT) Received: from localhost ([::1]:43936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4b2-00076e-0y for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:50:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0002EY-7v for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WH-0006Q3-UI for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WH-0000EC-Nl for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 24/31] gnu: Add tree-sitter-typescript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46:01 +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.1645195511764 (code B ref 49946); Fri, 18 Feb 2022 14:46:01 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:11 +0000 Received: from localhost ([127.0.0.1]:53848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VS-0000C4-D7 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:11 -0500 Received: from mout.gmx.net ([212.227.17.21]:45019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VQ-0000BR-KB for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195502; bh=7AAmr7vo0scDJJ7QeOojM5YXFaeb+R3sAw08rGkoRaQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DO6f+/NYy3qCWjmCZvpyojqpfCUZHA/CwcSocwuYQTSOqx91ppiBw360XzCxNB7BC H5uTIpdIAWu21Hju85nsRfpbs+ond2i36HajIwNJWfbKssHJPAlbMtPidxc5gtX0x/ BmLtCS8lm0s7DAOkVtKwDAcANPdTe7SUhE4OWkTY= 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 1N49lJ-1oKHpY2XxZ-0107YK; Fri, 18 Feb 2022 15:40:01 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:41 +0000 Message-Id: <20220218143948.28989-24-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:AE9ZCNgbpudma1Q/fqvBbsKQa/+Ze2crH0GmB6bFBi2Wp7l8Kbp rQ/p86n5ruW29A8pxCY38bR+zsT1NFUhYCiExNyw370hkM9Jf3B4RpJWfgCbRQJWENsttq8 YDHpp8aL6tP6OntW0snHEznOz2o04YhcKoN7fpnDLBXCgG+vE15D94JsebreA8xtdPT1tPy DZTzLOQNzepGvTt38MKfw== X-UI-Out-Filterresults: notjunk:1;V03:K0:QEvJ2zak6Vs=:0H+wCd8fCbIIyg8+HIKD0X JP61lwLp951VaFtJ4Q7MYH2dXQK7zd3aIeD+aCzgHqKhHqeOKFE8rl+j4y8LDit5Cx4iWNhL9 mRVlXgmJfJGFIzyyl5QkjgL8VXsIyVx0NCzA4/J/wrreee3ai1Y9edny9rTZVjVp0t7QnIL9Y 6HL0HdgcAFajlRlja3MYV/ttWuc83JLoj4wdcTSGltTk5MNCamgqJWnUldU0umqKRNBYniMr4 //IvBvm+SWb2ngGhQyr/PC9plRb97PCDFWjg1/imCTdPYHt2Vd6LWX5+sJ6WPTMgffSpBlUHT +i/7M1q/XikKoubTGxwboq1Sj7+wtinkNpBDaUnvCwXR+utXNBXSf5bZL+rdi8mOIHMDwPzRj SwmdmL5thyoy9TjQqBaMlpmVUoMpqpK4B/2rLlq91tqzHPazC/O3vJvqEgAcfb5aiPfZNgRsx AKE3nPRDyfO6kb57jfROFxA3x3mAvSF/+Ho5ZCh71k7ZH/yUOerrwp7v4EU/1R2y11L6V7F7D pJdapDTbZMfV+BpR0NZZ8ok/2fWUkONEnmyiaioiQb0zIDIGWASHCnd2cK3zay/bkhcib0RWq /nZqOVVYXP+fMhsAQWZghj+MEAqJvJKwa2STObbT+Ks3RI0UK/pdtGJ0x759PdAJBcgtbl12N J7cUbAgBYCMDrd/Ezgqz7JWqYeuiWcVnnGygVmGFZh7sO/uavdJohdTE8w36uKGGOuaAiNoGN Ter2OCVMd558rKe9fWnq7mbG+15vHC9x0ySAKr4dSm6n2BGE7cEcj9PQsbWmyJHkVupMuUBeO lgnD+hsAz8euUTm9k/gOosBecB0vIknfqIuPooY5CKtu3RnjPwGbxgY/Zur5gSzIK32h+r4Hr IFLbDt/IeG8ySrtiy+Yk6pMgdSJsJlnRpPcxb3p4S6cCd4kpochqjFkKUlGJCzdvm4UAQT2Sz RAtAXzu/zzCNvsY3lMbBIOlFDIOJ3PWNgoyNMgH5p/3NwfxEfB5VK5311eMqD1qOhtKxjR2rk kiApL6RSndhKfZF/IodeUJqjWlKZ/95c52oHpNbS11yuM8fS3VzRH8EwG1O3dVfh4g52+TNK/ f6IfUWqhdp2UNA= 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 | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index f4df5c5335..309b38386d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -731,3 +731,72 @@ (define-public tree-sitter-rust (description "This package provides a Rust grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-typescript + (let ((commit "111b07762e86efab9a918b7c721f720c37e76b0a") + (revision "1")) + (package (inherit tree-sitter-c) + (name "tree-sitter-typescript") + (version (git-version "0.20.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-typescript") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1364bm3wbqqzvp03cvpx1w89bbqynb1v62i46gy7f6rhib9bf63a")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (for-each + (lambda (lang) + (with-directory-excursion lang + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + '("typescript" "tsx")) + #t)))) + (inputs + (list `(,tree-sitter-javascript "js"))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'build + (lambda _ + (for-each (lambda (dir) + (with-directory-excursion dir + (invoke "tree-sitter" "generate" "--no-bindings"))) + '("typescript" "tsx")))) + (replace 'check + (lambda _ + (for-each (lambda (dir) + (with-directory-excursion dir + (invoke "tree-sitter" "test"))) + '("typescript" "tsx")))) + (replace 'install + (lambda _ + (let ((lib (string-append #$output "/lib/tree-sitter/"))) + (mkdir-p lib) + (for-each + (lambda (lang) + (invoke #$(cxx-for-target) + "-shared" + "-fPIC" + "-fno-exceptions" + "-O2" + "-g" + "-o" (string-append lib "/" lang ".so") + "-xc" (string-append lang "/src/scanner.c") + "-xc" (string-append lang "/src/parser.c"))) + '("typescript" "tsx"))))))))) + (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 Fri Feb 18 14:39:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37329 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 481F827BBE9; Fri, 18 Feb 2022 14:48:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E1C427BBEA for ; Fri, 18 Feb 2022 14:47:59 +0000 (GMT) Received: from localhost ([::1]:39278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4YA-0003qC-N9 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:47:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0002FZ-TA for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0006QL-H5 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WI-0000ET-G4 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 25/31] gnu: Add rust-tree-sitter-for-emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46: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.1645195516792 (code B ref 49946); Fri, 18 Feb 2022 14:46:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000 Received: from localhost ([127.0.0.1]:53853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VX-0000Cb-Bu for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:15 -0500 Received: from mout.gmx.net ([212.227.17.22]:49327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VQ-0000BU-LT for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195502; bh=t6GcbpfJsTEUh0uqMEnAVGdtZAU4rJJ3B/CJ7mwhhFE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VaCMCnOaXolgoXKHdua5X7tHxF1iPHpf09DRRD6tCvNYxECRdD0umRUYH/TxCELHo QokVI15m+8qe62ZSOS6yDtaJJvqxzmJNBTmdpQaL4vaGmM2m44Aa0JdeAWIfJZpzma qXZ46pX3482imTnfF3/kveIyBmtThOcSH+0ur00M= 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 1MMGNC-1nb56t3nJ0-00JKfr; Fri, 18 Feb 2022 15:40:02 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:42 +0000 Message-Id: <20220218143948.28989-25-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:jDwuDTG87g1DDlihetmQfsiJxQo35NxMz38bvSlH3jEymD54i3B 6U1mrkDESvSKzatNJIkSYDqdp9+8lmpaYgAyVnv3tU6g/KpCrlEDb1e3feVuAsMv17wjMgM qlpcTlr7d8Qnz3FnkcbXYuHriYtjUUB0KtOI/4mRPre62wC6vBKLzKGau/0EagHay7gAICX UENrC2lq1JqAKKmM+8Miw== X-UI-Out-Filterresults: notjunk:1;V03:K0:jZSA774ahfs=:kUirvADLJ3ahqm8aUG0ylu 85o53qlnUqxmaSK7jJFRmHrbmzvygABa105tYeRym4Zbwpzz7Tqpte36E2wFRJX98+87rMtgz NMJzeYnDOqJBGHcc6Oy+GbD7m++seQHBPgZQj5otOtlX8NCPuxvGKmwdN61cFblgeGivqZiAr xcyxr0F3KW7wxFp6b7RWPzEz4H9EPCX+u46/taDdiwKkigbVM6WNNzqCjzE1HArNUvTLgRk4r AQvcAytCL6QPHNG9XWW9INaJcMutJMV8texw300c0sRbHvUgjZn3ZsZoq2mgEO4lj2chAlpW6 WvqYjmjIxOHOrLxrSyGSHxForQm2tfXZHc+vfodqRJH8ygObhLO77V1oJ0NPKH8Ok/oOqteLT 4VDjagDQPD+lrtBjpKpW6vNJK89pAljwCnxZ8NOpUX8HkUJrJX0/aIYXiibxekY5lDbQfwEPh /yMLQR3wE1e6iIXPLrAQ2o18KeojX30UcouZprFsYbMRFA7I2yUGvsd3vAdC4bnVeEgLvfL00 3FSYvrJWdu5wH1Y1TtBdSaXCO2oyxFQsNcdGI5GRg21tTt241l4QH0nDuBuMbDwD2dHRyEYEy 4B1BHM9jZdXsj/D0J3tGlqFp+E6lbXq748/HK63dN0aw6Xss2GMbT10s/QhOI1COEkmXA9gMp kKWKHYSQZuCfqrvOeWT/2Nw8C2AkNsprtcBaO2+YtGc6LZlOd6HAIK8Z//AlvhDY0FB+Vaw1/ jKqy+1cUaCufN7G7D96ZmEdpZtDHv4Gxxyp24GRNR95LJAS9hFMsK71e+xYjjkyfwzguh0bmP 70D0ScEWppahuIIdHX0bXPBEeKFiaSx0l1J7axkK21QYVe02inma8AnKNHebpD84n0Z3dvPN4 N2Fl93CaH1PU7oUjWDnfu91nAcUpIPg/6dub3FRRwYaVPoJp6MUZLirSV388kPBVi17quuNzK S/SMub3jxthop92zVd2X6C3vWJrJapBim2U4/iqCvPrBZrWN8CkePYdQ41CDhZzddRjdjU3mz 3fgj2qnpQfUUpOzGRc4QVkA99Z5NQDlTa8Rz66G2asiOcx70D0DtWnMmiuYBv5rWAVVBSPaCp SnMysmARExQQ7I= 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-for-emacs): New variable. * gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../rust-tree-sitter-text-provider-fix.patch | 98 +++++++++++++++++++ gnu/packages/tree-sitter.scm | 45 +++++++++ 3 files changed, 144 insertions(+) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch -- 2.34.0 diff --git a/gnu/local.mk b/gnu/local.mk index 97ab160c3c..0c113956d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1775,6 +1775,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-shell2batch-lint-fix.patch \ + %D%/packages/patches/rust-tree-sitter-text-provider-fix.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ diff --git a/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch new file mode 100644 index 0000000000..beda2d8391 --- /dev/null +++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch @@ -0,0 +1,98 @@ +From 475b822f47bdc58d832533448b6f6d9818554f37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tu=E1=BA=A5n-Anh=20Nguy=E1=BB=85n?= +Date: Sun, 25 Jul 2021 13:11:52 +0700 +Subject: [PATCH] Allow TextProvider's iterators to generate owned text + +--- + binding_rust/lib.rs | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs +index 068a60285..79c3991ed 100644 +--- a/binding_rust/lib.rs ++++ b/binding_rust/lib.rs +@@ -8,6 +8,7 @@ pub mod allocations; + use std::os::unix::io::AsRawFd; + + use std::{ ++ borrow::Cow, + char, error, + ffi::CStr, + fmt, hash, iter, +@@ -162,7 +163,8 @@ pub struct QueryCaptures<'a, 'tree: 'a, T: TextProvider<'a>> { + } + + pub trait TextProvider<'a> { +- type I: Iterator + 'a; ++ type I: Iterator>; ++ + fn text(&mut self, node: Node) -> Self::I; + } + +@@ -1799,19 +1801,19 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> { + buffer2: &mut Vec, + text_provider: &mut impl TextProvider<'a>, + ) -> bool { +- fn get_text<'a, 'b: 'a, I: Iterator>( ++ fn get_text<'a, 'b: 'a, I: Iterator>>( + buffer: &'a mut Vec, + mut chunks: I, +- ) -> &'a [u8] { +- let first_chunk = chunks.next().unwrap_or(&[]); ++ ) -> Cow<'a, [u8]> { ++ let first_chunk = chunks.next().unwrap_or(Cow::Owned(vec![0u8; 0])); + if let Some(next_chunk) = chunks.next() { + buffer.clear(); +- buffer.extend_from_slice(first_chunk); +- buffer.extend_from_slice(next_chunk); ++ buffer.extend_from_slice(&first_chunk); ++ buffer.extend_from_slice(&next_chunk); + for chunk in chunks { +- buffer.extend_from_slice(chunk); ++ buffer.extend_from_slice(&chunk); + } +- buffer.as_slice() ++ Cow::Borrowed(buffer.as_slice()) + } else { + first_chunk + } +@@ -1835,7 +1837,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> { + TextPredicate::CaptureMatchString(i, r, is_positive) => { + let node = self.nodes_for_capture_index(*i).next().unwrap(); + let text = get_text(buffer1, text_provider.text(node)); +- r.is_match(text) == *is_positive ++ r.is_match(&text) == *is_positive + } + }) + } +@@ -1946,23 +1948,24 @@ impl<'cursor, 'tree> fmt::Debug for QueryMatch<'cursor, 'tree> { + } + } + +-impl<'a, F, I> TextProvider<'a> for F ++impl<'a, F, I, T> TextProvider<'a> for F + where + F: FnMut(Node) -> I, +- I: Iterator + 'a, ++ T: Into>, ++ I: Iterator, + { +- type I = I; ++ type I = iter::Map Cow<'a, [u8]>>; + + fn text(&mut self, node: Node) -> Self::I { +- (self)(node) ++ (self)(node).map(T::into) + } + } + + impl<'a> TextProvider<'a> for &'a [u8] { +- type I = iter::Once<&'a [u8]>; ++ type I = iter::Once>; + + fn text(&mut self, node: Node) -> Self::I { +- iter::once(&self[node.byte_range()]) ++ iter::once(Cow::Borrowed(&self[node.byte_range()])) + } + } + diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 309b38386d..3c8b4588c4 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -22,9 +22,11 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix build-system node) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) @@ -150,6 +152,49 @@ (define-public tree-sitter-cli This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) +;; We need to apply a patch in order to compile the rust bindings against the +;; emacs tree-sitter module. +;; See https://github.com/tree-sitter/tree-sitter/pull/1294 +(define-public rust-tree-sitter-for-emacs + (package + (name "rust-tree-sitter") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tree-sitter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yg4p54hsfsxxknjq492i8b4rvibzpl2zdvr2bwvwakqgah05v33")) + (patches (search-patches "rust-tree-sitter-text-provider-fix.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Force + (delete-file-recursively "src") + (delete-file "binding_rust/build.rs") + (with-output-to-file "binding_rust/build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=tree-sitter\");~@ + }~%"))) + #f)))) + (build-system cargo-build-system) + (inputs (list tree-sitter)) + (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 tree-sitter-delete-generated-files '(begin (delete-file "binding.gyp") From patchwork Fri Feb 18 14:39:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37327 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 5B3C727BBEA; Fri, 18 Feb 2022 14:47:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0138F27BBE9 for ; Fri, 18 Feb 2022 14:47:24 +0000 (GMT) Received: from localhost ([::1]:38482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Xb-0003HL-41 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:47:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0002Ek-EE for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0006Q9-4I for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WI-0000EL-3n for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 26/31] gnu: rust-emacs-module: Update to 0.18. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46: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.1645195515785 (code B ref 49946); Fri, 18 Feb 2022 14:46:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:15 +0000 Received: from localhost ([127.0.0.1]:53851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VX-0000CX-31 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:15 -0500 Received: from mout.gmx.net ([212.227.17.22]:49467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VQ-0000BV-LS for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195502; bh=vdPZJI9kZoVgEVxJNUixQWXLVKjE7gGyNAHsrmWO1bU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=S9Hl/7ZV56womSOOEUZTjgd5+47tvWeOIg7M409AzzJWCFSyTSrK91rVJTQD0PpiL zOh0lWgj1atct/wyJcRsZIDq3E1NT9NNi6pfnjS4/zw0iRD2PPBU+b4eOlq9IXXhsn nWJM1cCMm2UQOfIpK0rF9hyxkGRhlRyT43CZcj1k= 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 1MtwUm-1o8U7a0sOa-00uJ3B; Fri, 18 Feb 2022 15:40:02 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:43 +0000 Message-Id: <20220218143948.28989-26-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:l4617jFVMJSCWrybiFXK2Z+poNepJwzirJAsBcqsOmqrs+DFwvv B+U6ZVZLVuXg//7RXOpnvIaREwnb8E2q6u0QwjpTuaDB6UPX+t7wqrWakf1lDBw+hCHxwG2 7j+OQAmy7/kDY0s0KB+lGMaQAx8BM3g3Hkwtl2OdTPVcO3BEs00sbS0xeXFOFb6gnGDFD4w RbgceJ0bOVbqYCI8w9GuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:IJjg7y4iohA=:d+EJQjm7B9rjZhBZtOgd8B UOfBtA7Eeq1H8pPcVF0fAK2jPFT87TNRpbXn2wa+CR/BspGFw79FqDHN8wnfn7nUj57riOj8/ SQYcGg1eZQVhOpI3aofOEoDoF8aAFcvCgeq0aisLsqDRS+4K1po4GywZregn9SURl9SQ4m2Fs KpeVeiCXatqfsKj1NguswsH8Rb65FdSlzQyNctaujElAmuUlFK29yAWqPd3XP3yRyOmLsJZuY FgPEZwan+9Zl7KzZ7Qa1a9qPWV4OtX4q7aZ1xdEhJm/aYz8uEGobexRmRroyB1ZIBIdbmi7S7 wwTX1QaToD0csuvDj15kio6fL7g9BUhusRSl/tCMr4frs0liIGN9U33zB1keMt6WET+gu5aYp rM4h+3n+oBlqev4cLjnKy/qOjNF3nuBgzj6iHTbH7CHbesmbxJZW5CjHkTmPvCFyS0pPQw8tr SBUYH+pZIeLe4hRfUKIWm4hTH7qX/hyponShrYA1/pbvZZKr3bKfSG73BF2+g4Y1d+gaffiE0 grZ9XSiI7GrHOjJ9oP2hIK//gh+V2npSC+MkLwsjtiD14QsD5xCu2j46oc2nu/Al9Xi7+H0sK srYU8Y+VFXpUcDQSJeoCx5tQ/AJ39mFqv3PdMlIbKU3VLg6yceWW8Fm8PAbMEiHRXViM6kn82 /Vo3n9h/gQDq54/YijnY6ql8VOXcWAB/ZGU4XvwSFp93qBWLzCPCwQtK+ayYrfZ8oAOEMuuJw jFoWDBsxQmdSa3LxOoApalRSzubQfFxGFo1/D5Xurzx/f0OpPWYoh8EZTPLN1FcBtX8n3ynMG bKDa55xeXlGJ3AtR1mlqKTgLJVKU1TMWy48ot4Nz2Z/eC/DWrzEY5IDIYYwKocYEQmu8d8QnN 3sZp8GDzUtJwbwxlwj9pQjF1+X/aBgbONNlTIIW4NL75qSiDsFJMOiz6Rv0J0CKwBoaQI/yoU ayL54J9uAOqegLoX2seDH32qOp7g55SJ6osips2m382dfPQ22KQyyCxS2+eH5uIuOon+H00un f6rpk7p5yYQ7Urs+4CacHVFi7kHc07mPYVWOBJYokF2pKxuhtudKxh6/GLxvgbebtyDFqFac8 tSzxOb+0S8x/5I= 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.18): New variable. (rust-emacs-module-0.10): Inherit from rust-emacs-module-0.18. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) -- 2.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4bd79607c..23444f1e7b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19100,10 +19100,10 @@ (define-public rust-emacs-macros-0.11 (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.18 (package (name "rust-emacs-module") - (version "0.10.0") + (version "0.18.0") (source (origin (method url-fetch) @@ -19112,11 +19112,11 @@ (define-public rust-emacs-module-0.10 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gf9lz735xbkyir53dyv362drfx3nin5an5cx39kd8q8kjjwix5g")))) + "1ypjyyv2ca3vza4sia91ckxamgfk63yd8frkvg3d4ph4fk4pn1mk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.48)))) + (("rust-bindgen" ,rust-bindgen-0.59)))) (inputs (list clang)) (home-page "https://github.com/ubolonton/emacs-module-rs") @@ -19125,6 +19125,23 @@ (define-public rust-emacs-module-0.10 Emacs' support for dynamic modules.") (license license:bsd-3))) +(define-public rust-emacs-module-0.10 + (package (inherit rust-emacs-module-0.18) + (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-email-0.0.20 (package (name "rust-email") From patchwork Fri Feb 18 14:39:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37331 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 A4FAF27BBEB; Fri, 18 Feb 2022 14:48:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6D10E27BBE9 for ; Fri, 18 Feb 2022 14:48:25 +0000 (GMT) Received: from localhost ([::1]:39912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4Ya-0004J5-Jc for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:48:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WJ-0002GA-9p for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WI-0006Qc-VL for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WI-0000Eg-Sx for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 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: Fri, 18 Feb 2022 14:46: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.1645195516799 (code B ref 49946); Fri, 18 Feb 2022 14:46:02 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000 Received: from localhost ([127.0.0.1]:53855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VY-0000Cj-0j for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500 Received: from mout.gmx.net ([212.227.17.20]:34767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VQ-0000BW-N1 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195503; bh=uzkXAidjpvKCJHj9kZcg66Nx1ec/MCg8eSSHwvOZEnQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QTdxHDwrVjXYzirJslElrTPPe0xRD/HYrPjrc4kPsTCr6ckJB4ZM2OwBaHryvHHKp bhKb6PhY2p9t21ADIB7stgHUFlg0Qw6lxpy6CDYztpBp2HkoJCJfuRTQZtMOcywuXK sa0fTQyrvr0UVyjJxJpfk/qjxrDib36tXMV7KG7Y= 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 1MSKu0-1njIK2281Q-00ShXh; Fri, 18 Feb 2022 15:40:02 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:44 +0000 Message-Id: <20220218143948.28989-27-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Kvd1JuRnQw7XvzPsh4l7oZ/cE+JYscb4TIm/oD8wyovhG03aNm6 5bYiu60Y7VyOGe2IBNtsKlzORWnEYVc6GpnH3LOWPMEfl3vBEYSlLfJqKXAmlwDxO2S18i1 vmoO6K1R+iYhMOc5atL311g0xHLIp9qrczjeBT2SwSvE7fIweV2RNcJX8wvY7lkL5vLRVCz mQqQEYPhFKUyrpaflGf+A== X-UI-Out-Filterresults: notjunk:1;V03:K0:5PxUbuHl4Pk=:X06MI92MJ7/ClHqNCVeLE6 o5UHukw9FoWpwzdXm7je6AKFzUmToDqByLKQLtY3DAOxo2h+Vo3jAtephOCntmQt1WI0JDihb Z8oEf36GNwELpMSG2SZnNf0Jkg/08GnfueUeP2phOwVtaBZSCbIGj5MKZwHvGTpG/hsjbjCX5 2MUoaY2VKayGc0e6Hh8k/bvyHFBbDFe9F6cInuhEM5ytsKMTVFU+/WtP7mcJ9/xaVxGWhBJFy fuD1n/kfrkx8M4ujtujwRw1yyjNXn7uqSQEd6nR6vtgBFiAhWNFmwU3F/ZYqeuV7Cke+Ap4T1 DLAVRmICPSE5b2SFyjxk60TfFrUCleKMq7dCUfB7SNXWOfOPo/ThyczSWz0YwLlLAz9WJUYF2 N3U1p4XI2WsBkIg5shtL6zLi8mzWKiOaaJY+GpIQ4GODrUdCuf0ReAtlSFbbFz5h8bLdGSfUe Sl78H3XZqU+5mvc1Uh04u0X4EGOx3m91cb3DZUO7kVpC3g0lBKGgDa/OEw2wBljMBkf66ctLg HEgSJZ5vjBhv2LwlICKvz3ZwnylhQ6XjxgDUsMjrJaT14zQ54XqdoOgcNCSE3xJkck4xzXcuO YrGweWo0QziW2QKgnMh8EUmvtSeh4xHIclvFKeTVekylpMDRcUs3C2pZ2GMYisGNqJl2o+uj/ XQd38b5GFhO8x3z9UJ5IkpWzT+JM9ehjMu9JLI9LOEw26gQ8U3T5MF/DzdrNJYtL9gEuh+3xF Lvm6XfLapKj+SoZHsrmi1CD7OJXR9b+vWkp6AcFnSjjZhEfC+8JLWATo6kaDwXCapndxqy1ev PekMT12g9R1hpJiLD1HoiNesNA0oi3G2YaziqLNG2JnAX9mEq3i8VKMTC6+UbInmjSYnRS5at IrMEigwM3dEKnManW3aj61/GbGAscHRKE/hhTpdhv1C6x7AHsKO1jkGiuatXRPj7Vgo0zoe+g VauMHECWuq0hXOgBUP03h/4QjWL1n3dQN1gUoK5NNzuQhk+1rfjWh7ajrzJw3CBYCPMhADKPD ZoFmIPe4sjFbV6okKoJYn5kwQTp/rV2e+pYSi0vS7j1/Dgv9bYNxCT5sbi24+Tg9H+iV0Mero WAmqSvmPa22Nlw= 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.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23444f1e7b..154ad963a5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19076,8 +19076,31 @@ (define-public rust-emacs-0.11 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 @@ -19089,16 +19112,11 @@ (define-public rust-emacs-macros-0.11 (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.18 (package From patchwork Fri Feb 18 14:39:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37338 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 BEECD27BBEA; Fri, 18 Feb 2022 14:51:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 53CFA27BBE9 for ; Fri, 18 Feb 2022 14:51:05 +0000 (GMT) Received: from localhost ([::1]:44520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4bA-0007Vt-G6 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:51:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WJ-0002Gq-Mf for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WJ-0006Ql-Bq for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WJ-0000Et-Af for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 28/31] gnu: rust-emacs: Update to 0.18. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46: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.1645195516807 (code B ref 49946); Fri, 18 Feb 2022 14:46:03 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:16 +0000 Received: from localhost ([127.0.0.1]:53857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VY-0000Cq-9U for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500 Received: from mout.gmx.net ([212.227.17.20]:57925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VR-0000BX-04 for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195503; bh=bgRvxc6JdEOga5uAKCUD3tLNX26XRo1+8bZkYZVisTU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LmHYKLCkamr9sSc1OonOYvafN+VkoWKjqPe78JUSQpxpjZQhjQ8dSrrxR5qxPiIE8 pzrlDZ537UVw9j4Hr2LnYtC2xgOj59bIigKeyViqWPyqKXoqB6UVJl8Gpf5ewsnGPD 36W/Z0dsTf76uQGqz0vvjKe5Yk3Eo4IOL+cTdUf0= 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 1MkHQX-1o0PX93P9l-00ke04; Fri, 18 Feb 2022 15:40:02 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:45 +0000 Message-Id: <20220218143948.28989-28-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Zb2v4Cocq/DxyQ6WiDSfmRslwGTQiJT6VAZktPjif+m0jWAnu2J XJgbVpOKE9Zqs3oMQDpCVBopVMkVKxYkL3gvLFZXjPdIeVcm1yyjHmco3fKgiba4tBWs85n G0IQChyFVrc1RDUlJLfa2cSt1wlu4WlBgwf9bJU+Q2FW4XTecKHSyIvPgA4xCn6TVNO/iC1 yWRzNbGWprqVTygS923yg== X-UI-Out-Filterresults: notjunk:1;V03:K0:MzZ+ZR3vvAw=:QmmdLG1SVAfmi+GNrUcel0 AG2PtX7TJ8hZDMdw0ywXD74rH1smgTRkZ5SVWlJsNzEtJ9gxhh+pWJdufIgpPV1pnEqQrkzha LTZITZeJhpNUOq1Ar0R6NoZb1BkWH4FBBIrRE+fQ9NpEF3UMgDIJ6nmcTq7D63uxVBBv9wQ+/ 2xka+PfWVmsn9K2sqJBTHq5k7UuMGVvjbxxIoWPJ+fdfm4pMQ27YCxDcOB/o0ugWsBpbfjD2S OWjaxajkGVm7rMXt8sW+KpvDHcHm/SbKOpfRNmrt9433/NqYPDUU9u+qZyGTV19/GOENh9y/J NjtK0r9e1O4HbERFiPrTwYNY970m5ouqymrc3fIsWiZX6SNLyTq3FL92eVcHCNjFDRdoN7cfB 8OEbMOhxYP0jkjPc29rpeESCtmxCG93sT0HcjaII7VJC/vrZAUO7HF/+WESFTWaJ+/MkPrwWt +ANT7kKTYiO0CcrCSzX+DnS+uhVQ0aLWKUa+Wgcw0mD8N+f1kCcV8vcZ5pAgla6aN+8HGi+Rb +0tYgfzlvr7ei+nvai4Qia8XgwnSB0FfVwWlR4PxRCMxPD/fdlxkgHbIndxNzfAprDmanwiMm TwME9ncAoR0KpupLOQtcYU0v3eAKpY+eYEvKAiLwwXQjEbJKpHt4bcwCz9yZltiLw3D0oQsdS LEKX70OML+K9eWxIKLLA66DWYnPur4xsgn4DUgSAT/40Mz+nfcnvrN8+Y2PSGz1Cm5D43E7rZ eHU+NIBXvtju+kxaeceaWQQM9vceYiHaQCmNdS198kDWYWaKEw6IBE5LyYY5PRhibh4/4MK5I niq0PjHrWupddDpXZJ0L+7hCr5GQy1sWWuUshPxv0ipwuj2ZL+DlKhoX6f6Wi1YTAovoWV9OD k1HVzAjAx06plj0nZjkQPcJAJQVsMq9gU2KQErigN/ZXqYFu/z2+CrTrCu3DNtv6KhdJUbdU2 AJsS7UkjkCocsXeJ/HCQI8yBDtmmUjtxtYaew9xgXaVIM1FywuonY5BGL1xFfLP7JrJk3HfmX 6mf71ykmJyzuey8UDBdRaGWj2NoOTS2Qs5O6j+RF2MNkZQwfRir3Lrwpmi71cTzFZGFAslOi3 +vaT/6lYrXOy3g= 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.18): New variable. (rust-emacs-0.11): Inherit from rust-emacs-0.18. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) -- 2.34.0 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 154ad963a5..6c0376c01a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19045,10 +19045,10 @@ (define-public rust-elf-0.0.10 "This package provides a pure-Rust library for parsing ELF files.") (license (list license:expat license:asl2.0)))) -(define-public rust-emacs-0.11 +(define-public rust-emacs-0.18 (package (name "rust-emacs") - (version "0.11.0") + (version "0.18.0") (source (origin (method url-fetch) @@ -19057,16 +19057,18 @@ (define-public rust-emacs-0.11 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xn6nr8m3p24irlmv3i7c9n95yb10qc6aikwqv99qlmhbky5x0z7")))) + "0r860i73b2680i2fhdl2l1wwvvmf2zksncpckgkksdcx310ak5v7")))) (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.18) ("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 (list clang)) (home-page "https://github.com/ubolonton/emacs-module-rs") @@ -19076,6 +19078,28 @@ (define-public rust-emacs-0.11 Emacs' support for dynamic modules.") (license license:bsd-3))) +(define-public rust-emacs-0.11 + (package (inherit rust-emacs-0.18) + (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 Fri Feb 18 14:39:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37325 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 D3CF127BBEA; Fri, 18 Feb 2022 14:46:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B62327BBE9 for ; Fri, 18 Feb 2022 14:46:19 +0000 (GMT) Received: from localhost ([::1]:36888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4WY-00022M-Fn for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:46:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4Ra-0005jb-Cz for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4Ra-0005UT-1l for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4Ra-00004w-0c for guix-patches@gnu.org; Fri, 18 Feb 2022 09:41:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 29/31] gnu: Add emacs-tree-sitter-core. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:41:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.164519524432589 (code B ref 49946); Fri, 18 Feb 2022 14:41:09 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:40:44 +0000 Received: from localhost ([127.0.0.1]:53814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4RA-0008TT-D3 for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:44 -0500 Received: from mout.gmx.net ([212.227.17.20]:46321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4Qb-0008Oj-1W for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:40:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195203; bh=cukqLcW6uKn3dPWx96V13WQFcXG12qWspdYi4xGzZJA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=NR/0FHex2OGX8JS7GaFsyLh1qMpRZ6+psT2r/mSq3KdFygj8t91QSsig6oIB5e1jC Zqc+7rbBHrdh0uFA8PRFQcmyw4mwXT43BFLkKKFcrsQSiv8Dv8zRfsSfiGlFpB8IHX kwkttkb459/lOwrG6o39KxnOOO4rvyzXH4oEtvys= 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 1MVvPJ-1nk7fS0WG5-00RtGK; Fri, 18 Feb 2022 15:40:03 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:46 +0000 Message-Id: <20220218143948.28989-29-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MYZF7sULy9f7dK8yq+UxzRTIGIF/jrw1rlSglA7w/OdCgo0zELl dFe3w240l3CDkT27HPPMfnARsc5F5abfCR/ohf1TWNZ2c5/RjznYnbXg3/RZ2rzhJwYu8Fp 7ykBO24i1RA9zOKdq1Ey8OeJiuEyvLw5jrKLITpnp2WOy4Wowcn/RUztG7ZtBuhLmQSMtFM nLFBqOMX+105qN8eso/Vg== X-UI-Out-Filterresults: notjunk:1;V03:K0:AvfX5kt2c/U=:AdpzBRw1B7pHoby8XWgQrZ /V+YDmkaX+V8oK2T/wRab2yTRDUyQ3ugfPfmKuqcjbGiPCng+HznTI1gW+hvcZ6MqDp4xvsEf gzZpEHm/vHQihkxlSdATUNVirmwBM2GD5b0rY1Ql5Pyldl43O5br5mR3xfTmTwtgFFs6xiZgk KAYoY8Kzw1BTq+xnvRkR5YHzEv1HCm5r0hzH+4ANfsnP5ocW97SScevXyiOppH80Ig/26kWIq Gxue8qzvEd0OLn0Gg5rmeJCjitNoJE2sb0efDuPmQqfYKldKpzWuAiSB314eEkQZAbaBYX9OH j/0m5GoyMxGaIhc47vfemcJrycJdgRfijBMTZx/nSqEZTAWoj65ERkgs4noOrFt5JhW1XmvBz DXLn4manQ2ovaZO6viutCTmHMyGS7WIabxHLB7ooby/OqmVec85RbsKJx00eCw4m3dmHOHIN5 GeXtFecfWPZ8dV4WOw2aLk/K3ctb/1JPrLGFA4Mc93JpNjEFDRVni7S4Zp3zgyatKt6+nk8Cw mJRLsfYJdeahQMxU7twk8x1IT5rxWfDCkmYIS0FIKkfUJ5Rmv/Jxv/bIDMkAhiAl6hLj3jFqE u4Iu/SIDHHVw54vdwKUAdAgugeqnDa0LBMPLDzbhxuOYC9OXkNvIloMuk2YtZXqdG1iHPvw2x K1nOBJ91JVvidU273kVSab4j59XOEVyVq1lse5cn69G53/GUhdtY+Q/5OzY+s5U61V5lpervE G8/MWYrlEEN5zOX9ggdtLixW186rID+7fA3+CCUxkk0qQQMqNz4uQPz2Lbkpy5bNvvZgEjhNp 9WngKbmiIbtq0uf4Cu8B8xrNYEbwvVUw6nDi//p4YFgQ9lzPuj3KtSEPY1iQkaFkWjhlRx4AU LGZA1R/ZCZLKnNF+oNOPGhFMVfExo1kJ4z4mMLFmPIN0ZeH0s6SwaZTLLTB6mV3Wto1BWAyxK 0qH+16PbVR+Vd8VbhEI/peTMf8Qt+qBpEHIzygk7XylDAsDt6HMGLL8KjpYPy4r2AJCo/NuSL QyCz6Nqfbi4bQhtFfKmqCi24N2m6HONcMRZ8ErTwd94R10OlnFgQFCJIfFox4eWQGDMpW5OVV Wa/Fplhjpw1PHI= 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 | 78 ++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 3c8b4588c4..e2af7cff5a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -20,6 +20,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system node) #:use-module (guix download) @@ -845,3 +846,80 @@ (define-public tree-sitter-typescript "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.18.0") + (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 + "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif")))) + (build-system cargo-build-system) + (inputs + (list tree-sitter)) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-emacs" ,rust-emacs-0.18) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tree-sitter" ,rust-tree-sitter-for-emacs)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "core"))) + (add-after 'chdir 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (add-after 'delete-cargo.lock 'do-not-fetch-from-github + (lambda _ + (substitute* "Cargo.toml" + (("\\[patch.*") "") + (("git = .*") "")))) + (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 + (list 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 the version number 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 ,version 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 Fri Feb 18 14:39:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37326 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 E4B6827BBEA; Fri, 18 Feb 2022 14:46:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE49627BBE9 for ; Fri, 18 Feb 2022 14:46:54 +0000 (GMT) Received: from localhost ([::1]:38192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4X7-000354-Q4 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:46:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WK-0002HZ-5R for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WJ-0006Qz-O2 for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WJ-0000F0-Mv for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 30/31] gnu: Add emacs-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46: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.1645195517814 (code B ref 49946); Fri, 18 Feb 2022 14:46:03 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:17 +0000 Received: from localhost ([127.0.0.1]:53859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VY-0000Cy-Ie for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:16 -0500 Received: from mout.gmx.net ([212.227.17.20]:57187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VR-0000BZ-Hf for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195504; bh=q5l62gBpoZKPzm96+LheJg1Bl/M+i+Ac6q3QvD+szqc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=i/E20J91zNQMeWbbPDjomVbEqXFQG878f3QbQDcfU7pqNxG7dpRRRneAHJJw7IlEo hlhjXD5BAVwlxUI9oG25ltDUjtYTDrYxBkz8KOgyYrVT8gA8MTvzdwWDy8OxzEff+2 eh935O1UoGGJ7gKYLoSSp9UTbGDE8gUJqDB4BdwM= 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 1MuDbx-1o8D0Q1n8X-00uaAK; Fri, 18 Feb 2022 15:40:03 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:47 +0000 Message-Id: <20220218143948.28989-30-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MxV5QvGp93P623elE5ZMBQYrpfiWCMIDTxk7WkW+TcbZ6bc8/rZ UuoHzeyFQAYHMm8HF4LSZ04lVrbed6lgGGoYIeSApWu3m3SOWjXESnueb8WzZGuNQzgD6i3 2znDJLWxXkQARvIxhl2ImL2tBsopNEPi4GvfGBL1k4oak2t3yE/2PRjhh/eE2ZxHXwuy37M I4OFevpNUkT6ikv+IP15w== X-UI-Out-Filterresults: notjunk:1;V03:K0:YEDNy+sd8ok=:xmV/eyiavms4OVy0GxUcwC VtocrmbYtBAGcHvdJZYhg8RcbSDr8EGqcwkhDwb/Wiwk4AJD0WlqaR+BIzxVxubkKxqKOznX6 cDnaxrDr1/vuqIXxlKpJLSEt+Wo/WQ3iOZ7N9RCBCr+Md9qnbY19aD4igac26ni07CEnLcSRl z+fSPLzDydYbz8mIBm1YXZrwprSdftSl7F3xBfpjO7Uucd7DSk6ppefXSFkDgk62aPJFIe20s 0YBpUFuLrDM+n3/M3PzqpmaSJAXq5y/MFp09qEPP5xyc4c95CJUDn4wSe12XZp0+QR4aEnw/v KHEl6mikm5CWjsnrvTNNm6/BVdvT77YesVKVtrl3vXrDYpvnqB8KbugUNj6FVJUGmy9AquPgu aw8eHAbHzHXLFWvBHXMjqGpO/8uc/fABqDZ8t9o3iS36XWiBe1KubKuq/vnfPZRfaKknM31pT 0xUQ590szQn7CcouJUUZAMXzydNnCKSGpEpj8Alxas0mEX464qIom7IO3N6iNtV97C3H2e+fC Rj6rT2FFiUwIASXkY5eBKP1f/zTWIBir6Ehw0HL3DOJlmK1+mTPqaIhepbTyKxFsfHByQHWhG vSDZilNBwck1LqLhr+JJN6jiutHqS/yXURcgYTZL4p3FmXSIcedrdAD2ElRNDUB8HRmo183Y4 wayonfTNMIo7m4r3KR1OEZDWnzcI7ON1paSU297Pu1hOHX40YB77CczSYQoutEKEKEHyHShaE DfVs0fySHbVAmfe72Jo+fmbI4McEzc9z86DtLiqAMpRMiM04ddPFZ1mz/LG773ijGySNbYfYw +aCoEcs23ofIT///Gtc2n3yGjkcReaPRt+cdQtxXUoQCfNFd2JC6MkJAxmHipmowkzmAHetly avrOv3WyhZVw5IPQYaxSVVcHNB47SThE4agOva1gSx1NP8jb7cX07rY7QJT9pI9WcPwuBZ80g D20n0ep3v1+u5kX83ii2RxM+VeNx9hf8v0ukxoPjl7h8fAWD5ZIfnFboWArMN5p/V0cbxDArf BL7Tl0da+Uc1SwXDfqsrxXLMLmWD/jOwYKm+iyO3AxVkLkUdruA9p1Kyh4xi+nAlwss6xsjcz gp2Qm81PW0pJyQ= 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.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e2af7cff5a..9a427bed7f 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -923,3 +923,30 @@ (module (string-append (assoc-ref inputs "tree-sitter-emacs-module") (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 + (list 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 Fri Feb 18 14:39:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37339 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 7350C27BBEA; Fri, 18 Feb 2022 14:51:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DC70927BBE9 for ; Fri, 18 Feb 2022 14:51:15 +0000 (GMT) Received: from localhost ([::1]:45126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nL4bL-0007uf-1Z for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 09:51:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nL4WK-0002I0-GR for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nL4WK-0006RB-3l for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nL4WK-0000F7-2e for guix-patches@gnu.org; Fri, 18 Feb 2022 09:46:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v4 31/31] gnu: Add emacs-tree-sitter-langs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 14:46: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.1645195517820 (code B ref 49946); Fri, 18 Feb 2022 14:46:04 +0000 Received: (at 49946) by debbugs.gnu.org; 18 Feb 2022 14:45:17 +0000 Received: from localhost ([127.0.0.1]:53861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VY-0000D5-SC for submit@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:17 -0500 Received: from mout.gmx.net ([212.227.17.21]:37907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nL4VS-0000Ba-9A for 49946@debbugs.gnu.org; Fri, 18 Feb 2022 09:45:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1645195504; bh=KQKtk/Htaalubl8Qbew8r1AMYScY44rvz5nDNhyGK70=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ErTac/D165TjUudgHhD33mLhCE7OwFwBFBhqw+PbRZkTpP/hzZTloxQ1Bm//IjE2N w1obXrMw7LdrMnTEdVZIQTFgJ/8I1mELNN1FTU2e7uXJpBEC6t2gUlIAtloD1zEENR VoVsOPeBf3YLWeMpryectZH0/azBYXuvTzahexhY= 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 1MeCtj-1nsCJw34y7-00bH8E; Fri, 18 Feb 2022 15:40:03 +0100 From: Pierre Langlois Date: Fri, 18 Feb 2022 14:39:48 +0000 Message-Id: <20220218143948.28989-31-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218143948.28989-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220218143948.28989-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gfPn5D495JujHjxoOvXFmlgEwmkgp2xmT7B2kilVOS7G96lQJua lqADVp3VxDCRuj31rqszRskRjNFpnZDDcSKuphHvIleXA0mZp8B4aUu3kMPsQiCsQVohCoh omysZKQsGufNbogJNioAaQMjlmoTMnQ+4hm6/QuIoLH5xhoJI0VMmZB7kDFYZKr4cTrL5CP J7lxialsEZzVNj3fCg++Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:8FKs1noL39Y=:SHgy61yQIvoYdCCSVpq4Ri HlmNuZY5HGN3cYk6quPbSeSn7IVQZkO4hGqq4as27hSdqjKsQBGo5wPRVkpG3yswqy97LIRGc sJ7hxJIqFWphHq3jvTUVFesPuUq6CTnNryUDO++h800puv+AB+TCcQm6MZYrVSMmqSg+NLV4W zjr+J6teJbqSyaHrheZnAXnJRLDAcYZfLveLqzY3g1CaYIHwq7ODh2pjhQzKVae5h9dK1KuFQ 6liN+0TRu7FmDlSOvare9GvNu7D9EwEYs/ymzAUjNFbhI0lUKk4QODzRU1vYZUkjEvwjG14g/ ZcrB1o0Z4np7GoGP1Fct+U9DMOzOouSzfWut0SzmqnJsV3VyNEhmC2vCmfMvSlbXcVrT8nDyY Vkfk/+TZryHmT58qBgl+vckw42SK0BUVfYARljSF0pLrGTlxLc2fO07vENBCwK0iHgvwec0W9 AleAVaBdhZLQvkIcjQ4r70WTd7HsxdZ+x9Yf39dnnb3e1jehs1GxRg/TeXN4W5/+zS1oGqupE adxwiGbg9DZTL+ETzURmBUB2m6kfJnzvrCSCw1F1gERTrAHUPhDVKGpPOaHES3eDxcPGdgcfj LgplbgjJrTsI2A2Ul0gkw5iS7131zoYnRyDDkgfiFn6aQsm4ghwxzXUnpz56jZPahUYnZH/UO bWJOC3HLlniefzBp03EF8CcvrfSfitqx5rcYuuKGrRZaz/ytf13GXnDSSi+xhEbaUZf0G3xp3 v9CySP7/uef6zpR7rWwio9nuZXMiYGebqRswWroq6z6Cbzu8zOmzmpUgDQ8HPIs/jEmkptnmM xvJ7Q2DyrCuYJV0BYTTfW3eisPjiyO93xhryZz1i13i9OXGnWgY5zKksAj7dGgOQYZKFL13GX ourH5T80FGIBX+NY3psq3/rn4WSPBYodRF4KepqfVFbTSzVfnX8Xz83Qv7iCcCfvmsJj+VPor xjOYX5hDacqflTz8JGsLn848nNtfG/ayCalvDVnVmJ7Z7b13WnfIdWyMy4wwtxBjgodidJYsH z+vSW5eZNFAbF6rV9T7S4SkSUuMn6O+sV0ZBEurwPSGmC17Po307Rc666L2axKthedSqdUk1o 7WyekP3tTbGM2A= 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-langs-grammar-bundle, emacs-tree-sitter-langs): New variables. --- gnu/packages/tree-sitter.scm | 136 +++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 9a427bed7f..d1341a2ddd 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system node) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -950,3 +951,138 @@ (define-public emacs-tree-sitter @item More informative indexing for imenu. @end enumerate") (license license:expat))) + +(define tree-sitter-langs-grammar-bundle + (package + (name "tree-sitter-langs-grammar-bundle") + (source #f) + (version "0.11.3") + (build-system trivial-build-system) + (inputs + ;; FIXME: Support for some languages is still left to package. + (list tree-sitter-bash + tree-sitter-c + tree-sitter-c-sharp + tree-sitter-cpp + tree-sitter-css + tree-sitter-elixir + tree-sitter-elm + tree-sitter-go + tree-sitter-html + tree-sitter-java + tree-sitter-javascript + tree-sitter-json + tree-sitter-julia + tree-sitter-ocaml + tree-sitter-php + tree-sitter-python + tree-sitter-rust + tree-sitter-ruby + tree-sitter-typescript)) + (arguments + (list #:builder + (with-imported-modules '((guix build union) + (guix build utils)) + #~(begin + (use-modules (ice-9 match) + (guix build union) + (guix build utils)) + (union-build + #$output + (filter directory-exists? + (map (match-lambda + ((name directory) + (string-append directory "/lib/tree-sitter"))) + '#$(package-inputs this-package)))) + ;; The BUNDLE-VERSION file prevents emacs-tree-sitter-langs + ;; from downloading libraries at load time. + (call-with-output-file (string-append #$output "/BUNDLE-VERSION") + (lambda (port) (display #$version port))))))) + (synopsis #f) + (description #f) + (home-page #f) + (license #f))) + +(define-public emacs-tree-sitter-langs + (package + (name "emacs-tree-sitter-langs") + (version "0.11.3") + (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 + "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6")))) + (build-system emacs-build-system) + (inputs + (list tree-sitter-langs-grammar-bundle)) + (propagated-inputs + (list emacs-tree-sitter)) + (arguments + (list + #:tests? #t + #:test-command ''("script/test") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-cask + (lambda _ + (substitute* "script/test" + (("cask") "")))) + (add-before 'check 'bundle-for-testing + (lambda* (#:key inputs #:allow-other-keys) + (delete-file-recursively "bin") + (symlink #$tree-sitter-langs-grammar-bundle "bin"))) + (add-before 'check 'patch-tree-sitter-require-test + (lambda _ + (use-modules (ice-9 regex)) + ;; This test needs a git repositories with submodules for + ;; each languages in order to map all repositories. We patch + ;; the mapping function with one that invokes the tests for each + ;; packaged language. + (let ((supported-languages + (map (lambda (lib) + (match:substring + (string-match "(.*)\\.so$" (basename lib)) + 1)) + (find-files "bin" "\\.so$")))) + (substitute* "tree-sitter-langs-tests.el" + (("tree-sitter-langs--map-repos") + (call-with-output-string + (lambda (port) + (write `(lambda (fn) + (dolist (lang ',supported-languages) + (funcall fn lang))) + port)))))))) + ;; Tests for queries will fail given those languages are not + ;; packages yet. + (add-before 'check 'remove-unused-highlight-queries + (lambda _ + (delete-file-recursively "queries/hcl") + (delete-file-recursively "queries/pgn"))) + (add-before 'install 'install-bundle + (lambda _ + (let ((elpa (elpa-directory #$output))) + (mkdir-p elpa) + (symlink #$tree-sitter-langs-grammar-bundle + (string-append elpa "/bin"))))) + (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)))