From patchwork Mon Mar 14 23:31:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 37833 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 41E3827BBE9; Mon, 14 Mar 2022 23:33: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=-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 84A4C27BBEA for ; Mon, 14 Mar 2022 23:33:10 +0000 (GMT) Received: from localhost ([::1]:49624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTuBZ-0001mL-KI for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 19:33:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTuBS-0001lx-Mt for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTuBS-0002FV-5z for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTuBR-0008Ca-T2 for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v3 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: Mon, 14 Mar 2022 23:33:01 +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.164730073631451 (code B ref 53523); Mon, 14 Mar 2022 23:33:01 +0000 Received: (at 53523) by debbugs.gnu.org; 14 Mar 2022 23:32:16 +0000 Received: from localhost ([127.0.0.1]:46959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTuAi-0008BD-Dx for submit@debbugs.gnu.org; Mon, 14 Mar 2022 19:32:16 -0400 Received: from mail-oi1-f175.google.com ([209.85.167.175]:37677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTuAg-0008B0-U0 for 53523@debbugs.gnu.org; Mon, 14 Mar 2022 19:32:15 -0400 Received: by mail-oi1-f175.google.com with SMTP id h10so19172513oia.4 for <53523@debbugs.gnu.org>; Mon, 14 Mar 2022 16:32: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:mime-version :content-transfer-encoding; bh=NVpI4IpEY2/xoG3L5WRsptvdKGQCVRWDcu38Lzz9LXA=; b=Bp6qt77lG/YiIpBZz3/QSaNVtR00VVBrcClq8psKg6fWEBmFs0acrWfbNsijCGSbTa Hqke5peF35j/RP+RvL6ygli6QuWX0hgBFOuth5gtWGhINBHu/xsCLIwvyHXjBwFJl+nU t+zNf6aEuVPEFtUiJslxOQkj4OoOkR4buEdXMXuSunQGDgeLRiZoGL2AkMpdZKehBt15 pea1R1UTB2Pr2IaqYF52vx3wOCSwf+rRYGBz98D6tEcsmFlBzS3cptLjYhGqx0OgUkBX TPLEpZWQkE66hWe2law+cnjtOpyzOEJVf3923n4u2oF4v+mn3T9ZY5SfzfUZ2B7dkrwi ZNTg== 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=NVpI4IpEY2/xoG3L5WRsptvdKGQCVRWDcu38Lzz9LXA=; b=nQ2zlvDwETHmCBsveuru5AWWmcwr9Ai5jZ6jLSsm+QkkGVXinsjCybxiQnAyXVmKj6 iKlw9V0TBv/baIJWRZSdOZsWfc6NXSs89tw2ZTIWCnDj3T9JIVfOHWr0X/+OIAsE+t9l 8WnESntWd8+Q3X6X8f3ePwphB2b0irHBYU9+2QOZlpHwMH9v8RDX2QbSEhiyf2n6vJxK 0gZ1d69uuX2MeaqOG+hW31c411DxsPgiqG6+T6GPKHtN+wUhESoM8hoXrmMaPB/5oVJ6 MBh0mNP6lSA6ps1Fret6yMCJcnwaDFKdZ+yHeQcDdVx6AVzh0SYVmgVewUb57UA79l3p tqOg== X-Gm-Message-State: AOAM5323cSm2tXRU94Fu1CF2ucylfq+CcncQg06eedIa4OHql+EElIzO SKdnkIRQUJMdVULni7z81HXL9yM10HSuZw== X-Google-Smtp-Source: ABdhPJydiUBfVUa8sASUp9w0HSfrPxeSvnieFnYvG4D8Y9JV45t6egebu84GD603eeEWcVbvQQnw4g== X-Received: by 2002:a05:6808:16aa:b0:2d9:ca2f:8445 with SMTP id bb42-20020a05680816aa00b002d9ca2f8445mr695730oib.66.1647300729020; Mon, 14 Mar 2022 16:32:09 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id o10-20020aca410a000000b002ecf2a4fda5sm2074240oia.10.2022.03.14.16.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 16:32:08 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Mon, 14 Mar 2022 20:31:45 -0300 Message-Id: <78ed09339d88b859d34798faff950ea7a2d4d6c9.1647300645.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(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2c5f5de719..d333d78e22 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) @@ -61,6 +63,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 + #: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 Mon Mar 14 23:31:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 37834 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 78CE627BBE9; Mon, 14 Mar 2022 23:33: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=-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 E4B8227BBEB for ; Mon, 14 Mar 2022 23:33:10 +0000 (GMT) Received: from localhost ([::1]:49628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTuBa-0001me-1A for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 19:33:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTuBS-0001m6-Re for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTuBS-0002Fc-D8 for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTuBS-0008Ch-9d for guix-patches@gnu.org; Mon, 14 Mar 2022 19:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v3 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: Mon, 14 Mar 2022 23:33: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.164730074031470 (code B ref 53523); Mon, 14 Mar 2022 23:33:02 +0000 Received: (at 53523) by debbugs.gnu.org; 14 Mar 2022 23:32:20 +0000 Received: from localhost ([127.0.0.1]:46962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTuAl-0008BV-SF for submit@debbugs.gnu.org; Mon, 14 Mar 2022 19:32:20 -0400 Received: from mail-oo1-f44.google.com ([209.85.161.44]:42653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTuAk-0008B4-BW for 53523@debbugs.gnu.org; Mon, 14 Mar 2022 19:32:18 -0400 Received: by mail-oo1-f44.google.com with SMTP id s203-20020a4a3bd4000000b003191c2dcbe8so22341696oos.9 for <53523@debbugs.gnu.org>; Mon, 14 Mar 2022 16:32:18 -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=k6u9445ey/z3bG5qY6arCuIzLkZw6weyjEp18E6PvO0=; b=PzPEHhT+O8xwDJNFaogJY4TyCXueb6o7BnyFRTFZkmPvhY4PUNLcdbGFwECgxMUWcY T1rFRBrVICxTbWgjePgGpBSbl4s6Qw13eGUxis0fBd4O3C2BpHXGUB6ywQGgomKj5f35 fMN3Wu6WGlriCs0qMi4HiKnG2VroO+JxuI29R7Ex+YbtelKRHHS3JT7tL1UX0xNQ/hEv mlAYUZxnWztXRcinSjufhvdHvbhUdiIMhnVswUu11Y5hugStuTLXZHZSu5PLIPJ6OZO9 lEFV6PGKpYQ7O1DH5SoMErbBkoXdWO58X7/UdGu4p03IrfPKi4z6ebNISc7IeyGrc/0r ikXA== 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=k6u9445ey/z3bG5qY6arCuIzLkZw6weyjEp18E6PvO0=; b=MllGvpe0Mcq4HwgO6XvJqrn+tqgKc5kRczpHF/gXzH1Mo0AP5RFlKB3n4JNRjb8tya LMyV+B6YpfLijgyuxMkVLnVbJSCFPxOOOMiv45Ph2GOril+OAC3CkADn5R+jMLn/Tx8c Lb2EZKSsb/puvCMGfu8b21Tdwr/dDSEUAl0P0H5u7oLfEAwJF69FqPzkmiDminLBb/CR tZKXNFSTj1a8AndTdOJf8nvZ9c5a+ijy3tzuAjU+d+P2appQq9nOYTKHDwf2u8xFYFz6 pdLxONVjra4EvHSlhoEbUy649DV4v9KLlCeRnAnx2sK/jK8+T8gyvURtednb99Jd5Tgn S+TQ== X-Gm-Message-State: AOAM532LefmsSY9TosZ90YaHIe/mw9XRtKWHr1kLniHURly3cmnq1/vc lEgbKyVGrB1AjaToIHHtnJTZHSGxSTdzcw== X-Google-Smtp-Source: ABdhPJwnbWxjm2/+986Z40pPvRizX61OknrNPpx71iyJRSt3rfGOipyTPLb6T5+OtimJ3CdP77s9Dw== X-Received: by 2002:a05:6870:440d:b0:da:32ea:7876 with SMTP id u13-20020a056870440d00b000da32ea7876mr576527oah.27.1647300732639; Mon, 14 Mar 2022 16:32:12 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id o10-20020aca410a000000b002ecf2a4fda5sm2074240oia.10.2022.03.14.16.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 16:32:12 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Mon, 14 Mar 2022 20:31:46 -0300 Message-Id: <552d90160ec90419add7cccefdd44d2c67b579c1.1647300645.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <78ed09339d88b859d34798faff950ea7a2d4d6c9.1647300645.git.luishenriquegh2701@gmail.com> References: <78ed09339d88b859d34798faff950ea7a2d4d6c9.1647300645.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 d5667851a8..10fb20a5e7 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 @@ -717,11 +725,18 @@ (define-public neovim ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) ("libiconv" ,libiconv) - ("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)