From patchwork Thu Feb 10 22:55:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37187 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 C5AC027BBEA; Thu, 10 Feb 2022 22:58:02 +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 91CE527BBE9 for ; Thu, 10 Feb 2022 22:58:02 +0000 (GMT) Received: from localhost ([::1]:42532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIO1-0002Nb-OS for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM6-0007jX-EX for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM6-0006J1-5O for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM6-0000wV-4u for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 01/26] gnu: Add rust-smallbitvec. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337403420 (code B ref 49946); Thu, 10 Feb 2022 22:56:02 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:40 +0000 Received: from localhost ([127.0.0.1]:57497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILj-0000ss-H0 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:40 -0500 Received: from mout.gmx.net ([212.227.17.21]:41269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILh-0000rs-Df for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533731; bh=tS32UXeP+j1oUdMEwSJMUq+53ivSqtMAdIHOyEbndNs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=L/DB9yTAZ79Fd8PY/Olb45iknmtU9UOrG95iqqODzYc+fiqtOZ+VJth/aPC6hxqy9 jQ4uwyuWcMN0l6Ej5gAz/7whZ3ZQhEtllTgeNKxsxIJ+1Tlpg+8V2Fy3VLSAuCWAI7 AR0fMu3dcOJujzcibonwnmjWOYdCUFRQWK8R9C1U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MLzBp-1nZgbi0pEH-00HyVS; Thu, 10 Feb 2022 23:55:31 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:02 +0000 Message-Id: <20220210225527.25189-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <87leyinxly.fsf@gmx.com> References: <87leyinxly.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:OZytRGjydapIbrEzML7OFS1eFteSNZnBSGTTjwrAhUJ3hOU8N2G 043Qy6OZKxJ71q8mGSz5gyLMExHKCjFjrtChNuO+1QYtmkjkP18oGB4al94yzNw4SHA6G83 88Qn1szddF4n1iU/yjEsxOJF/nFQzIyUZxF4QZ6XCAk46A4OniPR6WrdJgb/QvLM/sPwC+r 2Vi0nC6JOr82IXmsGdzjw== X-UI-Out-Filterresults: notjunk:1;V03:K0:dFkQXFRu23g=:UxPO8npIOD3wChDwXPPjnt mPppaFujHwY2bxhM93G86SKvStjgs4pasa9ihOBMUKbbk2fZUEq3quUBflbnAGfaFATHmijVz Mm7tCspesBO4clXrKPAuLk/ekjTkK6QBT1JHlxMcVPBb7tPwkV+2I2dbfl09ii2KH50Rzdux5 +j3G6COaz8EPSqOhYClpwOOGlXBE55raYqdmC4mIiNmshOL1cJGiI9RHt+kELfiUZNf+ltZ8s 4PHqD5BrrtTJRVj4vrbtznNBQbUcBhTuvCbLu744hnH5qDdDmC2M2Xo7OowPmywHn5nz3I2Fp AQoLXEW/69vPe9So6czvWeN1DVvntyFWBB6ZWpxPfiT3UYszgNoX3H0W3DuRIEAogBamAPh1n CBRHi1az/EvqOOMGpt7LFfadenMREZNg1WJF9etHsHl0I3crZreQgr72E5UsYRK9/FmaiDybb /J07iGDLOZfybwCOSuwSCtISZapriRFLdHWFi3rkxn88kdbOGX+jf3+iIbhaOoFm/mHS6hEzc vKJxIT9sTepLGGzGCzU/zrTPrbbdv7oIuvDQ7nXbR4vRw4+ruOe9Ce7xbWrJu/TaWKPoDzRhV /fOTnvimQQygzFMZqezpDmwn6fbGqD9ZfzhUBgU+djVNjTOLJMt6pjTtBztbvEFeYBC1LLeOW UuvevFSaaAXrSro4GKamyDJAZpLgX4s/s+OUkKt+ymJiOcFCue/ew9yR0OtUG7Cw67gwwz0Ny /jr5VK2/+WnwHMgIYdPBpBGMqeYQL7U/fh1Ktvc3PLBCJzjLSjnfl0hiECH/Tf87CCOiWnojM 8JnvZ77G+2vqmMe+LpHquKsrJKu6qc+Li7y4OffdNto8AxGhDuSoRrhEFaPPsDeQLN9cox7c6 bvJZdpWukGewgqoRGcTi+0GS3mqSI8ILMU5OveNTFmGLtU2BkicttR3+VxQzBOjNkFSzjPb+9 aRjNN6kPF7AcEtOOLY7pJaI/2FiZ6KeFWes45b8gBJIepKMlyai7z9apUGFWas+6vKiKhwVZu vMnTiEfuesB9ZoQBgVvYJZuv+mnAYrYhi2PXajucSlRuzZmCIFdlIuNcJfnsgfHIT0wc87SaA tPd5LO914q/o5k= 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 fa9a7d9ab5..d001e723ec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56099,6 +56099,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 Thu Feb 10 22:55:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37177 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 2455727BBE9; Thu, 10 Feb 2022 22:56:37 +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 D566027BBE9 for ; Thu, 10 Feb 2022 22:56:36 +0000 (GMT) Received: from localhost ([::1]:38634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIMd-000870-Pt for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:56:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM7-0007jn-Ul for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM6-0006JC-IS for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM6-0000wc-I0 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 02/26] gnu: Add rust-html-escape. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337423450 (code B ref 49946); Thu, 10 Feb 2022 22:56:02 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:42 +0000 Received: from localhost ([127.0.0.1]:57501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILk-0000t3-69 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500 Received: from mout.gmx.net ([212.227.17.21]:52599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILh-0000rt-Dl for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533731; bh=fqdrr9yKNhkydJG3v4XflbAw09qnVXxvR/qaoJosDTo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DZe4fhdo/xi9hEfUP/CzDhRK18dMssKe5hAXB6CRMfuLqQB2PbyWCo/FAuvz9B87S YDNV+k8EOtDhR0w+0+uyeXWlWr1XYUnSrIiB3eE/XjiVn1mmRmn/gzbZVsg0t51eY9 IgLRaz0A82xC2HsDky8Kd1o/jSBuqG0QSlfYqDJs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N4hvb-1oH1V6233n-011mvA; Thu, 10 Feb 2022 23:55:31 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:03 +0000 Message-Id: <20220210225527.25189-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Tve1QeaaY1nLKWj7uZhIuTWA8osnJh1+2eaTI5Bm1XaKCu/kZmx sf514ADj8DxeesrvSjyNFTJXbHw3YyVDeXzZ1xtWWXF8a8Exwksz0c1Wg3VoaTNGp6raADn /SpmC/hdl8vk/i4M9RvRQ6t6heiXqaLJLPru+ewcNCIywOOM2b/ck49itlxiUsdWfcBV6nJ uzaauOJFPpspz7f23ckQw== X-UI-Out-Filterresults: notjunk:1;V03:K0:FMnG4WYwY4o=:5G8d5qNC8fYASNbCWyAG1l UxG/BKpCHCF1ct43M36cNYjpvY7h/ROdKeuilZ2qFZ1HHidNLWXg5AhkdpEGDYciEK5HIV/AJ HXfOaj85ZLtlgcz12HzzGr7AcopzKKIp7g9uhn5JDbkKTjOSol0Nlv48QS7ehxQ3fzNKSE5eO 0JmW0YASDm1eYfvhQFtK9oE4u6XZgzLSWMixStmlfywmecINBIsYItgTSRbed0U6PntjIu0e/ pUXvI2nhYkWMghYeBd4w9Kt5TB5rVfwL7H04PUt52Ig8MewFM/TrqeQt7IAV6vofBVDVcUUsN qFbQLA+elbwiKbdT/IEfZZwijEX//jWhdIzdr6y1KhLDREG7UO84y7gZbyskt1OKJq4Y9H2cm GoOAaPyReOiprTWDepFyflFybbAG4rUGrpUztuj6/GKgaWSqxguWqKVaglP4mVWL9AbrWCzmk I0Yp0E/t5iqH0/5OYiP417PJDQ5cH2AZNOG8aKB2OeUI1YOKGhXlK/AapFhr3ycZx+0KTirwE +onrnAsK9r4uSphxEVADj7LdOMEqG/ksQUIGJpNY6yuY6K9TVQxdjcLU9gdkj+8fGNkhp0W/4 UBAi1lCbcTpuKZhc6NxgFlTZ/yFjAq13aQoOBfK0oQ3A+rbHe8ZgLuR/rIuBhUAnopJdDLXIZ pOx/wWgy6xiL3+wVPlkZ9bYipgYhCWceB+ZENCaokU9DWFuZ0bp/une3WkwtkO5VnVmgRksNo 91cX36/WIqpfGB+FWlf9BfWPj6UVPM4gEbPXNuT3swwpOcNlCVEaTHv6YHcOETFMu4jdnoJL9 XMAYc42hMCeNu4MFWIKnorewltvvyAb+ShhCFrXp7h0OY2AwKKl6lgNeMcF+ksJCV9g0SXx23 mq7Yt1MayNAXZB2OccTYM5IZ8VMzBVzQjLa1kOzesgFJ99GHblzsTXyHYyN2R5uctnP0Umk88 JRvySz6SLqUwVwXsur4sihlFWHcBVkNgFAEBtgI4kd3RDZwFjS1VwJ7PBiejyem95HijYFVLP nevjyt8cpayLWN5meAzLOz89qJP+WfQqN7DOyoiuW9tCkaXnuhR2vbCQvchSgJoFEhHX5crJp jTlqicP98/m8kA= 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 d001e723ec..cff703c427 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26933,6 +26933,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 Thu Feb 10 22:55:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37179 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 23B3927BBEC; Thu, 10 Feb 2022 22:57:27 +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 AB7BC27BBE9 for ; Thu, 10 Feb 2022 22:57:26 +0000 (GMT) Received: from localhost ([::1]:39478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINQ-0000Kt-DQ for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0007jo-5B for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM6-0006JE-Uf for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM6-0000wj-Un for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 03/26] gnu: Add rust-spin@0.7. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337433483 (code B ref 49946); Thu, 10 Feb 2022 22:56:02 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:43 +0000 Received: from localhost ([127.0.0.1]:57509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILl-0000tb-Sj for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:43 -0500 Received: from mout.gmx.net ([212.227.17.20]:40921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILh-0000ru-Mu for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533732; bh=b3FGtt/biT4+X9iwMvrzWoa3BXlG+z95xB8ZJrS0D4s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=UyHJMTAvjoh6QUL2GjhGWDDfeArMa/m/vSJE6AM1wYMab9vXgMNIdvga7ss4+84LT HCG9DUqyvsa/UQGRgsSGLU7JMRL+yWZ8s7AD6yfft5gWwtWIVVBBAQSxnuf3sRUiKz nUtHZawieBv/jh6OV4Qp3y71DRfS91g0eXt5F7h4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MV67y-1niEuj3Hwk-00SAzJ; Thu, 10 Feb 2022 23:55:31 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:04 +0000 Message-Id: <20220210225527.25189-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:lDiyNcHP40b1VJGRUOaaJ8bRtE49J7KKl787cCOAt9Hw3DFQDDB smHjuV7X5YsY8Iq0mbP0FtocqFCATYvctBnmKPdnoax1H3XAXLK9o69z42hhoi2XyTC+TKF osfn+RaQD27aG6nPlH6bzTDMYoHKIHr6sRevJC/Hpyw6HXKaPmrStGZ+diEFjmrwzM+Dwlz 0XCLcIPwmC1m/3xiiVjpw== X-UI-Out-Filterresults: notjunk:1;V03:K0:yMO3dN+oWi4=:69H86eBf59iCOsGJqJDZOo JqwLz4LhpChDyHsfi/VrVH9Z7xziC0IWug0k15RuP8i9TZn7nHwgA9uOB+MDgmNRoNcu4+ys9 PfH6KjLb0egFInfBTMPEH/NUoRnnAW1qteIXx8uJyRIr1fCC20Z8+/4YRfDNkBA2cNxpAkk+v 9Zc6kFYCsJolTRvq8qKJDWFAsc21TcrePTMdcwyQZaHJgC6Kb4/CwGNAZmHrLJtfDYxwtd+/n sYvDQ7342CEU7HPd9BqcCVaD0wLp0Q6Tm6Up9w1t3iJtX3NPKpxwBGUOL+ITBJ6PwqnY8INCK mBszEh8VsPTs0LiTyT80AYYFAsKdcYgipklygKIGSXycXdP2Nm4Zi7BO6OE7dsSJw4ge3jN8q ICyaCucciWgpvmlTAsUs3eWdjR9fkOp3zq0qCGaPI6WPPennKZX1rB8OitxKNK3aTAg2761/9 zu563WeRVYDUlDe7LKYeGl7omI04zn69bPbzvaU/7iLqtAgpgtEpsXhtNj8azIqEAmmNkPj9I vdiN+JMURxyDENsYojyfVIimRPExSWumAG9Q5SZfZX0ueFfXAbV2rofjGz2z/n7zz3PjDJbGc o0xsuYg3LcEccBFiUs3CnJAeRRdje4exi0rLnRrrl8Le0xuQcJMuRRZv4K0l9D8yCHA30fWAu 9386bnqm0vAw6WNoWW/l47iGfUo5y5vmUzmWSO/DWtKqzcBuSKGY5e0YRu5ZjDdm82kcbNSYA 6GsHoDelPVPFfIuE0aTJWdhfZEXh2TCOVq1xrs93AefAR9oN7YR5c8DDgBbUMABJp+Y46h6GT SrzLfAfGWBHj5+OplqsbnlVxihBc65vlXIuepLQxQEdiQdm2KrjCUuP/N48jx/lCCVFdtEOE+ HPX454Y967x+MMTaUWbHSDYjadEsezWGsGudzNFpphp834KyJMz8ZrzrsXgs3nsofe0dvNa/c erb96ZQisjmkemgxSBb66ACd/7RiCOG/B6pUtP54x7/FR7Bc5ZtAlPZr9X6SAnlSGy2Ec9KmG jcAbsCDvoUt0MsX85VkM5fWJxO+g3n+WkhL3g+WU/PkFRSU6jOaoU/y031jcjbznzyyo4ZofG h9Rh4BI5a+081o= 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 cff703c427..ad27298404 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56716,6 +56716,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 Thu Feb 10 22:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37195 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 6CF3827BBEA; Thu, 10 Feb 2022 22:59:21 +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 DDE7727BBE9 for ; Thu, 10 Feb 2022 22:59:20 +0000 (GMT) Received: from localhost ([::1]:45726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIPH-0004YO-Nk for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:59:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0007jp-6Z for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM7-0006JP-QX for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM7-0000wy-OP for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 04/26] gnu: Add tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337513540 (code B ref 49946); Thu, 10 Feb 2022 22:56:03 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000 Received: from localhost ([127.0.0.1]:57520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILu-0000v0-GS for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500 Received: from mout.gmx.net ([212.227.17.22]:38107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILh-0000rv-Vz for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533732; bh=bEW4VxjCy2q9YzVq85N2wAtsCantmvSwlDdF/UdQWPg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bThhCvl+MLWNf2DFnAH+V6nVvnRzW8SXEGGpFCvrfNA6rJ0uorlzVtMDze+cmoKWg bPK9VfBh4dE0bT1QQcv/1Q1PvXpBdW/9FX2QC181+zdNZO4Iad66ijKO8p9roXfS3E /ZokyTrwY00nGYL5EaNUTfzJRMxA0s3LlfFQ13YE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MHoRK-1nUxG60FKY-00EtKj; Thu, 10 Feb 2022 23:55:32 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:05 +0000 Message-Id: <20220210225527.25189-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oG2glCxYIr3gAB0ZktQkvjI4GpMm6kG9+wRy43lnio7MPqMZ9DU 4rLCa1nEYPkTCc4w0E0vz4SGIim0YY6t+6RPJsGnMdcIpk5DCM8JG2T4z+v1XjH70L+N1hg qoUFJHdK4hjzYjW+K86R7OUjT1uT8Z7CsDSpPWBSL/cewnlHyjV8IHL1y4mXOxTb0GhwQoM ORJo9s5ZLH4IdSHFtDQ6A== X-UI-Out-Filterresults: notjunk:1;V03:K0:h+vv0Pjf1Bs=:xLa1Geg2cMc/JFD1iY/HY3 ggcgWfifTC+3FQrkqnFdxAJsed7cVmsN4dUmL7vflSFIC8Z7kYWoKB6Iaz086GmgYc3baAXua cGDeGyyD4IfDyl36dMKTp4A+u6zGRYPzgCSdfbCg/HqKUFHmS1N/9HuUv7EiOvewZMRSQ2nyw 18Ae6aNvRHCfe/bpznDc+4yzZSSLynISLWWu4Xt5O2N7zvD2NriyjWiYi1NWrT1Fo5KvXV3Qm Lys2KT2liK8Kx6sNQcge0ZAcoKCBu2in1FgnNLWru/qqcznQcIhxnymQD94ozih5GyGDfhW4u nixi3szdUB8pZ3m7Ey7HpnXE1YOacVcfkxPESy6uq0rqKBeDjaEdphv+yenms5E1/iWrc1TTK wXqRiUnL8jOcvxUPgHjpOm5osX/MCK6JZZlKZd2PQBR8MBMnkvT1bUUUeuXMJhjI+qdUxYOLQ IV4oS1q4KfNzZN1SzTUdEPFug+zzrK2IMX4tGEOrDhD+/qYKO/G491V7b9U9R7UPleRZ/uqPb l4C21eFbyMxoxfKpKbrvn8Vnx7EqI3YF5tXH/qK9mUR8GT7MKHqWhqXNHOFqULhM0955KxdKf lTzCI6SHZSuZiss0iSmGKdEf6BBBpetOlQUCH8dryTzWxZbAXNGSgdXgLCzs2w1OBoHaF2Qw/ ldA7uKac/Xke5ZQUfBMCRvGdd8+iI3+Ji7FcROUk2NI6F4NkrFKTm7qGD+p3S3XVKt4F7XPiL Ol0CU7Inf7V53pTSeARMu+39VHRCC42R99bFAGNeRFOGUBaM9/aasBQ0R3A6buafqKLMVa7CG Du+nu0tNdxq01+3rS+BiEGwRZ0x3aFNG6Ct7Njju2foY5u7Q7qXar60YgDSsprq5lrqf774Wb P6LYgDMVwRzO3er33EvT2KX8PgonvgrN/CFmWE7X8PHsr3KSNdCu4hrjRS/sXvltm2YxRKYO1 zEmLwomZaGq81rfrdVjjPKRvTQgZQl/CzV13vBSJ18wnzelQXv4pEHxSPiF33oolU/GXzdEnC 1tXjCr2FyRJ4TYppqlzlxWLZWyVWOrxE3YY/Ug8WgUW16fC/2H7nChL8oiOaVDXcVgvJBSwsI yJkmzj6Ui5zA0w= 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 | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 gnu/packages/tree-sitter.scm -- 2.34.0 diff --git a/gnu/local.mk b/gnu/local.mk index 198c8f64a6..273d80a9c2 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..e7d2ce113d --- /dev/null +++ b/gnu/packages/tree-sitter.scm @@ -0,0 +1,76 @@ +;;; 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)) + +(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")))) + (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 Thu Feb 10 22:55:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37178 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 BD22D27BBEA; Thu, 10 Feb 2022 22:56:43 +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 4594927BBE9 for ; Thu, 10 Feb 2022 22:56:43 +0000 (GMT) Received: from localhost ([::1]:38792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIMk-0008H3-F3 for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:56:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM7-0007jm-Uw for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM7-0006JF-Bj for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM7-0000wr-BO for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 05/26] gnu: Add tree-sitter-cli. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337453502 (code B ref 49946); Thu, 10 Feb 2022 22:56:03 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:45 +0000 Received: from localhost ([127.0.0.1]:57514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILn-0000u4-8p for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500 Received: from mout.gmx.net ([212.227.17.22]:51965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILi-0000rx-8G for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533732; bh=nK+Iy+tq5s20cNQVc+wvmkuOaJHEMoNfBDAnxqtpde4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=S3rUIrxp4At9v+HpjOz0pvIAsvWGbOqMEEnDg6dlILZ4Ium0xhMQ2RjGQQGAY3oso YgA9PUm2Twezqz8Pwi/vaN9cPiel18JXH2f5m9HbxweRuyZ2gDws8BhPK/a3xQakRv jZLFUtHXIg3kDnpf0BR1Chxp28ohIbTUBbvzGdbQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M7b2T-1nNVPt1VZl-007ydm; Thu, 10 Feb 2022 23:55:32 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:06 +0000 Message-Id: <20220210225527.25189-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:5zk0mTCX2rPav7RhVfT9jgPTrLqUa5TjuhuWnaW2sHEj8c/xZdQ /mqH8Fwm/5Nr39XW3KEQF/MUhYsC8JTL1JEzOUQXfJlo5iFb2HjsSw7rFjJWzkQGox3V+36 p5YMh0NXNeEaOPrxjXBiuE3BifX/3DhmrT5O9jZIQUw1S5paMrIv+hgom3vEimC1w37msor rKTD8Z4+kk+dQk8uqqZtQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:JbA/LCthomQ=:nfTwbWpFk5d0MRDmvSAnp/ LMadGJoH/jXPsD8nvWXBCXVOwYq3xRe2MZOjkYFsVjyxtYg/CAkJSwXKXOEjnZNbmFUYgehWx 87XB6RMTXyYxuhZNfEDhyBOJpSZbMBI9oE3osQcnwXKo+/YBs0uicCeE7LZVckhS8zZOVrrDg Wi5b2V2A2fD8R+oFLHl3qLFIgpM4DXcujOkyifgV1avmLE3eDikpdcEiocY3BEBoe98YselOC tyupEJV/A9v8OythVLxMrgvakJxvSM6okXpvrLGuoziDoCBVJDK8YEqOduK6fTXsK3A/s3+ji 4cd00Rp23e+ODq9372EtczdE+4dj/azPHsNCyU8m+OxHXuZHiY7qoTRzP1Xpbp1cmN68emSOn T+uuRq6fUrQzHsNXwux0eP9j1Tc2MD56WeGm0L7yo+TjmyIlhxRvxk4CGTM9vgz2P9HQglaBx eZszkvxjuziAfamU/mfF1/h6JG9utTJziP8tc4j70SSUinWRVsak2gO4UhpEfIrF9Hnyvk44u 1UtU3xBBR3GscCCpYC1320D1hlyOwiY3NcyFtgFzwDTGDT2wF96H8KSBQI2L/srgFtAa0rmQ4 cApbEy+gsxupDI8DxRWjWxV2D03yx81+STE8F7igQwKw9SN/aJAuRKF6hCT8YaG0lFtaIrw4m uPSfp+FFTlCSdQXg4JA/RPauARzV0fUMpN3rsQmx8OcHbaymxRg25gcLS92G3D9XuO5fJTxz+ q3AbJqGqDm16VLjVn0Osde5HptzQ6bRFCds0a1bRE2xx40NjrU29hin+k6xUMRljo1+Edmwxn SAf9K0GH3O4+LGh5Ai7BtAPuL/KO1vYWsEAcyyc+Cl59arfnCfvYqNAgaYReGGS4Ep8GgvvnM NbKEYpx+xLdeZjn9wADAbl5Ewrk9oOouwip/VICQALPeUBd2eDfL9g18ZKVsfARUHHsXi06zc T4zC/F1WurtvhSITw6buIaOn4HaVFbtjdij/w1szFgLkTL9kg7tYtwMxS2PozchvS6Tj7dozv hrAVZPCEsaEAa7HWjHZAX/7Bf5rR9FH8U5db7L6PempBwTgc5FKcMBA6m36XTe0WYP7eKlQ+o fNsz7neCMg3Fvo= 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 | 68 +++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e7d2ce113d..c2919e76b2 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 (guix utils) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-io)) (define-public tree-sitter (package @@ -74,3 +77,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 Thu Feb 10 22:55:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37181 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 E458F27BBEA; Thu, 10 Feb 2022 22:57:39 +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 AB35227BBE9 for ; Thu, 10 Feb 2022 22:57:39 +0000 (GMT) Received: from localhost ([::1]:40280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINe-0000u1-QI for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0007jw-GQ for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0006JX-6x for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM8-0000x6-6e for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 07/26] gnu: Add tree-sitter-cpp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337513547 (code B ref 49946); Thu, 10 Feb 2022 22:56:04 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000 Received: from localhost ([127.0.0.1]:57522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILv-0000v3-52 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500 Received: from mout.gmx.net ([212.227.17.22]:35075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILi-0000rz-Q7 for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533733; bh=IJ+YkAMKcH7Id0Oxt/rIbidCQfLZL/zslSctDXljg2o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QwPdtcKxU5saNMQ9SAyPK5lof3Yh8FWW3Ppp0ou219cGHE/1RFU9GG3rmboOUVlXD u2BwIAhpipLFtSw8rieI6vRz6BfE/BOxHir9UoRPDTvGAr+gNstMYY0UgCJHF70jPS C7wlbQ+JLPbt4G2L3cGhXDubJ+wfb6uH3l0S12SE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MUXtY-1ninPY3vAe-00QX5z; Thu, 10 Feb 2022 23:55:33 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:08 +0000 Message-Id: <20220210225527.25189-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3Ld6UHlyAK6vFfXMc9ucCEAahqTA28LEe37awBrhu3Ix/M+ic4k i4qa5NrMGd7qLgs5uWmQQVU+vJiZI6foqg33CVZtJRIeSNFHOxW1TH63q4hRBlFbxmtrRje MJt08RmqiB3Cf2EK+kzV9bHCvYqWQa/XeChXe8S/yoTubSzsLIj1tqHQlqr5SiD8c4RfWGG Aiv5k9SUwLn964EMRxitg== X-UI-Out-Filterresults: notjunk:1;V03:K0:lfOHdSkyz0I=:7qK4Y0tEeswPTiklYjHLes mir0M+Oncp078X5ATOYDZTUWwmb3MFVfTbIMzdtSxBKvA8NOxYUDnOcdARWAJRr+eGG6Bqk6d kFJ9/JRAneZTzQzmlwLlpE4DA3uySWeAaKvk1dwzrBfAWObNI38U6ydliDFkCK6lTBQNcqZOs eqhn/L7td2850lVP2WzDv5Wv3z53PhuBXvYqKe38z1e8uwWY+zgn7d2hfOwI1Bqg4ECaN5uKb MiBGRqAoiJ5ATp4mBG5H3ecUzweW0F+vQ9K3jLbpAnKabDeV6JUJeeEIj+GcZvYH059Or9+ui Ct4cZ2T8RAeZYg+K7DYEnmjCqPJGImqVVSJSn60lyVi9n6FIA+LsIFf3DS8Du5EXMcKfFQIqk KZcydsFB5c+qDih21qaozrs2s0QZXdR9WvsZxP7N9gS3Q579wz4f7XelNa4wz/S0qhkOIj/Kg zuzEoqDtGkWN6p3AC4jkBgipnimwVJH4XzbuvQmz7X14v6C7XWBCXhZhwkzT3ZNS0p+vRBr9C gpaPrQW4CofeJDn/mhOf7j7IK8NFYxTRkzfCyYNjRewpsF6cHrllMqSqqfcHbHRpGlP5JscGb cAHmKfi6fhMJ3cFfUM1U7QwvzQqJ8oPtj+UrDIYc6IfcM1P0boG/6zj+DwVQrxyTznR6wFSUE pQFNkveAExx1tfs7slVfkFYHhhrvylZwckkW+pw+Bhk3h7LkDu+MtvVQnE+/zN1nH3kLvI+mP YzZGqzlK2DJBv8G2EhgJdMUdvWTG33Pblqs+a77/61GoN0H02YcMdT2wYYIztjRRlf1OR1LCE x6NtWv6aC1iBceZ8YM9M9bUJoNGzQ08RsPLkbhhex9fMMAQSVQNIznkYRAVzI+H3Z3HtOdOq/ l6P9egwK26dSh9UL9usATv8nowR+eHO6pbot30HaBqsV2FEJvzCNSo21/9DYSYrAKYtiV07ya ED0AUX6Zh0HWoNvHyvwUcvRayi7QnyjOnX4ykv27Jz9app6uXvQKFFKqNGOnSuRy9wWftK8xr tF9n4/WtwK3eprEQ2PrJ2UhMyKpRwRoKHu58KEdI8ABWDpWtyA+z7jn/rdcMgg5zKnzmw5kQ/ +tH7i26lWaIex8= 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index b62cb483c9..cc3bb2cec0 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -247,3 +247,21 @@ (define (source-file? basename) (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 (tree-sitter-origin + name + version + "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr")) + (inputs + (list node-nan + `(,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 Thu Feb 10 22:55:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37182 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 7102B27BBEA; Thu, 10 Feb 2022 22:57:41 +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 4581527BBE9 for ; Thu, 10 Feb 2022 22:57:41 +0000 (GMT) Received: from localhost ([::1]:40490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINg-000122-Ef for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0007jx-TF for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM8-0006Jc-K4 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM8-0000xD-Ji for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 08/26] gnu: Add tree-sitter-bash. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337513555 (code B ref 49946); Thu, 10 Feb 2022 22:56:04 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:51 +0000 Received: from localhost ([127.0.0.1]:57524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILv-0000vA-CP for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500 Received: from mout.gmx.net ([212.227.17.20]:48171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILj-0000s0-3O for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533733; bh=0jdkL0rGf+woMVGkS9xJK9xeOejnQWGCXlwCLoJyOwQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=NQ73XmIHNxGjJJUfTe/FlSBMiEiryXm3ohRGhEyRgeksNbb4asc62GcezuJliqLvd DBy+cJ+Tu7mon97jXm/4fYh7Kx+AxK95DHOqdLHSn4ekjR4lZk5oU+QTsIRIE+EHi7 qmzBzToKUv6P+zAzw3/x+n0LVYZqlhbc1VaG5/1w= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MnakX-1nyo9w0xBF-00jZa6; Thu, 10 Feb 2022 23:55:33 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:09 +0000 Message-Id: <20220210225527.25189-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:FJ+JV8rp2PgnTFYLkfS/vd8UHBuf+1JqDvqLYfbdjYZ+2Si8udb +ZDL0Wh329niVoU1rOtgAqIxT4dvtHrOmRhk4+5dZJkjudL01JPMEvKqjU6jfmGFBaLpoJy ShSgm6/G1fUU2tGbqR2t1MesSRcBbpCl4NZaIzA7tyzV2luaUxe8To5sus+4T7uECh+tNeG kjhkjruodM1zusgW1YdEw== X-UI-Out-Filterresults: notjunk:1;V03:K0:+A0CzSwcrSk=:AdulMcSJqJbIkggbSM6V4h FWpMflumg54hd4FQk1w9b2iREAnvye7eCMVlm4KtAIWmGSU17673N6orKtQtgQ6L6Vwns07d8 hUJC9qnnUfvYJ/ol4c19B9NahiK2YYzERHMf5vd9RRDsxXJRCd0Y+1Zfyk9dR76hlJboRdarv a/ESsVSreqSVzviKBkRvGTPZ2F64GxzFn/7/01ClbXX1CA1rRgLeVe/+4zbuQqzF4Tu55xC35 DbgVJgIKefItspPiHmv15irybALee3Z2hLREs4LwXWpsxeslsocgpF0OytwnCc0ytpzYVjTtc oxbxAh1f2HjW5qUBFPVDZnYslYEQXhHhbY6WPme8lrwY6PoCgJuPWeeeHDnoeb+bMpGIKtNLx Mqx1/ZMYR3rQ04k5bxsCgXWszdwpVkb42aUKiXZzVnqKu8L1wUmX8V2ESOAmXRPkMgeK8hLfv PP8WfUXczyf3ZTm8S/Qmghu5k/KkqXzHye4zYHgxtS5ktNC/C/9PwpWlXEfNB6cGWUDNvTRQy dyO9xJ8RMlweg50ivsOIGjWOM7wlSRlgTOaKF4Sw01vL4h4339ARxAQdbziKIrTkJV8t/w/NM 90pYVPIl+VxI7XrSDRNU2Se7/Xiwu+qxlcb9qflkEC4guJ48IKLlgT8qlKKKFOFsSY4LL/iiD olY9/MlmzjvShB2Mr4uWbQ+wG5iiCGsaHlEVbH6o8qMgURFlSIUCOPN+vsswvNXXk5SFjyDfA jBh2bJSTOcdIeOA6ptKHNZ0Q8MPytA/1mqGtSw9zlifsRK5FjZ8BVga91BbFCGj+3fWQacb3U CiY6LodCdIV+0h+l3KATGeOIsA88FiB/BM+8GbrtInYZxxnMKwdo6QHzsvYBWh0iECCcTPVnZ 7mDMFXpGjxnFSEERNZGqRZq7UlckjZzACHRpx4akoYJGiW3u+REL690gNmXw7ldP/anEFx9do XiunH6o76mU4lGTrhid8x4i3v4K5o4H/qEi7t39KRgDXNs7ha3mPG0giSCfVx/JSjr6nbj3vv IuV2v9o9t2XShpY1j/Bii9uUQpnNuhy/6En0wtsqk8JO2pcif/BCgUHrAdN/YIL7PyYSM7e7Z H8EMWGYkl+PPZw= 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index cc3bb2cec0..827e1cdc4d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -265,3 +265,27 @@ (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 (tree-sitter-origin + name + version + "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5")) + (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" + "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 Thu Feb 10 22:55:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37190 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 D0B5B27BBEA; Thu, 10 Feb 2022 22:58: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 A866927BBE9 for ; Thu, 10 Feb 2022 22:58:11 +0000 (GMT) Received: from localhost ([::1]:43378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIOA-0002vw-QM for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMA-0007k8-3R for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM9-0006Jh-0S for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM9-0000xK-17 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 09/26] gnu: Add tree-sitter-css. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337523563 (code B ref 49946); Thu, 10 Feb 2022 22:56:04 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000 Received: from localhost ([127.0.0.1]:57526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILv-0000vI-Kx for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:51 -0500 Received: from mout.gmx.net ([212.227.17.22]:44997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILj-0000s3-DL for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533733; bh=Asn5SQhUrKmk0UsEsUWYw9ktVQLhbSuZte/u9oQb4p0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EUvc9HILU5shSSGcynDR2lSqAABACoi/awiVIsHNyosqSMrNoMhnUZiufpIPbGdwW LoxyanHG6xIqdFZY9sFwkQl1E5myWbb60gqXS7cDdh7SRUtVqGEY5ZRIYdpOWxfOLw 8WdPNDzyX0x0+GCrttKc0xT9vKOVQI8Ml1cXtUYw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M3lYB-1nIZCI2BON-000r5w; Thu, 10 Feb 2022 23:55:33 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:10 +0000 Message-Id: <20220210225527.25189-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:P/bx6KWJ3jonq5bbR+6Ak2gLHq3COuUVhiRffeI8WuYvtX+zh/I gWXJQOHWJiCLR9zmXemDZJYDJoAmt9CSGRcrv8W36rYXWSh96GwvY9iuuXTFytQQT3d3/Wc 5Y82ODZDGLGwFOqc8x10AXbiZDlz6Z7HbY9EAR7M6Li3pPGNS0esmjXdiid0Tdtu2/MN2qB Dd62YXpUYVqIBNx6uCArw== X-UI-Out-Filterresults: notjunk:1;V03:K0:EuHnxOBusMI=:ue4IeAfQJCS7Wz8tSe9yCQ S8fIo36BOmd90+M8TWtddxJtxcB7YJBaytZkESBAz7vuP2sUUftfahustDQYRBPNIokFjZKm5 2Ke7RHauH2QUb+B55RgNfipOFPxqzNRmaTS782nBJ5a86BSWAtdo5imfL7g1aFILgSGgqOnlX 8mTKA/N1SOaUCBhBEkIfjpzTonHrcBIgFoAKnFkN/QZOmQ7+cUkNNAM6u7k6k/DoREypFd93s fNjKEv2BxsYQ1E3Jws5aoJmMGb9rI0k59G44DBUh+CYZFgyO0lLUfcsaiTuL0rf60a4x7ULLv o4b7rffPhyP6YWKXXc0s54JrNBf9QB/t9dwWiwoZ0ozJNTxT7jV4iWrXWq+uNgkyNugjMa+uv tfqe614cTeP/j/tfutHw049E478gDsAkG+f6bu6pkmHXE0eWL73UybVRear/XazScAlvKEq9t m5LV6Gog0absX/aTOeEI9mJ+O8uMdy6IOZQpOysUohte6Tj1/7VBpfn9a4Nfah5x9EHWLSMpG i3yDuhzwmIJFPgzCEBbmVlhZ/TnwmUBTv+gGqnuR0iCGKfZs1Ful1AfX34c4fRoDm+nGtgV3X rsbrmu8MaqppzFRhOIpYeECwlBCxHpIRW/IQsi6iykkiJlW1WA2xfCVAQqQ1Ym/+g1/Vhyz7h hgWFVvfjTV08kfPQBdVqN4KRU1nQsBtzojxSp/bU1lzCH7RfBvl1DK8xpAIMddmu4WhQK2Vf5 /1hKJG6Qymvl33aPEGSyssLivMquijPIftVuf3MPKZnt/EBKDMgGV8dNkAX5zKQvOZx1iMp2l bkt2U1zD7c0YK3X+YXkwag5tkEQH9GxKOOeCN1WPdfhkoa9T9Jb1NDpQ4SN8d1LNKrUV21PIK qPMP45X3A5BJfUAbnzUYUWy017sg0HzglNq/vMwnPB1NtwoOmu79lr8xPENEbSX6rJEfWRRTD 4IgxxGXRozkGcheScOkf+5Zjdr1PYyjDMyDINanBTi00qZq1zIWlvyo8sXTXQw+VX0QvJcvhz CYxF6YFOo81cFet8uHokbx95kjEm9QSkXbaelO13gd/54SQ4+3KrM7gsuxTGbuXU9aNs5XzbD QxG1Dumyjk0plw= 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 827e1cdc4d..36b712c189 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -289,3 +289,17 @@ (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 (tree-sitter-origin + name + version + "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2")) + (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 Thu Feb 10 22:55:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37196 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 DB11D27BBEA; Thu, 10 Feb 2022 22:59: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 AE17227BBE9 for ; Thu, 10 Feb 2022 22:59:30 +0000 (GMT) Received: from localhost ([::1]:45936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIPR-0004ie-Sf for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:59:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMB-0007lp-L6 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMA-0006K4-7g for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMA-0000xh-6J for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 10/26] gnu: Add tree-sitter-go. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337533585 (code B ref 49946); Thu, 10 Feb 2022 22:56:06 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000 Received: from localhost ([127.0.0.1]:57532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILw-0000ve-M8 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500 Received: from mout.gmx.net ([212.227.17.20]:51865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILj-0000s4-Lw for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533734; bh=enJxBVHODwxH4qeNuA2MpvZoLdFzzMS9kOiEDllojl8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=OGjo2zLE9g2TGHzKBNdMJDzxCnvecDWWD3ry7LREnlmKQmX0Em8apmgOJ6iZEmdDK /Mv918SS4ws3umwIB6yHQO9QkwU+P/3UOA46VGUrdpVWCXPs/8XdDjpERSScazhD6X 0YezoSdKEZjTmqjce7yxwBZCOEV3f/CYe55ZcZhs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mn2WF-1nzM7m3KEB-00k7Xs; Thu, 10 Feb 2022 23:55:33 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:11 +0000 Message-Id: <20220210225527.25189-10-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VKDjwP9BMyso8lZZ5Ro0KYZe6h2INquANnVlM7GbhkYURmJCw2c T9WPvH4cPcLuggLXmNtU2SNfBsak/DRB+d1TYipZ+9LPE6oloiXeC7wZkh1pHEIOc8MyznP 3UnVV1hPWE0fPsSyAuss6yCKxwb1iv50VMMrYNtRtP6C2u5WO21WLNUV6VLckmuaNQ48zxK BC0QhPPwFlXCt23GLa9Xw== X-UI-Out-Filterresults: notjunk:1;V03:K0:gu69trzz13c=:xpyR6j7D6PGoS2TyBi0FMa aBg4p8tSKGs4MqVRD+k1EF7hKtEglUoB6kjwnscv5WaDprUDekj6G1n0W6lELlSTRc8qt9EUU s2bH2giq1gPJ7Oy2XcIS/gQey1mw4v9jqR10RIH53FyKGr4IzwqvdLbfGcI9A+46xsyLBVHhS 6ZsqmEGMsGP/LX9N2BesUQC1LDlIarQOn8/u5xCwYJZOZbKzpRWM4o2Y640HxCCcxecdIGdJY msTLSKL1guLOMsHla2mpHUyd9vbW9VQfEMdnWZQD+rtvMUNTcbCbSIU4TILihqCZXtALAZhSf zjnRXhVHblC0YAQ9Dx7yrfZjvkZLvZoOu7A4WxvFhDDIdsDdb2HjheROmy3qGGuCXifPg8Pw/ 1ddoDbGEVOxIlWwUEElO3fsF+L6mXJg/7SDQtIM9yMNbFJCgszzMEPeYGqviesJCAnMqm/1n+ /H3nwyGwX+80MIdg+afaa/d+ZsinQzUxaTQ72KRD2lDXmfWAxtvj3yiBmIDzotL14RbGBa/Km rWBsVCAtUC4TJTN3KcNh/VMZRzk759y7M1P3yPYAGgjmuw/w5Q1CzNjVaT95B01Bb9Sk5nZ92 Id4gyEcQ4qnp43CIoXkctcVcj/GHZ/88NcQlEsDlyAB/oa4xakaRql7L8zHeIqia5PJeljRMF gl2YjA0wyuWvv/odgf2+GHvsJagDylWR1Y0WCnGAw3vprlgte4NLay9LakasrbLu4UklcoXrd Y4ikmVhYEXIrMH3n017DI7JvCFXa53/M3CGqNyCfNmiQIX++9//murA5M1ntemUafDOy0D11N z7R0KpODejOgOA7hq7Sa8InInJH42QpAcMcJ8G+BHmPybTS62WcWYH7HwedZ5qa6FYrVCWBCx f5w58G0VuxfBQgV1IUdUyBUc192ZJdT3fDM+KJ9rDrW++LUr6Vqw7Cv72QpJ4fQdZJDHJWH4z qyiR3JM1pB0qxyfH1Tz/t7TSKJ3Hc99LZUUTJ2l6/bcG/F7/FE+aFRS2ifhTcBVYeBX6dbmqt vDg5gNLkQXqAJdnXVfikjk6rY0VPQzRsXpcgLV7tCkAw2zvTcD1IhUCwd2WQsNufgS38bsl+0 MQzQWHC0odQvhE= 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 36b712c189..47f102b0b3 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -303,3 +303,26 @@ (define-public tree-sitter-css (description "This package provides a CSS 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 (tree-sitter-origin + name + version + "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-go") + (synopsis "Tree-sitter Go grammar") + (description + "This package provides a Golang grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Thu Feb 10 22:55:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37183 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 C90C627BBEA; Thu, 10 Feb 2022 22:57: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 9D7B027BBE9 for ; Thu, 10 Feb 2022 22:57:48 +0000 (GMT) Received: from localhost ([::1]:41174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINn-0001TZ-Oj for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMA-0007k9-3h for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM9-0006Jk-DL for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM9-0000xS-DL for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 11/26] gnu: Add tree-sitter-html. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337523570 (code B ref 49946); Thu, 10 Feb 2022 22:56:05 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000 Received: from localhost ([127.0.0.1]:57528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILw-0000vQ-04 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500 Received: from mout.gmx.net ([212.227.17.21]:48883) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILk-0000s5-1L for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533734; bh=SQX0M90MoGatCom4hGPOpL3o2l+TL0s15aZHZmfseCQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eaGdUIJD446oKEJG2raowJXLfu8f9OF8usYEmlKI4L2O1XU9G/pi2Gbsvn6y4Az/p BXUOr5Rg5Ata/JabXlo0kIsmpEX90mu8mHUkq+J/7lmZwVgxgT6BpfzjzxzM9nY6Up wHcG3mmWvdXELRHmIua/93/VXTr1ENCVoKmuO8VI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MdebB-1nr4w30JPd-00Zdws; Thu, 10 Feb 2022 23:55:34 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:12 +0000 Message-Id: <20220210225527.25189-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ambuxgNEWOdvE2zslPW95UI+4GdysPY6/n2TXxug0VdA1BMqaDB 4jsWW38nYORrQV4L805PdKZik6p/9IGJNutx4dKhpzFSDo8czfRy/UrorXg+LQVmN4m3N51 sWqOCvh9LW/UlaieiheizKruRJL3BKzZ5GDwXCtIZefAtgAOZEe3713BXP62lbreLglQ2Gr qPMJVhnaDVqhYF1mPD35A== X-UI-Out-Filterresults: notjunk:1;V03:K0:Q8vfcPJ91v0=:8+pWlMFj4MP52UyNpVQFu4 Q4GyFc73eyPuwcqpzKhcuH3bcHoCX8vzD89lN5Yg6haMXZXC4iX+yrJGCl7qEsUEzQaNssVI7 delrUnb630dIBYBLI4tsGpVKMqzoKdCpetU9pJKik861KJz43pkBaH6C5OsfIk5gB/ESMbj1M aRb2vtx/o/9q2blx1RrmZ/+hGbe6izucLdJbCw+KMdIlQPG/UT7FIRty8zumOMQxUubQu43mG Ejws2FzlVleeawKvhaADhSNRQ4DUYwQ5Pq5Dfi4jOi7QlCqPk8xiCzLXNxFEEPXS+FX+o8jPK ldpEdGrlLPgCgKmtHiR9S3spt7jUT4MBcPHOgTjXAbXiupZnGwpHwJYpz4QdJKfWRAZiFnd7b T8n73AfVsS9QNjiGPjGoXiisLLg/nCFCEDnOmySLlId3Tcgrdy5FfQO9oHC5rTi78npWTVc8r Ws7NNSjoyWaIseuPTp+GIf5g1m1H+xOkCM0xWJCdsRk+Eb/Wjlq8fCkX9Maa9Olc7QqPkWX5H X47HuM03DjIvrmMsZ/5OlHeXOvT6QZZrq63Ord2NF+QHT0GbiHAu/YGsyxEeByo+2aqfc3gqz M6qgvF1WlXIMp7VjkB8z3aocwrdFkPF+d4ECEtxLgQJsE+wINZrwthpeIDpACztt+11YLBzcg 7SfmImEw2fLsIK4jCXcNFo+Hw+vTRevesTT9NhiSyb6MfntLTEQexLWk1s6aPNyaD4LVj2glq j99e4p5NKmTDH5ykasSS3teeLcVx8IKxlftUW4GOAQl8Fkbyoz5OEz7+MlbMTwwpFDCVxyNzd c5r+zKECOVpi68g9IgZ++DfnPGAA44RFWddQIpfysNt+bIFsLoBFikPG2/B21JzKVLtzilNE3 BQoJS//yS8/thxk3/wP23bZhAfobicwmhGfItDPkETLen7W2ZsqkYDrzMMjQZFPzhlvQYsXzj 86mbU+FfqUQISVV5U3qAIDko1IqZaWpc/cq162/ILNY8Emvu0Ngr+5DrWOf/+lGMTWi/iw8Zk RJZ02c2quyWBjuQwlnxjb8WmDjpjfZvGG5FeZEq4sLocIXDJUnQev5QPt6qR7XDUgFH0ZNZEH K7d/Op5ehYZsvQ= 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 47f102b0b3..e4679dc8ab 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -326,3 +326,17 @@ (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 (tree-sitter-origin + name + version + "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy")) + (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 Thu Feb 10 22:55:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37180 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 5484127BBEA; Thu, 10 Feb 2022 22:57:31 +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 264DA27BBE9 for ; Thu, 10 Feb 2022 22:57:31 +0000 (GMT) Received: from localhost ([::1]:39636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINW-0000Rw-9m for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMA-0007kA-4i for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIM9-0006Jr-Ph for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIM9-0000xZ-Pf for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 12/26] gnu: Add tree-sitter-java. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337523577 (code B ref 49946); Thu, 10 Feb 2022 22:56:05 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:52 +0000 Received: from localhost ([127.0.0.1]:57530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILw-0000vX-Aa for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:52 -0500 Received: from mout.gmx.net ([212.227.17.20]:49121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILk-0000s6-8Q for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533734; bh=8YqDy8iNKGhS9Enh6cJhqfIXUK9v3lEgzKS9trlB+r0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ehwvzo/lad+gWfticU9VovEbbOyMaiqwoBYrGijBFMT4+sG2YXjnOXtJQJW7+Z40j NW1deTY4iQy11dFYJVnrZKlq7ZFK4REluFQ+XMCGzvMxtLly4OWdcFuyziW94DUq9U JVOvp/wdG3Q4ji+5XYcbqRBbGa2LMfYe4YObfco0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MI5QF-1nUg8v1Y75-00FARs; Thu, 10 Feb 2022 23:55:34 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:13 +0000 Message-Id: <20220210225527.25189-12-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:5jHasRJ/7D9cg/tGBt1X+8xrB2Nd1vzKmV+TjoLeWpBYE+BLKFm DSds/Hd08Nvf5OU8Tlesw73OxdmRt2o7R1L9RHgCteoLhQRqaStIMEUdEGuTu8ICM8Kv8HD qE/otOqpPAbMyNoBbs75OTezXPtPh2Ofilki+KT7rYzz9Eic10BWfuwZGmMvcTghEdTkeLF Ud837CyUFruVnQoDA1ymQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:aCxGb+wSozg=:TjY8bw+qu9X5rOj90VI/Iw 4V4ielfCCw0J90P6e+Kgu1pXPljm0Cl1ny0gNdSF1J0CodjCEGeFf4Ze1+KAPy49S2QRvORhI ImDmfvsEt6ftSggeXKsbEBTLGJA1Q+eszgrpaDwU/Jhgq9DCeNDoXsjjjnZ2MjEVIxYzStPkF j9eFP6F++VeGOqFHjfOVF7sz6V++acyMSMekcwF1NZ2A54sbkB6BX+y0TZXfK8YnD7i6PxWvU 2kcP1GutfmuA1ZRs12T54hLvR9Jp8RfURBPrZ92bIIi6RMnsVhyMHI+Kn7kb7xtejxNoAcTIG 7GiZoRivXhGI1INP4eHqsx3AyZvuFn4dKARkjwXWMWK8vJJezofvlOVmorXf0KDVy2Alj4OsM zPbhJL0vUBXoeL0nRTFgYbKu6vsUCXIBaqKqLnpv71FESpWvFe3WnEDvXRl3jzMvkvXjJ2GyQ /IhiImtumzY1E5h2Ld7LmkRyBZk1/eGZo9OYn45jcs+TycAnB8ilVH/AjhAYmeEy32yjdS5Ia 1ofFDGCN1g/ahW0Phay6DgW0It1V4ysoEBtFxl5I+TtymH2TbTPYlIPbwa6icd+FHrNrdZVkA hsHRhXcQoIW/YI+3pprYs38//XuQySdZ73Ka1dhSEL0+kU65borFun8extFA/Xfojl3APt7Uz ebk7+o9vImF6T4zxhsTtD09qds2P2oadmOpNYpD0qG5Rl5LLjGZJP6xZ+q1R6wBkBVaQ+42LB Nl0gpnzn4P/V9+HDtD1PUjSwDaYtsyqJ2T31m8I0Hx0WeZbQpvQ/qSiLfyoUglrzHWQqLk0wm Cb3ycVcrwHU9G79qyqffyvXxB5eQ+rUCeGfEDrmfwGdRebrZAQu+wdFdePE8d6RBy9TdjBY4G 1c9fZzXE0bhCkZ+EMTrCOG4wn4/J8wxN6RjhCjxMiIYVfhHo687dF33KwPT806fis67noROla fDx6WLDtOI1ZaAQD3JqKd4qy99PWvpilNkAPeK/WuTymmYbodDeTwfxRwFa8jVEZFG7F96f7M wBwIJpfEloxTREa6Rc/EK0Cdqt/BtHuB859XaNiTUL/ByCmsQl0jNQXl/ypX5ocMvnqNg8Q+B PTooFh5d27BIl4= 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e4679dc8ab..760a7871df 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -340,3 +340,26 @@ (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 (tree-sitter-origin + name + version + "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-java") + (synopsis "Tree-sitter Java grammar") + (description + "This package provides a Java grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Thu Feb 10 22:55:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37184 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 20E1A27BBEA; Thu, 10 Feb 2022 22:57:51 +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 E1F5327BBE9 for ; Thu, 10 Feb 2022 22:57:50 +0000 (GMT) Received: from localhost ([::1]:41410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINq-0001d7-2o for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMB-0007lq-LW for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMA-0006K7-UJ for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMA-0000y3-Tb for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 13/26] gnu: Add tree-sitter-javascript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337533592 (code B ref 49946); Thu, 10 Feb 2022 22:56:06 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000 Received: from localhost ([127.0.0.1]:57534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILw-0000vm-Vx for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500 Received: from mout.gmx.net ([212.227.17.20]:46481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILk-0000s8-IN for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533734; bh=dMQVsYvC+RYaIZIxSO5oHy+RkrkiOIDCqbUzJPXIchM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iJL5BhCNEeiRFK1mwXKDOcHsO72YD2UMj6tDQdNJYFCHJ2XLc3fHxcjZyJi9SVbq/ kwFGWptQwE43k9SuB0v3ORw6l6cSTCfqIs4lxUeKRUs+/7lVA7fz/AS6impRBtDOke JkkhQmlnBE+JsHveM0QV+XXhuNK7FRT7gtvNa7KE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MuUnK-1o9ZOG2mTC-00raAn; Thu, 10 Feb 2022 23:55:34 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:14 +0000 Message-Id: <20220210225527.25189-13-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:bRpd+kC0YixT8UaeVNYxyAkDj1J4+i9tFyIj6XTTXK8cKlh0zVa /PAE32fJpnSVBXJBoYWiq1zcnse9w3bYXP/W2vyFiR/hZ6d3Y6eaNZfm+BjQMyISqK/snSz 4j8q/gI3CTEMQrc8POQLHrT48wlPppzRVQk2sLO9fJsTc0XThTrdRQykYI17fu42wCK/ncS t3aBIQzLiSu4DLLSycZyw== X-UI-Out-Filterresults: notjunk:1;V03:K0:SSpGYJm2vu0=:aS/GqI79PeHWVy4jmD2paA zm5YGWenlorDnPBpVbgzDFhfMsULZQ3QUvJZlnBkub0UY3VdMnCKVVAWOaIrrHr3H9VXr5L85 ucvqXEh1bSaJ6O4r/UPajdgeztLT/O3e2miQ9HmtSoyJETAOdGBuEw40IEjpABCuDf5F17vkq iCEMQihc00cE5R5V/4sSIxvolqSrXnSp52hHfTFjS+lGTkxdUlQO3scH+G7mboW55P4AZV537 QoxTkWgYyxZzS7chXpqxNjd5K+aXeBc127LxTfFsPHFZicdrPmldffT/Oj7UQlePN1qPqZXnI Mv86NVacIJZSzEzbtPx8WcSR+J/8bwXvZ/TX8Zw4jKTMcOGgIxUQqAehQmJ0anTyUb6xAzQNX CNvABu7xfc28J6QAorZfIhZq/ikntCQsWadWnwIjNgrjAZI/QK+mrjBsdjwLsmq0/PzsPKlKj fg7O5OiTAzsIytnSXJ7L3103/6kePMTJawQsuV+bH/MOeDcbL/2DAL68cXNY2Fgc/2Hx5EIup r3R6+ylcUSYAIGC1hnUkr79K4lkP9xgF5n9Z8W4xgfQyjdPvFacwjP5cxtULSpCIQkaSt/3dQ fnWnPFI4ChFEx1XH5tyfAU8nagWJN2AyOAEuP0YPKgq1GTUA8/AMygrIBemPwRdjYcD8cCq8b uAUz20wArFI1g2/W2Gn6wRkwaO4+QHX9u62I1bT1pyRVEOhM0msa0zgr7DFn0MYJoZk14K87b /wSTLzf7xsDBkV2XnNuE2BTH0v4VK4VTkb6K8Id8IJGAn/waktG3mYzZ9IdLDk7yTXaY76m/Y tTWquSR6TjrFeSUuWffz5XpuXfF8I2+ZiqqNb6TwSV3sKnxAi3wfzAl0oT67c717lRnax6uTK MM7GsG3utPf+c0P78Tb3F+3T4n2GLD0wYYZz5E14QciFRh8WdlaoMJaKCBlcqYVSMxfMzNFlj s9zXw7KTeWi6WtCb72Eui5bKE3TL67vUMwi+HrQRJuna6xMOsJmALxMvAZvK5gBgNV4641uPR B5MQzlTGOVxQWndGQkiWmuVfWZiXAapmbdpJAO/wtxVqaTNwwyfVkd+t0h2f87eo4Mf/7WECx 63C9vhim76/98k= 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 760a7871df..b728e6511b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -363,3 +363,27 @@ (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 (tree-sitter-origin + name + version + "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-javascript") + (synopsis "Tree-sitter Javascript grammar") + (description + "This package provides a Javascript grammar for the Tree-sitter +library.") + (license license:expat))) From patchwork Thu Feb 10 22:55:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37186 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 A5E8C27BBEA; Thu, 10 Feb 2022 22:58: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 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 7ACEA27BBE9 for ; Thu, 10 Feb 2022 22:58:00 +0000 (GMT) Received: from localhost ([::1]:42324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINz-0002Ec-LO for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIME-0007mi-91 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMB-0006KQ-It for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMB-0000yJ-GC for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 14/26] gnu: Add tree-sitter-json. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337533599 (code B ref 49946); Thu, 10 Feb 2022 22:56:07 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:53 +0000 Received: from localhost ([127.0.0.1]:57536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILx-0000vt-9d for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500 Received: from mout.gmx.net ([212.227.17.20]:35647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILk-0000s9-Rf for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533735; bh=1Cbsue0xqYJHpRoPi3I4HYTFLA2oZXH9cCBEw0O4HGU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jTB5YGIdapPh+xxSh1MFyMEuC08ls4U61F/R/uLLDHcgGrJZw5XPiBW/PANwlX53F pa2KQvE0j0x+YftW6ysob2WDCcVSc+sDhLf8mco3Du+3rtiWelLjNNzP7nSyPhpc7N /nhavaKleG1k5Wf4dGouHNsssIY8UutBW0ZC9kdM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mnpru-1o7KLk40K2-00pK5F; Thu, 10 Feb 2022 23:55:35 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:15 +0000 Message-Id: <20220210225527.25189-14-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:fp7Cqi9VJap/vvwK1B0dyF1577u5wUU9FEWYNhmmHUKe/ZYDaD5 whY7kkjRCBJ34PzX+9kwTS5R/dJcwxUJ6GppPhW0Zwh+T35Y1F3Z3kWIe4T0bRiSACHsJu1 8AP+LMZcVVb6nGVxjdXT2ib+vsiUx2buVlC2Xl5uHyYUMqG8kwxbcz94fZEU5Rd5METKj8d v7cU6UWqgxFQJQ0dKUNQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:jxds1AF/zSk=:569ayeca/VDEw/wsk53Kld fIlxbYDII4MfJQSUknKp4/qQe1agd8ebJCpQCnZYRNd9d22QhFkJ5K+jvDeYAS90SZNi7Rag2 y1oNxnUZ/9sqClkdSmL1GSnUq9vvBUcB8ey9aTeNj1uHF9FmTsxwdbYGdnivKfgrQtGn3PGTm wVGC8ZLcAJTSxJTUEdGciXpVlV9nA7DTOnCvfPNKJl4NGHcjRb2vXVkKKyp7e2RtDUY3mYzRo Hxw8isHswYPJn29gEDBBPcK3DZcBq++I7JF5d8nTQyU4Z5Lnz3HAkNQ+jS3hA8z1GR8M0ct6A Gk9vNOnlnKEBG6h8ERJhzkmNBqRq2SgV6AcHfpquYz6zfnL/QD8Mw5XU79Bl1p3KA7VqL3X2f +k4RKL0QyI6ornrCHM/evlp5TXndRbq3ErIbtByKIQgMm/eGQP8AWFwGRVAKYWzMts2qXI0E1 ENmEg58hsxGxNoNjvSLjB0TBUzNNIIJOb5X+3i4pweFnkpGi5v/X+tt+/30enYo1sLHzYGUyp 2EU6Bt0OR4JnvpehK4gyPbDtPWI2PgSD8FSGg7QXIjc9RhHu44JZI4KPGuKD2CFeDQpt/CkPN 44mhDlLA2bvh07KIx+noiPEJAqbmwMPbERO+fwogRcrOWaPLEZPnUKgZYb1seLT7d3UVUb+p/ cyrLyZnTPnBUBGbnG4fRzU6YSU1LhMNqzDA24bRtMkV8EmJggIZI7eRzN5wgfPdWF1fuPHZQo pLgKxK8Wqchhw7myzD5P5ZY5ZFwrgmPT6gk97rFB46Aa2CgTql0Zhj1iWe/izT0HUwtBjHBBU 3Rb6xXnWY43CFLJh6qBKFJgnWdDs3N0DpeQKu+ikLGBEnDJbZV8TRMk5LJIs9U3Ql1SsTnglb l1efJ1VjVNoS4Qxc/CiTYGPwO5CB98KFX9wnaQXbNQhOPY8s/o3GTuZlSAVtmN0JjTEooQVw3 Yu6B5Y4J9o/CDpmTW4/nBFlQ5akw48AFTpRSgfc3am2xz5AHxbs0lFhvFW5g/TvwDD70c4h1C XO4WvoYWz+Rfan6ZaxX3BtPsKcFmAEd3Ve1iH+K7Hm/QyWHlNbIgD4DBlpAdz3NIXxkGizn36 3edRcWP2/EMQvs= 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index b728e6511b..d35edc533d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -387,3 +387,17 @@ (define-public tree-sitter-javascript "This package provides a Javascript grammar 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 (tree-sitter-origin + name + version + "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff")) + (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 Thu Feb 10 22:55:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37185 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 D2DA727BBEA; Thu, 10 Feb 2022 22:57: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 9D7C327BBE9 for ; Thu, 10 Feb 2022 22:57:57 +0000 (GMT) Received: from localhost ([::1]:42026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIINw-00022M-QZ for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:57:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIME-0007mh-91 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMC-0006KS-4P for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMC-0000yX-2X for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 15/26] gnu: Add tree-sitter-julia. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337543605 (code B ref 49946); Thu, 10 Feb 2022 22:56:07 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:55:54 +0000 Received: from localhost ([127.0.0.1]:57538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILx-0000w0-MK for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:53 -0500 Received: from mout.gmx.net ([212.227.17.22]:57893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILl-0000sA-35 for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533735; bh=ZHAhW5W0cMRDguPVjvdeALj2kEkjHBCbdapWNxUY420=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=h7FYIKOtjGodKZ3JmKTSj2KZ72wJxjtwRN89Pfsu0Pv4caMRjp48wDfiJ5RcpcLVx bnjVx9kEib5n1f84cOF2DyFKnKsAuNVHOJOjdx40aYBjWVK0TObTM+PLmKDrmqhnWM BR9M7EXtbt91kS2l/D3rOI4Q9xr7RfgyqXvozhxc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MvbG2-1o8SvZ0y3S-00sg6L; Thu, 10 Feb 2022 23:55:35 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:16 +0000 Message-Id: <20220210225527.25189-15-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:8znVq3vxoGoj3AARi5A1jwsBFlA29mX8h7tTU1/FwXwF2NcSOOa ObtOuTFU3LsU0XZ3dQTir4AMZIulwmAZsY/KoB2ZA/0p9/F0BRxBqUTQEVp91cfFoEQU2gm zuGrzbHAMtyd9BbV+2icIeJYMATWFxCGN/1XhAM8mrcVr9449Db6SDnd/yNdHMHbBDl4oA2 hILNEwfcKTAgqZQswjmzg== X-UI-Out-Filterresults: notjunk:1;V03:K0:MIK39cJUZ2c=:4hXUBkbhCCZ5QTOXmNM/z8 H15FGOJb+4yN21cAUPkVSZNrmUM21HWkj3ktDqsjaHJ9CUNunhvT61+1Ad4WgRHF3xtnCnVv3 EhCuoXimskRLxKkKDsqJ7ue6Gtw+3bnpNZTeiRkpXEiPNBQgiDNJlCSAHGWHhRoGuBR3JXM6O eTlcJd1/m4i+XqzWSPHN0dKPTGOe1f8AxF7YXV9DN/VtPhreMJjn3HuSeJqifGl8fDvspDPvD 7ybL0g4Wrg8Tvgv/XpSTsdnp+c5JUfUbWSdEqxiQ28O6nw8IQBKd8h8wviVPSvtEvBx+Rr0yk Yo8gqvbSKRK4fO7iGTcQjJNehl/X3de69AsoRT150HWCA6FQsjx880KRXM2O1KRRxR2XYKSoi EOk8xwE5Z0S/D5WV7lg77flYUV3Gy1rWq7Joxp0qVicHiTEbC1F+E7fSWB7hWCM5V5r5wqv6E h8eoPAmUJPBrqR2WOmc6oSg7jgBsnK9LDxH2AovrldO0mTJ6CvqStt9E0ze2Z5eEfWxgaD1lK 96auJOBFZqqqEw+kQbL+uPZ05W0fOmtTgLeDWwSrefMWwXvfNaAgIeQtjOshpCQ1E4MVVsoKI oOcCIPJMZLsMVh5qR78T8aN2w549sYw0gLjvt9gb8SbdQf4PXN24k7R3xZHsr6czS74Zs1kjr woBNrLg6v5RXHPNix3R7rze3QVbE+xwNaRnkUMSq7juWU4UC1IZX+yiCLvXW7yIwVg0CjqZ9s QZ4Q3s/kLsdF1SPHw1s2YfTX83H086u/it6WdxxuR33AQwSJ/+3tzwY5fKxMype3W8WGxXHG8 TM11Z8H87WrAa/66bi5/nXTQlv8WL8GH8NUktQF5p59j4jwQ45pEt0aCxpKWJWKfWVB9jk5xm Tb/s6Yxyg9wUdwDUm1OI82Qfh6ZYWO4B6YTQmGfiWvSnGZgJ8D0iQ5tmLjXX2Mjo9KlA1+zHK oFqViJcpGPKMiTv/v6iiRpR6Fihyw4jFZLaT4pQAPOD51ZGV24cCIVPJ2j26vstLtUfPwAKvV sEMULrIdlbA+3rh7IgFoEgQb+l+EQW9iLteTYIDWt+GVm4uEQu7OvYZNtGNCyf1T0/SCitj2X J8U1D5jBIiy3Mc= 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d35edc533d..aeb541224a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -401,3 +401,26 @@ (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 (tree-sitter-origin + name + version + "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-julia") + (synopsis "Tree-sitter Julia grammar") + (description + "This package provides a Julia grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Thu Feb 10 22:55:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37193 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 4C74727BBEA; Thu, 10 Feb 2022 22:58: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 17F7F27BBE9 for ; Thu, 10 Feb 2022 22:58:24 +0000 (GMT) Received: from localhost ([::1]:44260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIION-0003X7-AA for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIME-0007mj-9H for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMC-0006KT-K0 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMC-0000ym-JU for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 16/26] gnu: Add tree-sitter-php. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337663712 (code B ref 49946); Thu, 10 Feb 2022 22:56:08 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:06 +0000 Received: from localhost ([127.0.0.1]:57550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMA-0000xg-1F for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from mout.gmx.net ([212.227.17.20]:48119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILl-0000sB-FQ for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533735; bh=Hhy3g256jZi53Ro0BkwJFm9eejZRrT1bHcC3+V+fuRQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=a7XJmy7KP8zlQuwIHqmtNCP9e390tIl+2qOUD9WekLBuLt1sHKiZrIkFfDzR6/bYv aVV5gWsAvrJQPYCkCHVSmUQQz0yNSNXv3VJOUcJmVe4yDoWhCgqbl5pOrWa1YhXEpN TQid9aSKgjPKXXAr380i5KgUS2ii8OdURCyd783s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Ml6qC-1o1ICZ2BVE-00lUKJ; Thu, 10 Feb 2022 23:55:35 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:17 +0000 Message-Id: <20220210225527.25189-16-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Y3jxTKtqOxlcZ3rwjk/4vzfSdIty66pxbPm6pH+bpYdyBF5aUx6 ZNDend2z5mznmGwRSPfieq0j2IqyM+jygU84VcXKizj+4bLTdAEGEXx5Ha5HOnlwuG+Syya tnIvx1bIIzQy0NL9v1b76ZeE2yuajrlWD0B7ttjaPYp1Kte+PcNwMwFahwjKtDNPiwyRTkE beDpvVI253Zf27YqZVzfw== X-UI-Out-Filterresults: notjunk:1;V03:K0:XM41TOozwXQ=:vjFzv6sA4RjJM/En9TrNJF nHST6XndOMRuJEZFKnnntj+alOldt3uOzucUCwuTkqdtTN/KTomMxjqhWe4Dpt4kxjMRZS+ks 5d5RK86vht3y6VIzMv/bz53Opc/Fu3cVyRDXqp6NeBb3muaS5e/jXXRHqjdL2lMS4/CQgrp2K DYpY0evi9Fr9h0tmm+tw4cnuoxWArG8BUK8ae/SfIti+D7vD2cbZBqP/KTTEZtQVSv5PpEvit av2OMZuP34Dlx53IKdQGN/l6vpNx5qjXWgYiRd63FLPcVeVjy0Vnn89T7u2nQFAtBzR6+VAad R4aI68oouEprm2lgYpg+CHbblqsSVMWKb/dJExoiXdy9MROwkoi5M/3ymNCxT4Z77kpw2SbP0 bz6Q/vRJXi1oEqYp0R+dTQ8pKBvemMUxOJwy+fXC67jlzwXLU1CxrATHqyZeaKgqWI1vpKdf3 UuqxWi4NM4AHlgtvzWjuntHXcVlDZ5DzHYy/qL99pE+fLMHh0a+3BT4X32FuZP95n7ltZ6ieZ 5xH287Y0hwRkEpyvzsCdtLkk4FzJm1GbHyW3JrAJTO5L7R+IPJZxaoSGJydbjLfRIWclWpnoa BSsIDveewvCdsNtl1kNJPCGIwDGdYsZ6ObXXJt0EQqFkMkuzGfJiXgLOU0bR6wAEcinVEvvbf kResWtfdBL5SNgE1GckLzp2h9oUdWd6qJxNOUUoC/5y0GmpgBt5McRth4I5crj/mUnC1VzDwV U+gY9TokUnfR2bsVorajthE1rgMYSDiYDrRGcEmpKGuJSlwxwzr+2J8KP77kHaZ3ycMbkOBC9 kQxsGnzeosyptqjZPug/Vxy4M93+yOk+/MZF9g6i1Z0QSKSaeZ532K4jfaaYLUkfyR22FHGDU Q4kIxSrouV60Wo3E9Qj/9r9LgwHOwERk4KGq454XyoeTm5gT3i5ReqUn4A43s3a5gQbAj/gU7 HiuBDITjuOPvLWPB3V3j0plKEp039NH3914Iex/GEqlqfbHrCXSkfHuUXkgIfBySJV4IW4o// /hsQmjMVPBFyBE+FGCpHwvBh84kT5NI4nP75ztUKtEQd4W9oeDxl0hKNmnbQo7Q1UpLsOO0Z3 OCaKuRINY2H4Ec= 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index aeb541224a..072d2bf588 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -424,3 +424,26 @@ (define-public tree-sitter-julia (description "This package provides a Julia grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-php + (package (inherit tree-sitter-c) + (name "tree-sitter-php") + (version "0.19.0") + (source (tree-sitter-origin + name + version + "17cmybgpprw7w9d2v7lmc6zmr90d70g0jqq279gzg0mpwfzla53s")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-php") + (synopsis "Tree-sitter PHP grammar") + (description + "This package provides a PHP grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Thu Feb 10 22:55: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: 37197 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 83B7727BBEA; Thu, 10 Feb 2022 23:00: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 4DEC827BBE9 for ; Thu, 10 Feb 2022 23:00:38 +0000 (GMT) Received: from localhost ([::1]:46350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIQX-000509-Fq for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:00:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0007mo-9e for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMD-0006KV-Bv for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMD-0000z0-AK for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 17/26] gnu: Add tree-sitter-python. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337663721 (code B ref 49946); Thu, 10 Feb 2022 22:56:09 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:06 +0000 Received: from localhost ([127.0.0.1]:57552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMA-0000xn-9l for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:06 -0500 Received: from mout.gmx.net ([212.227.17.21]:48351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILl-0000sD-M0 for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533736; bh=+PfeOdmN0L5Hnrbd1wNUsKu1Lq/ppR3rRSofZYsD4JE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JNbkrM11tTiVbveSgudwqV1V0/zJoUgGNqKJIDgoQuKvB7UzcDqnWZIVVjeA/bWuJ hA6P7GDwmHGp1kCxLx4Hxkd1GpCvnkIyrz2th4+q28RCB0mNEOG/GW3p4bFI1RD7GT +dU/uqIGsY7td0pt4agKaaLvIsKsOCKJSNlNggyw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MCsUC-1nR82J3LSS-008rih; Thu, 10 Feb 2022 23:55:35 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:18 +0000 Message-Id: <20220210225527.25189-17-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xUsSDTlVUPfXKIqimLoe22M55MAA5rCnNriJKc+jfJQCs2tsRCe lEcy+f2yHpmpPd5Sux5U5qe2CjBdgBaAsH2eM3NIKuiw1NYTMujB0xnLXxlJrSZgI769ATG N0aO0PLkeHXmByK7xrn9NthVSCNxkygT5tzLPqHYbJnUj5H4BtNicCQKeghgJNGS01U4zt/ 0IhqLDf5XNdj6vYq2gjnA== X-UI-Out-Filterresults: notjunk:1;V03:K0:q9Hs+zL8xbc=:ZaNndLC639ILVCtElawyT4 V+ZXzprto7c+tIcVzlexzo7Y/vXITf8oSnCVocgpieFD6St6d6l4PPqr1/PmNX/uNDBKVl1rD jbjk8fAMrJf/8Sw5sfVFy23dsCI3hLqRxvneuZTk2/yf5Yt5IA2PJS6W8fZUVruc8+lqIyxKp +w29bXNca6Ro37gptfR+ARoIzEbqBPpD57rLHkC26mmhR5UvZ12vPoDEhJ33aBvnOD094YpoR PgEexZXKL+BSGfZy1zUGlN4ujPLL0kMWiYELGCslOD0IeC8XXsC0RUipi8O2YUayewQiwc132 0Jr964Z03M7s5R4oby+v/vN1hGYxOlbykxFsxec3vtAQ96CfD0jKcwma2X08WsZFzDwHv8dpD Z3B77F6FmyOyvmDMbZxS1V1diOShxihqGVHo3mdNBvBhJt4LHr61XXY1qH7cgoJ3i2CinnTTH 5d6aQZWHZHJhRd9Q8onEMYxo1hIgKEGAGOmPZkcQvuo2ONHyNDIJBHDiuohm/FdDEsEU9eSqr LG/GQZgM+d4R0lgeswWqpJCvC0hAzrVxcPQtZIdGqiPLPWq+0bAfiTosCv14D2Jv7WM4PR5Tp jKABIOQrx7MyEllT/Wl8cpV2SDQVjMd1n2TFQ/kC/0dVQykcRyCFqgKyzjEwstBheB9A/Az4B Mg358/mbloYMa+Nv1+K04qQiWdVK5Yf+t63yMjefnDWCQIM7kkFcMQDt89LOIY+S4nYTFIt1r pk07Of80rkwD5j2X8tS5TDIqtUMGUAi5bcgBbHENVZRR1xrjctGX+JpU70kDwcBXHyCeU3eXk HTTjn3RXSa66AvBIEkU1AvJy9pRdtqcbmx/MTF7Z/jnDENQzEgtnc8iIyUiRi90FQdyMuK7YO K5RJOy0/WwEvI/MPl4EE3UlGWR/5aDVsrrtHIZrslGbRduuI/niVagiLcs01NM/Ujc/NlBfsF JBfgqX5ncx9XC3vZ5Lm3rYX3NVleZPi2s8rZWu3RMJjEkBfxPRZWoYDTPnF4SQojDjMTC07SK Z5wF7tH6kOHeV2Ey6DpugZYl4OnK/tsrjFEFXkyUfLov3oIiTxrn0cDQSAQJK8KjTqjPU/LdD 7MIp2Jw6rN/wuk= 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 072d2bf588..05d6ade77d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -447,3 +447,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 + (package (inherit tree-sitter-c) + (name "tree-sitter-python") + (version "0.19.1") + (source (tree-sitter-origin + name + version + "16i5mcpz4ld0rybffb0nxim4crb9fhnnq20b4bkjs7jjr3zcx7vq")) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + `(modify-phases ,phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))))))) + (home-page "https://github.com/tree-sitter/tree-sitter-python") + (synopsis "Tree-sitter Python grammar") + (description + "This package provides a Python grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Thu Feb 10 22:55: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: 37198 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 C376A27BBEA; Thu, 10 Feb 2022 23:01: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 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 8C13427BBE9 for ; Thu, 10 Feb 2022 23:01:16 +0000 (GMT) Received: from localhost ([::1]:46780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIR9-0005K9-85 for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:01:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0007no-NL for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIME-0006Kk-FK for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIME-0000zS-Ep for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 18/26] gnu: Add tree-sitter-rust. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56:10 +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.16445337673749 (code B ref 49946); Thu, 10 Feb 2022 22:56:10 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:07 +0000 Received: from localhost ([127.0.0.1]:57558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMB-0000yB-5E for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:07 -0500 Received: from mout.gmx.net ([212.227.17.22]:36375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILn-0000sO-7R for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533736; bh=P2Vye6K3erYyoGW0OdWqqJ89HOPlecdQ8UmhHE1dNiE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=aJtb1tlkLQpgjKxjZz1iRjxLMfEcKWZEBIctTmfbFzxixLAP0k07zzQO+koi00gM0 xukb5tFTMYou6rC+U43OxGeMrQ6op8O1R1Hdyde73LjvdsCsyElNyj78ObMps/j1zM dLDXH16DT0upoJWi2GsvcGMZYuF7gJseTazKIgEY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N8GQy-1oMEps0KNE-014FdP; Thu, 10 Feb 2022 23:55:36 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:19 +0000 Message-Id: <20220210225527.25189-18-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:B8BLb03HqbTekIeIYEWNTw84XAAvD/CXetD2iqjIgQlfAdOrQnF eCJp1Cbt1XzMlX//npdjjkQOzJ1uw7vV8raGQUFkQ66gu64os9lXew6q17XAFLi3ak31m77 /9oe0wEXdpkQRAiRxorT7puYrpWmXMuu1bzWyY3hY4gVtELTs7My5q0L9ICKpr40lSVO9hv igMfz76WrSQduF5xhApQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:REGd5smI0Ig=:hXVWPTdEGal9PekG234/Tb LrvFoPrLkGc8+RFjlCGFdZWiBNu93a6l2mrWM89aszDCG5vvUoO6+3pA8Jg0WpHP4jH43SeGJ V9ViMYtRipfdPR3fWaTTusC5lFAxNUAaQM0r3rQ2ibszbFEx1AkAzFS0QLq3jIIB8Z6SkJ7I7 x2+w2/LBMs4Zh4rnluyvs61n2Wr6QKCqtz4HjOA7Ky/1+XWDM7Ps9Oo038M/PwNAXbMq8QI4D +zqQBlmaFCrLR+2vMkJDWCmNsuFkMdBMN7A1MrfqMzUC5x1/oW/LA8FiyqRaOWvNq1nOhBJC+ jxy5KtfYzNfulC98BmMTFphLvdO4BHkqQ/7H02jQJgT+abHc7s6+LpdLM5n4vEhkqhqqwE4hU SJ2esbkg4BQrwJe+d/oYNxFbRHQDpT86EDdQKM+xlzS5J2IzxV1efHP87wrFDEOb8ffuCr02D ufF9zdXn5MxRb7CtL0vwJ27b4H/12dndW6Z6V9YUl6eopMUKc1Vz0npkEmKs7wdwy3O68KGPu ksisHTu28CyQPa2QiO8GVaCJFllIwhDZltoYguOIRzOiLzNt2e1dBgFOQmY+2+856W66DH55h c4Qa77qG1W60Vck9nI/3rgn5yEu5zUlCMsFqmEmCjcrrmPe50XEfNJ8gT8yFSqxxO9OY0oIJb Y04cehbCersFwYIJnJMnBxByyJgvIugBlCoCTxLKjAkU5rKs+EMF3n5clEKgIXuWBVkodtUvI m2lNrl+2wHys5lCM9rsGuZctJg4BCEUry5k5b8WDwkj3t8vYXqMh9cbvFsyzz/bMdO+7FUDCX PyTbACp7ritTsxGz1YgCbFo2M+hVeP5ENYvVpv7hxTvlRG7ui62MUf1/rH1ZIXjlxAzgNpm37 VrRNGijn5w/HbAX66kSaB/8R5EvbB5nJ2G7cuUh+P4cQdtOKNmuQcX5ghkNrjClp5mawwz2Re UAnJJxhfX++f8DEM60QL7ykMN0vg8zHU9dVpD+0inkt+VsvGKsrVNyKn0PlE3ZOTdF7u1JwcB JtJhH3AjklVIhhA1pcqc9xRGHw7QEzKuEtEn0WJGVMPtUaPOK7U/WIkXJav31pZmlCFGS+1Is sDr8xnSnTHWvYE= 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 05d6ade77d..63e558f50f 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -26,6 +26,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 node-xyz) @@ -470,3 +471,20 @@ (define-public tree-sitter-python (description "This package provides a Python grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-rust + (package (inherit tree-sitter-c) + (name "tree-sitter-rust") + (version "0.20.1") + (source (tree-sitter-origin + name + version + "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg")) + (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 Thu Feb 10 22:55: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: 37191 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 25E6927BBEA; Thu, 10 Feb 2022 22:58:15 +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 DCB7227BBE9 for ; Thu, 10 Feb 2022 22:58:13 +0000 (GMT) Received: from localhost ([::1]:43646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIOD-00037k-2d for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMG-0007ng-LC for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIME-0006KX-0S for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMD-0000zG-Vw for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 19/26] gnu: Add tree-sitter-typescript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56: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.16445337673734 (code B ref 49946); Thu, 10 Feb 2022 22:56:09 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:07 +0000 Received: from localhost ([127.0.0.1]:57555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMA-0000xx-M9 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:07 -0500 Received: from mout.gmx.net ([212.227.17.22]:42671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILm-0000sF-85 for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533736; bh=g25eRCWSkZIbsY50HnVa75JdR9uIEUXO4W4z3wNRbSw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IIMRHM2lJD4BgMzf8OAZfW61t3IoVJyvx2coqEqxaoxQfV5E01PspM7AAKj4R4aSb AwfdL/tNcpQiQDs7zE039GcZeRHKHnMWOnooyMbl78kZkj6lhWGp7sTEel6+0LNQ98 imxB837FKCrfQZu1nkHbo/BhrJcGjZnZoGqG5aWk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MN5eX-1nYa9F1X3F-00J4R0; Thu, 10 Feb 2022 23:55:36 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:20 +0000 Message-Id: <20220210225527.25189-19-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:mBss4GrX76xSO2luVyo5H3Bhl7sKLBEZm5HwLSbltJkyjv7zBcr oFqM1l4FMgKGvEhSPLQbysqIavTEmkkAuG2j+7PSz75s0JfTFRRLSr9x29Jzww7Vot6+WYR GdiuZVNSAwfkgxemERojIeKA0CpCGVs2VZvHPAC5IfX4B35APQYaN1/yn6i6NF5Lwo0d6u1 RwdjNMfp9zStZk9D+pcSA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ieK+/+uQtEM=:d9nyDqaG287C+XKeVm3G4g YR7hr8czRckMTaLm2xE2ZNWdYPpcukSw1SbadQJQHRdcVxZWpR4A+fBKoQxmGduMnHOzZOgJW kugpSsBEKamzOnXSc3oSIVoZ7y78xqMl9xT16Uk4ALYTSs3/n1Br+hesZVkTYYKi7kd+bnDHC cofdthL2D38Y3OwX8Z1U+QeaEhtkw2nRVQ3ashNudKXVqIdST/9Y3p855CTQna+a/rQIiHwrT yf6qSFLeigO3hVilt6x8BIMfJ2xJyKv0uIpkdQT83y9/plpjndSWUzd/t0zZia3HbB2WN1QP4 DmxFU+cDSg0PTUAj/mg2k1mLTzFyWZbN66u2q/cvR3YEYMIErJ9u1IOSQY3FKdxR2qaOfGzEq r1ccYrQ6KN509LMxU4IwZi664bCpP3KtukxjUKBtZvW0tdJA6Yd4NrbPS+lIk6TCcQuk27ebG Ft0/UEOj+0MCY0c5fy+8JPWdHDXbDDnWpYAui5A3e6663NakY279bFVdGrfiJUO3rCXSB/0FE vUXk45KRuwc53IHrvJvfNpLvdWRVIdSKJXB8UDgU1RX2YjXDsh5fLErD+eXRmRhjXZAQJcbha KibstpPt0ywrrkCbpdFZ68lRpNn+v8fXNZ2cicKdwgkRRxCYlZwl7wi2FxLBzWVfgdy+ic4X/ ytS2FhwMbzXM/IZm/E/cv1jrxoYhGJ1Pw1M9YYSqpMZEgnP2oTNjVZUJYwdw3N5KumOv5yAkl gge0yALJamEg3MccwReZ51GlAJl8AsBUM8YUu4+iwqii4A7+TRV5/JYvd3cjYjbgzLSVqhNLg oA6G9a08bx9snygpWWfgCYrHGRh0iPdbOUPTnSx2kWVTjdHpTXF8mQGljDjLypzcgwN8oDo6U 1dIOO7rpaQZESvKnYi1+Pg2GMZwnK//uRxxZ26okV4Qz+7WvRjqnnpvqD3jswoDy2BrBNjLW+ 1Jx+9YhGMI3WRZ3TuZfSdwzZhs0mHO/hjYUDXj69nMG1o66kQvB0jpujm3/K7tLxt0XgLgsMH raM55knIscBxPyrnt9a1p34Ji6UDvxdONWmJmVqgDq4STQrTe3MrOkLWf5lctcgZGonNet3HT Nb05WECsIUafCI= 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 | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 63e558f50f..2dcf4dae87 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -488,3 +488,90 @@ (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 + (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 node-nan + `(,tree-sitter-javascript "js"))) + (arguments + (substitute-keyword-arguments (package-arguments tree-sitter-c) + ((#:phases phases) + #~(modify-phases #$phases + ;; The parse-example script tries to clone git repositories. + (add-after 'unpack 'remove-parse-example + (lambda _ + (substitute* "package.json" + ((" && script\\/parse-examples") "")))) + (add-after 'build 'build-gyp + (lambda* (#:key inputs #:allow-other-keys) + (invoke + (search-input-file + inputs + "/lib/node_modules/npm/bin/node-gyp-bin/node-gyp") + "build"))) + (replace 'tree-sitter-generate + (lambda _ + (for-each (lambda (dir) + (with-directory-excursion dir + (invoke "tree-sitter" "generate"))) + '("typescript" "tsx")))) + (replace 'build-and-install-lib + (lambda* (#:key outputs #:allow-other-keys) + (use-modules (guix build json)) + (let ((name (assoc-ref + (call-with-input-file "package.json" read-json) + "name")) + (lib (string-append #$output "/lib/tree-sitter/"))) + (mkdir-p lib) + (define (source-file? basename) + "document me" + (let ((path (string-append src "/" basename))) + (if (file-exists? path) + path + #f))) + (for-each + (lambda (lang) + (let ((src (string-append #$output:js + "/lib/node_modules/" + name "/" lang "/src"))) + (invoke #$(cc-for-target) + "-shared" + "-fPIC" + "-fno-exceptions" + "-O2" + "-g" + "-o" (string-append lib "/" lang ".so") + (string-append src "/scanner.c") + (string-append 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 Thu Feb 10 22:55:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37189 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 547DC27BBE9; Thu, 10 Feb 2022 22:58: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 9F7B927BBEA for ; Thu, 10 Feb 2022 22:58:08 +0000 (GMT) Received: from localhost ([::1]:43168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIO7-0002nY-Od for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0007nq-O9 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0006Kq-9M for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMF-0000zi-9N for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 20/26] gnu: Add rust-tree-sitter-for-emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56:11 +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.16445337693779 (code B ref 49946); Thu, 10 Feb 2022 22:56:11 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:09 +0000 Received: from localhost ([127.0.0.1]:57563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMC-0000yZ-2e for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 Received: from mout.gmx.net ([212.227.17.20]:55089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILm-0000sG-Hj for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533736; bh=V2yBM0BuNrEVzKpJYz/VmalXddCqD74QybapS1w5/hg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Bp8d1tElh2cfDlkfuNjNvINMPZASd9gyZpMbvqtJ0xjnZO30dJEZXb1Oovt1yBq50 x+1aW/c+S3xdb4wAOd3w/6CgMuvDZ5SaZ+1lg3j+UNCDvJ6zBkF+CG+wcjwAA4Jl2J g6JuYdKZ/NMTNccTh6c04qxRuJgCoAgdpDlLeMTM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MK3Vu-1nbc9O2huY-00LX8z; Thu, 10 Feb 2022 23:55:36 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:21 +0000 Message-Id: <20220210225527.25189-20-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oWu6wrLwLRhpQMWtO+x4MDl9ApJAq7k+mfP1ooOXyhouQa4cCob Np3NWR28BgiHgfg5dnHYZjhd2/J2p7i/J5uoQMg274P2fSV6xovmWop3FUq0qMYCe1BKnfY fwSYK/STJL/v5xFztx6E50NUmELwFdCAf8oVfF05aNv8y1iO/TFr7+Uhv0lEVNqUd2U19Nn scHdH4u1OjULl80Ctxmfg== X-UI-Out-Filterresults: notjunk:1;V03:K0:TUrukI0IOvs=:fKovlJb5MiZ36RYlAJEKFs axYNafc7FL8MwG+TyDPRR38s3ighIF9NVp/XdJ6j5GCK9tJ3ioK8EV7WQ46qEjJ451PiH8+Ny gApZEG8C3wE8s7AUCsVrIuSwgGd5SlFv/VmBuLv/COOKhKKKkHOpWRYiDSSZ/s1gnqiDa2Gto of2xQt7Fy73jdBgxbn3LBSynm4uWRgknqO3/grGaQgw0MJYuOLMLEg18cE6UQjlIW3f+ZaTp1 gkfxXONAzgIjYL45vxUN1/I+jH7V8OfYWf+2Vq6kJQ2WmUN+Atki4lVYomLBUebeDKFAAXnTE lX4GVFLmmPoXNP7nyvQvnePsPYaIpwK5zSWpx9T6OHQLUG06yl3nIh/i0ZWcTpw2DGyswQhF7 a9gfmIg3cd5XJcILS0b0n8IWViUcygN5CUUbQKYnaqsEzIw0/q9vXoCiU4uAM2hk3ItZViLy6 BL0O5vgJip+qltpRA449cWlVTe+hC/tKG8jYydo+KO3yMRycvqcGTof9NreRyTC9SDtMEX55e w4aFptDSmY6TlIk66vypq4badpbstyuKNA4eToyvvzVXchcce78Rxw8CtnFie4ro05nfd9VfP eeDun/wTH3OYTm+rFi+eFRGbBBRJmkbvWdtCz9vDDZLNT6SbxqxEMDBIdu0vnZ2GTGlOCUwLk aMR9bRsHj+XKTjvt3CMsYkahX/oN3fgteIIWr0Pt7kkC1sVpvtgLtAPqYSZRk5dvfaD2xlyOp rusj69TI+uUBV0yX9bcSGt0x1j4eTKPpKHBQj+K+bnW90PwBFqCeXvXbvVBdlD6fES6KQ3gEH LRBUtENqyTMc2U5peQXcBIH1Nq/BWm+V2I/D9LAKM8aTpElFkdL6HPLTog7rxl9Yy4Gpk24Hl YEw4iqYMn2FUXydCrtukHzO5+QsnkNJxXKcPeUqtrwhJwDVRGDBuDX8di5KK25WtispRJuTaP Y2998I+ySwfIkIznqSbCsHubbYwS8gScF9ZOcg5Oq7Ea1BJRsL4Ll7psC/DfTCmP/Mfr1VeuQ isQxCCrOYf46nJsTxuFmBrWibwWMFXNHTDfU9W5TLyBwv2Tb+DGRBHtC9r6s7IQaeR+vee2fd vEZL6iWClpXPc0= 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 273d80a9c2..f2b6f0afdd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1811,6 +1811,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 2dcf4dae87..c86244a300 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -23,9 +23,11 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system gnu) #:use-module (guix build-system node) #:use-module (guix gexp) + #: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) @@ -146,6 +148,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-origin name version hash) (origin (method git-fetch) From patchwork Thu Feb 10 22:55: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: 37192 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 AE0C527BBEA; Thu, 10 Feb 2022 22:58:18 +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 7B23E27BBE9 for ; Thu, 10 Feb 2022 22:58:18 +0000 (GMT) Received: from localhost ([::1]:43936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIOH-0003Jr-LH for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0007nn-Ma for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIME-0006Kl-Sw for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIME-0000za-SB for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 21/26] gnu: rust-emacs-module: Update to 0.18. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56:10 +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.16445337683760 (code B ref 49946); Thu, 10 Feb 2022 22:56:10 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:08 +0000 Received: from localhost ([127.0.0.1]:57560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMB-0000yP-KL for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:08 -0500 Received: from mout.gmx.net ([212.227.17.22]:54113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILn-0000sU-EJ for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533737; bh=9RsBaX10QP7j4RcEexHfg85O/0QkLwU6CDiB3uuwJeE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=idIe4wecf39c57J8l3H6W1iWGnDV6rAsW6s4UXQRDOYhytjOaT7Sz4AUTK5y/ddL1 31WyemoIEWYRS6ihB17QernHL4K0J+8KMjb2My0+hhXpF8ky6iLv3/fWBoSHxnu+3M J6ueiaMixywc/6KttrJpQi2Nq9KjysbbbpmW6B3Q= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MOzSu-1nfRuH231Y-00PMvi; Thu, 10 Feb 2022 23:55:37 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:22 +0000 Message-Id: <20220210225527.25189-21-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1ThXsMJUnxcjaRFy2ZYcM2lkE70cV7Y3+7MpM8BCDeqm5786F7v 7Jy08FKzvE7NWPlkMPM3exQCrWO15pSIVaDs46ycH2qnncCL5L9Mfw36vZNlH50Io1UHfu2 1rOsd2b6Rgn7/y0Ily/2DnQlnEdZub2d5gE3eQRFeEDqnvACG1ngMsW42JLWhUUTFez9KSO Vy4thv4FiUKyaWxJJ4U5w== X-UI-Out-Filterresults: notjunk:1;V03:K0:CepGr+KOxzE=:zTL6bwNqTvWXEv06/wmW6x aBzZFYDtv3FBCHdmF0H1GN1VTDLWzXBvj0xz0JB/LorLpzAKLj3XymNR/JzF6dDXEIOnPUOhc RkpZZn2zkeWQKUethVt9oG0wt5/PojeuMAW/w48LHb9yKWEeKpR8jHSo2dYUu3jc4edihNCSw RU8lxihu0EIosuuacRCEp7h1lj1gqUivZevjxu2WwANWhqyUMd9sYCNo8octyupS13T8Z1nmf M5jA59X5UE8vmeX9awc7QcGKdSYB8LwYkRtJuWgYKv4+i2HeSvzJWzpuCPb9A2szYIUpmXZ/r xuIBY75ASxqRviT2ZUSEqBAsqTMDL/rCUrtHsyeK6i5xGuxuGUtB6Uv8SMcrFM9LGTy1lqysR EWfdwpr4Shz6c0H7Mcdv94WUnbBzZKOEVHH8L3A1mhwQdmFnxLGKRKfWbnDfKDFKGzCk+ERxX j/T4FdzOmKwW1FxUkIEdRK2vY1hOcQNCBExGxuXjW0AYc2ZHizGg+AWlz5VUrk5dsWNPxZ91y 84iwFWQ/R2hHlly820Ogxrot5wChqfUMjudnDBEIgCfpXg4V2QoqwXDW8ycA9W95HxKD/584k iRIuAuHOSiVTWEgsmCKTsE7M98N8XLUJaRW8OOdXHeyMI2K3tLSia4SNX677gXZ66E+rGIXWw 5K1/gU801l1yK9Q4f5q5nXdF0Q8et/s05KgG54MNYS7IlSybMsh0+WWDUClmth1p+VsQ7YOKI hP0vmKYnpwEiormvaxT1u/n58jJKA58fU3QfZM644PsDaJuZe2A2GUbdiGkKxa8MNHlL4/8Yy mlVOYKRhU7I7lx4aY6u2TH3qItUrcgJuoxcsZYu6ITsyWykYT2pUrgmkyVjo/r14PnZYb45gy iYOAVLqx7OjJU+yo0nt4KgxLKjT7/EQ65zMLjjEKnGfnyx62ScSI5VT1CdBXznXbFslxpOo7j 02J2FgqQ1guRw7ZISG389ccshoQDAwyf/cI0cYVqrjHRzIvzLszQkdpc6ohTJT2VpWLiVOVbk wVHi1aPyLEwY02blkUNJd3/x9iU+040gTzjOQ+2+P2DMYs50CWUPg7OGe2KcgIx5Qy3G7CVj8 /mPgKNQYT/NPGc= 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 ad27298404..c039591c56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19090,10 +19090,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) @@ -19102,11 +19102,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") @@ -19115,6 +19115,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 Thu Feb 10 22:55:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 37188 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 0CBB427BBEA; Thu, 10 Feb 2022 22:58:06 +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 C3B3227BBE9 for ; Thu, 10 Feb 2022 22:58:05 +0000 (GMT) Received: from localhost ([::1]:42858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIO4-0002aW-UH for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:58:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMG-0007oN-6z for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMF-0006LC-OA for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMF-0000zp-NW for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 22/26] gnu: rust-emacs-macros: Update to 0.17. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56:11 +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.16445337693792 (code B ref 49946); Thu, 10 Feb 2022 22:56:11 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:09 +0000 Received: from localhost ([127.0.0.1]:57567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMC-0000yt-VY for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from mout.gmx.net ([212.227.17.21]:43937) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILn-0000sa-KS for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533738; bh=LOwpl7vDBlvLWPDFpwEIbtmk4lzQ9U1cQD1VI0h7q6A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XsBCRqb7mHeQPQAaW1EN14o9ViSlninkx1SQ3zxlwYOT6OIoO9j63Z4vqktTtdGcH tFHSf9EGr45UBAwLZdvWwm5NPKqqMZQdHlHZb5HDEha0WwL0oWriEePepN5XQgfBmO KEBaxWuXEpJp/kuefMIkgiNDFqk8qwAbEfomi53s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1McH9Y-1nsSVp3GYe-00ceao; Thu, 10 Feb 2022 23:55:37 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:23 +0000 Message-Id: <20220210225527.25189-22-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CQp4/gwWIG68nOEDRd5wYUsHEV90yh5AwDJh5OG5ER1mv1fHVKN Ey8urparc848yP/quiOJ4gZ6STOjdtbnkgd3NoZGmpZYew3ghuY44pErUqp07SlBQurpBp3 w9Y07+LLomxXlyeo5jV+9SCX3il6p5QFchgpImqbAlfnrmHp3zVMS57d+ft8rasPnGhm65X +hc5iDNN6OZED/c5IJ3oA== X-UI-Out-Filterresults: notjunk:1;V03:K0:lvMx1YRV3dQ=:Vufl1C6sd+z50D0jc6Q9E+ XwGZS7epzp1kxE4yaMwZUiCnbYsvVgV0g/69Lrqf8Pg/Rz5d/NvUW4iQLK37uyZtV4fieONOW Jeb8nzltQsnyZvZzrwnS/VQd9qGRQAdI8XEvDMXSm52zn9AEGZHl7eLxPIeVCOD5DBY+sNZFw r8asOWbHi7k+HeddgZxSg/mUdPpUE7uUH0TDhHwhMstaNqKp6pUDKwmnhIUdwPrq5rY3GlmSQ 3lxSkXMAi224AKiynBpvECEVPMZLO2Qrg4oriRvTmlTpx7dEAZP28bbTI10BjZIll6jPouiYM XWrT+eJLfbHgrfxrnk3BUTK1AFPtIz8wsJivohBrWIWJbUl5AEE724eYw3pdSFw9IjDavh9Fm hWmcVxGeFSOXQvVpP4NbrBPJizObCojDOr06y0kc00+vU8u/nRZpMMr4do13JPoacPVBLhRUR 80FobsnyVp46idOEaNVU8OuCGhwYVAuOZGgZ0EcVRQpwDZpEivOlrRFYWffMjorUqyVys7OHz JUt/Dbx9lXqWuQx4eZznRDVBVaCooAuK1YPOmEjqm99v7toRo4f6QANE+xyjz5NMs3gvDEP2m XJMbQyhQlEUEBT0QB4qi3RNJ3lTzCXXAJMkO7C1X+CiXXP/2MI37fTyYrJyskkXdPkA5VEZsv ERk6zLHd5nK+a8ugnk6wE8kZQdgorS90GtPqkY+GLo87NI/QAeJeTBz2M/fFXtpnLnn0k4KJU m7TwRqghA95JpS1nFeuGOQFo+yxFzSWkXLrozflREsDcDCPei5eVYNxS+m5+Sfdczqb1X3OzD xlTAyvQZX4nqrm8X51jBgqf/nliW9B+8wgHbg17SWKoS5VecS44HsdRjM/1jj74lsANWaX+Rm l61FLZpjPa3jzzRxjmKEuyfIOnMru4yQ3e4zItQ91vj73Saz2tEDY5I2XyH4+iLq9l4W4wh+t eKovM/S7ZnFVq+j6LDmJAXh/i44OFRUV8zTLCtTe4htu3/H7W43k3fg538NAdlMf4kh/IfbDL D3eGg4ZTPXmk6PYnbyqXG/2YmMlPFwkMRflxPkBCjtHjHUd/ll8gfXpWrQvvkgrbqb9rCFddi nHw2fSpHtRp198= 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 c039591c56..ea2e9c9328 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19066,8 +19066,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 @@ -19079,16 +19102,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 Thu Feb 10 22:55: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: 37200 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 3305627BBEA; Thu, 10 Feb 2022 23:02:02 +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 9CAA327BBE9 for ; Thu, 10 Feb 2022 23:02:01 +0000 (GMT) Received: from localhost ([::1]:47138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIRs-0005aH-OS for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:02:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIQw-0005YI-VX for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIQw-0007OF-9y for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIQw-0001AA-AD for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 23/26] gnu: rust-emacs: Update to 0.18. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 23:01: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.16445340474426 (code B ref 49946); Thu, 10 Feb 2022 23:01:02 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:47 +0000 Received: from localhost ([127.0.0.1]:57585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQg-00019I-Pr for submit@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500 Received: from mout.gmx.net ([212.227.17.22]:35901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQe-00018r-SE for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644534039; bh=gP7rmiTN5bKpXY20owYvSlJJUZhVlx/E58LldVdSg1c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iymd2u6L0alQ1D0zIEQuwe5URnYyGBcZi+g92t9BFH1wDsN+um0xeFAxCL8Arwm0g NprUlag0XoX4VQqyTnahGdRhi2c1iweSt3ci8vr4buxP5SCR4Kv+SdSp1q7L2IfRvF E/0RdQNg8OqhpRZjhiNm1e7qwaXoqaCkQNfrW+6I= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Msq6C-1oBELi0HQu-00tE2Y; Thu, 10 Feb 2022 23:55:38 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:24 +0000 Message-Id: <20220210225527.25189-23-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:43e6huHklZCjIDc/2aCJRkN7Gn9c31gcmCdOaMC01UUG3ZYWZTP IewoNjh+Dz8wwJhEIlB+XPSMyca6X7JaHEcbqQQjMpp0yznNakwghQlEuAEKjpg0oTFInat qfcXPiiHNBbCX9Akn6ET8jrLcEDF7oGn4XXMtAYSkrKeiPwNqaDDdaGL+3kafzpAMZXb7yA 7+TAtNBQS+Hee0zZXHzWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:cRKLoFmNlaQ=:ISf7N5kPlHuNzem+ZehU/v JmvEEfE2ruu11nt/fzCW1Mo+/TKf4g9hGA+o7DJzHM3ssfkCI/YAjL3oMmBmlua9kZSBnPSx7 Y8Fj+7Y0or11pXBkfF7PTgROqmDZgmJWJfsB5PhHjASGCcstWTRi/9jEYX/FpEbOtbbL/Y0hh y7Ww+Uoy0BR+oB1cGk70HHwoFmckNUzWdVG/3ey/U9NTuPX8IZ0GjGcfJr0EoAI0QQ6Am3YTv 07cCpQkhIIW/J/nQctk5ExrJWu+AstRFr5L3cu90QYK+iNR5sQVwqREMZCpSETeoJ2N8MJJss NZyLrE73vyfNlPZGWecvK1XTVTCYFJs2Jhl5B7wpqZBsgdPgOCpHAuLYH0gW/19dmjGIO5N5/ MgPU2ZTn5pdZxM5Xmh+uBaiRbPFP5F+bXuDToFECVo/Pgg+BTmsoO41eiW2Kz5QKaUGt71Yac 7qoWJ6bqso9cOVw8y2QuCVVriwe7AiZ6rah2RxTA5CI74zQuBKifGXRX2tYm8phhE2MDxfBZ1 snlUGSPzDmoze2RaOaB7TotjLDpnkQIo+3Xh9Xwo54S/1bR25zknQlsBDxK9vU51dIYPMzAyL EF5p5JaNMPprNaiYYWjB7FIsUFJKJpBcugrq7HmrRraoC58rZekTLFg+x4aMwXMf9KqgWizdp GxzjifSjqrthayjXfyyeefD2hmBSuBLShAxzFoo4s01ZVNSt43X1d8KFjH91u/j/fL7u8xc9h 27ecJgRwT8T9fJqiCMQfGekYak5lE66E3y4usB5yZ/MBKrq2A/bTjFE24kisr0FwyijfXa0QF xHi+18c8QU0+Ek3JTE7hzgBb+ozYxTTU1KHtNdEptea999TPU+uYjyxmdv1bCvLbmv4YMTaXR tQt+1IC3wo+qaDKy8mEk3/bUcyIN+PuPw+haiIrmPzyKmmBY8CfqMyelMzVLBdBhsTs5w1jNT 94WqfRrpl7LOLquv0YNT6NdkaeIUlgS2dQCqczimUdY5CUrl5dm2S4uKlEaZ66jy+SGWU0tiL TrH0nhkhBqybI9YhpwdJONT4LcwAo3hsFv7YebZYREJ1xULviMkhAwJBD57BPEOG+v3EiY5/c SZD7u5HwBdeH4s= 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 ea2e9c9328..f9ea194438 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19035,10 +19035,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) @@ -19047,16 +19047,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") @@ -19066,6 +19068,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 Thu Feb 10 22:55: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: 37201 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 C34F727BBEA; Thu, 10 Feb 2022 23:02:03 +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 4A83827BBE9 for ; Thu, 10 Feb 2022 23:02:03 +0000 (GMT) Received: from localhost ([::1]:47250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIRu-0005h0-F3 for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:02:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIMG-0007p0-HB for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35445) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIMG-0006LJ-5u for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIMG-0000zy-4R for guix-patches@gnu.org; Thu, 10 Feb 2022 17:56:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 24/26] gnu: Add emacs-tree-sitter-core. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:56:12 +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.16445337703802 (code B ref 49946); Thu, 10 Feb 2022 22:56:12 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:56:10 +0000 Received: from localhost ([127.0.0.1]:57569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIMD-0000z4-Bj for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:56:09 -0500 Received: from mout.gmx.net ([212.227.17.20]:36391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIILo-0000sm-9d for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:55:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533738; bh=xJrPTZj+G8//0+zgeJuM7aKOhRsT8ZW8FTEXRvSsEd4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ruqwq5rQ6c5eCg28GwOr731f4zVPCo35UeYADTJGfAbiM+sufELGWEuMJibvYizL/ JUI7hpAC3lT1vMs8SfsGE1ZiLRpe9BXtm5a+BB/r6otTWdqJABYw986CAHvmQ0YF98 jbZlQj2Z76gMlJQX3Iq209V+GaKPDki/++EigfSo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MwQTF-1o7dqp1Uov-00sPDv; Thu, 10 Feb 2022 23:55:38 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:25 +0000 Message-Id: <20220210225527.25189-24-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:qbPZ3B03tvR7p7wUEooFBc4FMg7enTfkIyzKnepMtwEYfNOPLzj Zb6c3WiFr3U3WupS8KKo7UUV2Jbr0qD3RQnIQhuSu9eXgoxR7zcMKlXQcOQ9olr3TB8Va+r DGctNN7gp0VVftsj+Wdalu2N0TAipIk6NM+YVRf5WNENoO5peKmGNDkpPiZ502XN6/qpSva jteTZ21hWFlkmtjOLeoow== X-UI-Out-Filterresults: notjunk:1;V03:K0:YCgDpXohdrU=:bAfxUYkDY+iGjFyG2aCfRC EGGSOEWnzm7YvP/dEQVB//u9tbmcM1WRLk69vuysVfAh3gCtsh/Yaqs1gOU3FiI9qS4PUUGD0 eX8WidPctw26xpBrqEPfY1/wJZIixrcpV3cSReAgIzF1OOzXsYYlqczQ3H+w16fxUtUwJk7qe mLkR2UIauXkPiD6XctgLOc28vhDZ+QW9G0Yjsjd5YQrAmqUtrqJQDwiQoeu/rytqEaTRyOBak OgOV9T6DNkqLALlvHGdkMnAbH7f0O6QcZvQTvV2HAu6gc2VWeumdF5pZuQK8aoEn1rPa5j9fp FU5U3zpkYzZBxnTV8nBPJwomw6KpGjczqDOSFhI8UuJqrL3zw+M0zvf7SL1S8Nsco584zI+Bz bgc9bBFS+WZSGHwma9uCjylpnu88gEwHe5ofsnK8HF2VjSA0uTiN39++itv8Wi3l7LFquzTWx /N4xsASdozzXID7YybZ7eo/0wWZwLs9a4bD5pQBm7O53dJF7ZrVtCVVxw+wf9I3O114OajjXw RbQC7YGv3gBmrHb6l4dnsqfYNINprfBjAYu91JclhFaAQKHfrVDL8hBpyOlAI4XA06AhYSLpE F6haqS30TNNrCeTJf43GWrw7+5JcS4fC16yfU2li0ZmzB4jjwJMCQ5oKMFUGVzQt0b89Qo8MJ rTGD7NCcyz/D1fz2IGi/ust9xtn2leXgXvLxTLDSqJDFJ+PpGvobvj8i945tQVZ6NRIyC/I/R MzrVRU9aPIny+43o8rGz8SaDbCy47nV4/nxCMhNAIGl6TzaPnFYCAGC5sGb9O6tmnlPho4Ylw L23n4XzbOEC6xdqYCoviwevV6cbsJSiiZw9MUmwJWLaRF/+SsgaGP/6NRivBB7DaR4mJw5JCL djaJbNkZ0Xue3JB9HxzymNDXg6UmHYHhY5jSWQjA6Q4UyIj45xzsNqdKKSYwCsmHjvHXJDkD4 CHDgXPaOaRo02A0aKOiEP4PiegTA3p9CyxslddRD0CYaydVtQF7J1NmZEaRygcZDKhjeg94YJ UJeoV45V8MGnpJWZq60M0YoHm+IeubrTbn8Wy6rgWQvBH/VWReNXyq/snDoI9Aj6gShKth7y5 xLKgGKwJ+wFMl8= 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 c86244a300..893c02824d 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 gexp) @@ -620,3 +621,80 @@ (define (source-file? basename) "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.17.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 + "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66")))) + (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 "LOCAL" in this file prevents the package from + ;; trying to download the module from the internet. + (call-with-output-file (string-append elpa "/DYN-VERSION") + (lambda (port) (display "LOCAL" port))) + (substitute* "tsc-dyn-get.el" + (("defcustom tsc-dyn-dir tsc--dir") + (string-append "defcustom tsc-dyn-dir \"" elpa "\""))) + (copy-file module (string-append elpa "/tsc-dyn.so")))))))) + (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (synopsis "Tree-sitter bindings for Emacs Lisp, core library") + (description "This package provides core APIs of the Emacs binding for +Tree-sitter, an incremental parsing system.") + (license license:expat))) From patchwork Thu Feb 10 22:55: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: 37199 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 EAC1B27BBEB; Thu, 10 Feb 2022 23:02:01 +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 A8BAA27BBEA for ; Thu, 10 Feb 2022 23:02:01 +0000 (GMT) Received: from localhost ([::1]:47140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIRs-0005aI-OH for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:02:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIQw-0005YJ-W2 for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIQw-0007OH-MM for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIQw-0001AI-MC for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 25/26] gnu: Add emacs-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 23:01: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.16445340474433 (code B ref 49946); Thu, 10 Feb 2022 23:01:02 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:47 +0000 Received: from localhost ([127.0.0.1]:57587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQh-00019L-3O for submit@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500 Received: from mout.gmx.net ([212.227.17.21]:58759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQf-00018s-1x for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644534039; bh=pOEkdS1klKp1pykFgDIXPH7wbzgmn6NVcUgLnSmChUI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=S2Xw1idfnuRMgoEv9bp1RThH1n2nlrHLEjLgiOCqwa6RhuxIjooyyQ5xm834i2/dK Iai4KoXhudA4bb2qimQzVpl7+GjqFswqNWB+0NJ1GwW8IaEQftDXnuiTbjvj3dcNHm O4fR2ZvAVcwGyqFOIcZJuDDKvLRRniF2t8nketf8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N5G9t-1oGTXT2iLl-011Evb; Thu, 10 Feb 2022 23:55:38 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:26 +0000 Message-Id: <20220210225527.25189-25-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6QaZOlZgzw0/oB1M7UkrswrYMlQXNm0GdpY8QcSNTpVaf02yODh dP4EcAJA2IFNo9TNnnYPg44kNrD+06r38b2IrVYU3tpmQ+L9X3gaJ8airraVAsTpoZxFHzU Zj+CJYs6ETE13Em1EXof4Tkhi3MaCHmXR+y10a8H9mcq7LuJKVHS76aSgbiNfcxs2JnHoz7 7O9FepsFK9bUgzEIOJyYQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:NvHpifCUsWo=:L7be4Tce1nlifRi+yKad9h YXKzpQVIoCkxw24pSoEI17lxWSwsINBn1vjJbqXX7R43BTrd4twcU6cCSIcPfHCc+COt0a2t0 tTnpVuYfdyykRc6vuwxjlcsMSEeAu11E6WS6XnLb+LZtpzRZTIhm4O/rUtajY1NFB+Xqy1so8 2JRQ0eC+4jtW0uhGd8pMNbp8dXj9SQc+S1P14BFbry3K1KRI16wBSe6PioC3Z4mTwmQGt2ry9 Y72JF98k6tX8OPTG+0CcsOOdUTfR3eTuab7DqLYh9fklu+aNHlSmFVS9RS2QjXohCQunlbONG Z52FK/owJ+tpZFjzbfY7ko2RrKBzCouJzPbXO/5vJaqNzQwNrpy2cVnWtfk7KPU13Ma3WmML1 n/smxkRGxmulEUBEzMBWjltdnir+abQh7YE+JYyi5tDYTwbLww/HIphK0hzB9KFL3yfPO9HCV R0K5TUsLiUqaD03z+60WEwCD1FeKH8OJCSg+1H3AjCECHUZc/7TsltkL9yDYbY554WL46rnj0 o4nC4iR4XpcGLTi2DbfsLKGCqe/gqkUQdlaFKVszmdzOnYNUAmgcTUA3kmyTkw4BgYi0KkJy5 xuwAwcWK8VkXgpOJtzjVuCPWKZSv4wN7xaQ5wKdHg2veq8gviqVVBAPqZbZQkDK5dslKX7HO3 BBzr+OPZds1PPc0ZLK+ZU5Q/GCNIzcJ7NGY73ZXQx5aaezly+ti2L3lK+S+gwhX3AOnRKCQep s6NkOWVia+kLVjA7SpX1tNmrPmcIdUE3SASoOAmCWvMiO1Se/f8sPIMH3L/gNjHy4D/pSiVjk OjpkiUypce2R3/Biy1wOtXSCFI/qUKNxOxAyEZf0eJSf1XZKqgApoZBw50iTANKWIwHV5C+HN HcviZWMb7UCk5cQxeHpjSKxtuQTYoROir36F/JEIQ+WIk2/Nvu6K5tbIdGIqYI2ZsDe6nTzA+ qSkDZX6bZiuq47MCl1Tg7yiG6hfTfENESLhAL5donh+SjLc1zBf27jOEPi1nthRafJefTpOjA I2KbxY+AWU2tv/81akbJlJTLF33IjuGVrmLRmIZLAD9y4HC0aY50+LZfMCAxHGP+H/l714zR+ W/Z1BoaejfEMsQ= 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 893c02824d..b412f3d031 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -698,3 +698,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 Thu Feb 10 22:55: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: 37202 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 0FD5427BBEA; Thu, 10 Feb 2022 23:02: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 8738827BBE9 for ; Thu, 10 Feb 2022 23:02:24 +0000 (GMT) Received: from localhost ([::1]:48648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIISF-0006hJ-OQ for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 18:02:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIQx-0005YK-Bd for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIQx-0007OR-23 for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIQx-0001AP-2P for guix-patches@gnu.org; Thu, 10 Feb 2022 18:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 26/26] gnu: Add emacs-tree-sitter-langs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 23:01: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.16445340484440 (code B ref 49946); Thu, 10 Feb 2022 23:01:03 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 23:00:48 +0000 Received: from localhost ([127.0.0.1]:57589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQh-00019S-Fh for submit@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:47 -0500 Received: from mout.gmx.net ([212.227.17.22]:42233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIQf-00018t-2Q for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 18:00:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644534039; bh=Y0ruqogCZF6AfqowFM97UmFau0VQvx63bes3SYbLPDE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gjOXK+TNnlbloz3SoJ2xBPxtwDbxoTELoL5efJUg3W2IR95a8/krwC9grjrUz67YC G1BGKNpAPko9zWFSunexhpdmbUn4m5UPQnuUrbqoPGCH1oRC/emicP84ZhxOFHMKYV kUOFq+daq0E3G8z9cuGLvlOKnShsOqNv9gY0jAkM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N2mFY-1oIxZm3usG-0139fm; Thu, 10 Feb 2022 23:55:39 +0100 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:55:27 +0000 Message-Id: <20220210225527.25189-26-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210225527.25189-1-pierre.langlois@gmx.com> References: <87leyinxly.fsf@gmx.com> <20220210225527.25189-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:2GGimL3vfqRQuOlDeoUhkwvlof28ls/CZZzMu8HfOqo4KnoqMds b2lWugzt45H71brnW9dqz3/GJQUMgSPKPU9rZ7kiyDeij+J+boqWvKUctjLkvg2Tb1762V/ B+Abi3wszLMnOclGf3VhOUplONpN7kBxawCJg9ECNVvkFu0ok4KwZm9Jc5TtTeM9NTqSxr6 vcWOTB5NOjmpY04HDElbQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:5HlD6LLeaqw=:tFaXn4B6uOJ6+fgbPRdJK3 /YAUnLOwAsNSwxyVB7aH9WpVepv1PVOBc1+lLTNS21iSufxRrQPL136RqjVX6oDfbrG7bmput dQIHz8gws2nG+aZeEoVG4KdOybtJAXZNm3lLk0oeC4EZkFCcJ16j92sg+TDB8TNBV7mEk4HJJ XRlrd+GJmkwakmq0Ai5bXdxlD50GNPTmyGM1nxzUxWEW/gyZBwuYj8evkbz+eTMcCLJcJdyuQ QOhGJsG+De3JqYE8aQVgsOWJcazokDrMt5GXj/hJicfouaYjvi0HkOnN0NiNAb189ix1eLkIC 6Lca0+ra3i2ExWURazewpLuLjjj+LoNLrGl5IG17vzmE/H32grhPnuST620/q85wBdB5xjcaS OnzFJ3k0NaXsa4WpUkQeecWZ9pakuGEWu/f5nZnArEcGAKHyvW63Qrc7LtR6pbmUff2yY4rW0 4+KCkNtgrDzKa15wwcyrdQolF65RYUeJBnHL4vIRfIQ3RBcV4HuXs0p+n3+ecdNAqDiZ6M/ew mNCH+/i+Vb4ReJysy+E3pfV/6lhEHsDDSvF7BewJEAuTzUn0I/0SM6vtorQYnGUVl7/15oXyO vPlaM9FLG979YLUey/Z9Ttq9t6yQT/am6AbuXKulROXXqY0EbT895viEW7EuQyEIR2ai7WRA0 xJcVIziDOptDw9vwsRiKE6MbprSoX2xHW42xEInrQ8pYH1wKR9RbIe4hxm3UQrLq3ts9DUQD2 +R0NHXPtGr9t67soH7ymzs4dTciziAZCFK+7WJPoJKao2KXvHDS9wzbp5HrIIqkYw9vWwmocw uQ0QFtxbFhQ8N2GkhwouuA1pXbajxRTktLuupNSzc2FfE3k1hY8s7vzG62FYsRElc6Xf/zJ8F FGM1Ia+tVVBR0kY6p3f1DOzZnS3x2vJuiuB92QR2CmB0mel4thv2wuGyiQNzAcObLinoVqpbQ 4rnuxxx2939dK/1zpLL1Qpxh8RQ8EF+iAWp4CqwRkZH4g6pMxEg/VqdKW5piJexCu6ZaEzMO0 +wG3AG2VSEpgYW7LGixvpOgm22sFA2iXBBLrhdNN3REo+goxT0uHA7QPllzGpWi2cy4dNKxO4 u0GVPWO295pplk= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (emacs-tree-sitter-langs): New variable. --- gnu/packages/tree-sitter.scm | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) -- 2.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index b412f3d031..00b91f5c91 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -725,3 +725,84 @@ (define-public emacs-tree-sitter @item More informative indexing for imenu. @end enumerate") (license license:expat))) + +(define-public emacs-tree-sitter-langs + (package + (name "emacs-tree-sitter-langs") + (version "0.11.1") + (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 + "0r3yw25czg1vcxk9015yd8p1n0z427z2l4hizfjy8w8jjjg7cxxf")))) + (build-system emacs-build-system) + ;; FIXME: Support for some languages, such as ruby, is still missing from + ;; the bundle. + (inputs + (list tree-sitter-bash + tree-sitter-c + tree-sitter-cpp + tree-sitter-css + tree-sitter-go + tree-sitter-html + tree-sitter-java + tree-sitter-javascript + tree-sitter-json + tree-sitter-julia + tree-sitter-php + tree-sitter-python + tree-sitter-rust + tree-sitter-typescript)) + (propagated-inputs + (list emacs-tree-sitter)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fake-bundle + (lambda _ + ;; The BUNDLE-VERSION file prevents the package from + ;; downloading libraries at load time. + (call-with-output-file "bin/BUNDLE-VERSION" + (lambda (port) (display ,version port))))) + (add-after 'install 'install-libs + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out")))) + (mkdir-p (string-append elpa "/bin")) + ;; The BUNDLE-VERSION file prevents the package from + ;; downloading libraries at load time. + (call-with-output-file (string-append elpa "/bin/BUNDLE-VERSION") + (lambda (port) (display ,version port))) + + (define (install-lib lang) + (let ((input (assoc-ref inputs (string-append "tree-sitter-" lang)))) + (symlink (string-append input "/lib/tree-sitter/" lang ".so") + (string-append elpa "/bin/" lang ".so")))) + (for-each (lambda (input) + (use-modules (ice-9 regex)) + (cond + ((string-match "^tree-sitter-(.*)$" (car input)) + => (lambda (m) + (install-lib (match:substring m 1)))))) + inputs)))) + (add-after 'install 'install-queries + (lambda* (#:key outputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out")))) + (copy-recursively "queries" (string-append elpa "/queries")))))))) + (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/") + (synopsis "Language support bundle for Tree-sitter") + (description "This package is a convenient language bundle for +Tree-sitter. For each supported language, this package provides: + +@enumerate +@item Pre-compiled grammar binaries. +@item An optional highlights.scm file that provides highlighting patterns. +This is mainly intended for major modes that are not aware of tree-sitter. +@item Optional query patterns for other minor modes that provide high-level +functionalities on top of tree-sitter, such as code folding, evil text +objects, ...etc. +@end enumerate") + (license license:expat)))