From patchwork Thu Mar 17 14:01:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 37907 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 82CF127BBEA; Thu, 17 Mar 2022 14:48: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 EEBC227BBE9 for ; Thu, 17 Mar 2022 14:48:17 +0000 (GMT) Received: from localhost ([::1]:47514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUrQH-0002xN-1h for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 10:48:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUqiV-0002ae-6T for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUqiU-0004ic-JB for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUqiU-0005Rd-FO for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v5 1/2] gnu: Add tree-sitter. References: <98a6180737981490316bca8c03c787289dbddcb6.1643120885.git.luishenriquegh2701@gmail.com> In-Reply-To: <98a6180737981490316bca8c03c787289dbddcb6.1643120885.git.luishenriquegh2701@gmail.com> Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Mar 2022 14:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53523 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53523@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 53523-submit@debbugs.gnu.org id=B53523.164752573420194 (code B ref 53523); Thu, 17 Mar 2022 14:03:02 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 14:02:14 +0000 Received: from localhost ([127.0.0.1]:54861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhh-0005FJ-JE for submit@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:14 -0400 Received: from mail-oo1-f44.google.com ([209.85.161.44]:34644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhg-0005AA-5F for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:13 -0400 Received: by mail-oo1-f44.google.com with SMTP id k13-20020a4a948d000000b003172f2f6bdfso6544532ooi.1 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 07:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d/ul6yUK4kgv7utX0UOMnNntNl+tdop8zNGTfL8t6H0=; b=XHQ1W2y/FGDrq/nBe/zs8FpnqNsTMTmo/RuGVqITETvkNerSEwJR6/x0FuPoS/BzMt yGVKeW8AOVyqaBoqffntga1Uk8Ayh1dR1AFMMAURDvQ7o7hn6zAT2PvJ/IbfjVd0XUK6 8RRkTje6llJK1WG7w6eB9Q0B0l3uaJHJZIYmbMloslHvh0nPZtfSSKY/ddMRlyc7Apgc miv1yllxf5ZEJlvWyIjvbCHlND2oL5COLF0Jp06gP2a9DO+nCyXDUQWtygZueTLdSOXS MJEL0rlYQbO1w3OHFjbRTkM5Ns/OGgH0wovlpyOSHNrrkgfO+aC2Jqit/i9+LPmXXHoO Jrdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d/ul6yUK4kgv7utX0UOMnNntNl+tdop8zNGTfL8t6H0=; b=o2fm78d/vs0OI578fOesI5U6/WYWkY/fHxCqhC6F7gzmc+M/C6dVqTy3gqxTTq5mBg HdUim+roQSMFJKqSCNpheG+Nicm8EwESjtb2tlO9oZqMnGCin7fjFO3U7UN9h1b3DLrJ 8P/CC80nW1cLxBwvb/JpYOGP/8HI9rDxGwYPehPYybYolQtnbu51e8EaIfybIktjeVj5 RA+OZSvwqsFHd0i+SMqnXEOZ+EAgFOkFePyIyNnOrcuCq4iX8DPa9GSFrCXeJLPJhoWG 1T4dkVcgQu0DSHyq0xVS6BCriMUg/li9pTpANrkc0En8vFvPB5Q+yH7jJ1bZYKoXw2VG uM3Q== X-Gm-Message-State: AOAM533NOsCd0eYWDc4pt3jnFgoDjvMB56fUP8zpPHzpO6yLP12VBs3p EFUfGRPofytd0A6m2tZu1Cl6EVkzCghngg== X-Google-Smtp-Source: ABdhPJwT2fpJaTF/Xy4xyk0URlmYziREujML8WKdPMW5G7wDEL7Kx5BEH8pFC1caK61DE6NpNA7h/A== X-Received: by 2002:a4a:d0ca:0:b0:324:3aa2:cbfa with SMTP id u10-20020a4ad0ca000000b003243aa2cbfamr1361241oor.52.1647525726251; Thu, 17 Mar 2022 07:02:06 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id z4-20020a056870738400b000dda8416641sm2135456oam.38.2022.03.17.07.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:02:05 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 11:01:54 -0300 Message-Id: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647525709.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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/text-editors.scm (tree-sitter): New variable. --- gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) base-commit: bae2201a8ddf789dff3f625327f5b2d0a686bc77 diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 45cc61765a..d6ec000dc6 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Calum Irwin +;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ (define-module (gnu packages text-editors) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build utils) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -62,6 +64,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) #:use-module (gnu packages libreoffice) @@ -1165,3 +1168,54 @@ (define-public virtaal provided by the Translate Toolkit, including XLIFF and PO.") (home-page "https://virtaal.translatehouse.org/") (license license:gpl2+))) + +(define-public tree-sitter + (package + (name "tree-sitter") + (version "0.20.6") + (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 + "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove bundled ICU parts + (delete-file-recursively "lib/src/unicode") + #t)))) + (build-system gnu-build-system) + (inputs (list icu4c)) + (arguments + (list #:phases + '(modify-phases %standard-phases + (delete 'configure)) + #:tests? #f ; there are no tests for the runtime library + #:make-flags + #~(list (string-append "PREFIX=" + #$output) + (string-append "CC=" + #$(cc-for-target))))) + (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: + +@itemize +@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 itemize + +This package includes the @code{libtree-sitter} runtime library. +") + (license license:expat))) From patchwork Thu Mar 17 14:01:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 37906 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 1848927BBEA; Thu, 17 Mar 2022 14:44:40 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 A372127BBE9 for ; Thu, 17 Mar 2022 14:44:39 +0000 (GMT) Received: from localhost ([::1]:40728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUrMk-0006UT-OE for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 10:44:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUqiV-0002aq-BH for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUqiV-0004ig-1o for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUqiU-0005Rl-US for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v5 2/2] gnu: neovim: Update to 0.6.1. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Mar 2022 14:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53523 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53523@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 53523-submit@debbugs.gnu.org id=B53523.164752573720422 (code B ref 53523); Thu, 17 Mar 2022 14:03:02 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 14:02:17 +0000 Received: from localhost ([127.0.0.1]:54864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhl-0005J2-3k for submit@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:17 -0400 Received: from mail-ot1-f44.google.com ([209.85.210.44]:42915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhj-0005CL-1C for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:15 -0400 Received: by mail-ot1-f44.google.com with SMTP id t8-20020a0568301e2800b005b235a56f2dso3541894otr.9 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 07:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E70vNDswo2danu/eVufB5q3Vmd1LahISwLs3RUXwkaY=; b=dWnMmZD0/XA2/xR825g3yh9xYnyaiRNmAp7rimSJawM3Bn+BeMZW5+Eg246/e4wjO6 L1qjg3uf77EiZ0cyc/R6VAj4HSYOkYSZnqPPY1KIMB6I93avA3n36n8CYiSGhYIhpDso ZSLxj+8XU/d7SG4E9J6J0pPatqltx2zVV4eTRbieJdusBNXi4UGOUTg/yyS1zhpnFUDC H1UJ7HTZNwG49fD94pN2otzjtOC4d58yc6U+NrH+oIEAd+AsdQjPTKo8WCMAZsfE6XmF dvgQFYhnpdIpu4T1/WqCTGAtKdV6H9KOdURKFJT+kEmbr0RsNZZpjLrAAtj1YWIZSk1L DSkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E70vNDswo2danu/eVufB5q3Vmd1LahISwLs3RUXwkaY=; b=Jbs/rXnJCw2xkly71Q/9t1tKkQhkgpG+4exIu/28y6m+F7Sz819jJhWi0U1NkanQFP D0EIhcddSLyAveFLQwrByHfj2OQoZMOCKLrFEwJkQECOsF1dK3eoGT+PpBL+V5+SephX KwuwqZcno4KSRELe3X1IAKan4lPZfI/UmUdAW8lsx4S/ug6AbdddkrOAGPxGWdGuaeF7 QlSyBNYhNvCvmvWspwvVjzQavKzbA7f4hXyD37cIw8QbeaT6gUIAensBdul8kZ84M1WA j4DXzmb4QP55IrV77Bh4mzm9EAsiIQnOikJ9UCmxJah+mS9Xus1d0mz3I3nHAp9Kl4y/ Kpcw== X-Gm-Message-State: AOAM532osadN2xKrQAaoYwfZ88DlmI4c+hZjz3o5wVIeoeJo7295L8kZ 1vPBm3X1xArU+mXkwELohK8QVdKqXqPuug== X-Google-Smtp-Source: ABdhPJwxIPur95QUzPr4SzngbZBUMOsx+R0u+iImQaePnSgqdSmhxSPMLS4pHeR/cf03X/TRTq+wWw== X-Received: by 2002:a05:6830:1012:b0:5b2:36d1:f15d with SMTP id a18-20020a056830101200b005b236d1f15dmr1590018otp.219.1647525729193; Thu, 17 Mar 2022 07:02:09 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id z4-20020a056870738400b000dda8416641sm2135456oam.38.2022.03.17.07.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:02:09 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 11:01:55 -0300 Message-Id: <725e87adeda2ce8a7092c319c6d50c1b3116ec6f.1647525709.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647525709.git.luishenriquegh2701@gmail.com> References: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647525709.git.luishenriquegh2701@gmail.com> MIME-Version: 1.0 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/vim.scm (neovim): Update to 0.6.1. Build neovim with LuaJIT in the supported platforms. --- gnu/packages/vim.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 28944dd640..62c0bc2b5c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Tissevert ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; ;;; This file is part of GNU Guix. ;;; @@ -661,7 +662,7 @@ (define-public neovim-syntastic (define-public neovim (package (name "neovim") - (version "0.4.4") + (version "0.6.1") (source (origin (method git-fetch) @@ -670,13 +671,20 @@ (define-public neovim (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m")))) + (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) - #:configure-flags '("-DPREFER_LUA:BOOL=YES") + #:configure-flags + (list ,@(if (member (or (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + #f) + (%current-system)) + (package-supported-systems luajit)) + '() + '("-DPREFER_LUA:BOOL=YES"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-lua-paths @@ -716,11 +724,18 @@ (define-public neovim ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) + ("lua" ,(if (member (or (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + #f) + (%current-system)) + (package-supported-systems luajit)) + luajit + lua-5.1)) ("lua-luv" ,lua5.1-luv) ("lua-lpeg" ,lua5.1-lpeg) ("lua-bitop" ,lua5.1-bitop) - ("lua-libmpack" ,lua5.1-libmpack))) + ("lua-libmpack" ,lua5.1-libmpack) + ("tree-sitter" ,tree-sitter))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal)