From patchwork Thu Mar 17 13:44:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 37903 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 B17BA27BBEC; Thu, 17 Mar 2022 13:45: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=-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=ham 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 E7D1F27BBEA for ; Thu, 17 Mar 2022 13:45:46 +0000 (GMT) Received: from localhost ([::1]:39896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUqRm-0004Bc-2a for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 09:45:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUqR4-0004BI-2H for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUqR3-0001cH-PE for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUqR3-0002QJ-LG for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v4 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 13:45: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.16475246809268 (code B ref 53523); Thu, 17 Mar 2022 13:45:01 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 13:44:40 +0000 Received: from localhost ([127.0.0.1]:53487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqQh-0002PL-Km for submit@debbugs.gnu.org; Thu, 17 Mar 2022 09:44:40 -0400 Received: from mail-oo1-f53.google.com ([209.85.161.53]:40577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqQe-0002P3-Oy for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 09:44:38 -0400 Received: by mail-oo1-f53.google.com with SMTP id h16-20020a4a6f10000000b00320507b9ccfso6448674ooc.7 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 06:44:36 -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=VkbF6p5UpP/j903hRZguCCRR6glej96FgUTPcpVy+wXoxtdHjlJ8HNFRAp9zWnLea2 O0bepxOY9l9St3ZKdKs/CJeERBcrz2GGaTiKn84vNDcPUWa3ksUr/Tsjzy4h4VNt1xHR D5FpoN8hP62KVs2zS6GB1865QDkZzvJRyAsC2dQv1zNEED+i9xQNdyT5ZZa6RBu6DS3r OA4BEtukWlZ79QgwNADfkWXhfTbCzMozVGTXLp6kel3noeVS6Hv/b3i1gGI+IGVZ2nHy 1y2ntZh0BAykkTkjQDk9YPJsApLeccjw4fWFvxSkiH97ptzvtvuReyJlg3/cBTZjPSpQ WGTA== 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=HEcR2T0834Zihm6sEoz6AL0XOd4veJTyLTCDaL3HEtsVT/7s5tEq36S4SvxFQGlcVq cU2t3HUmOBhGd3pvHmVcDAh6pidXPI1cyjWs5TYJEjPcuF6PGA5YAon0wme14CEaJss2 E1emu/ODiOM8rU/fclALXiQYuxah7HUqmcrmT8mnGtJkL9rEX84VYcojsVXP924H/LxO oTFMtsFlmA2bBAj+sgHCCRWwJqqc3BL7HgvfTs1tKoyOPeMn7avwZAq5y8kdCXxscr7i gosiI7APMxkK0OWf0ITvyxycww9NXa55YslvJIPIAdVDFK8Zur7C1W0Co2HtW7Byjr/4 xSBA== X-Gm-Message-State: AOAM530lMJXCBd/D97AV0OVuWgi1CrK2iptwnQpW9parcUxim6jEBG/l YMs91kM4AKDUMfyDuTBM5RVPdELmGdHVmg== X-Google-Smtp-Source: ABdhPJxIaLzsGfLq+msONk9MBrUz1BzWSEtRDXvtS2ycIFIG86AHFuG5NqimXzgfnpO0n2KGiAdLAw== X-Received: by 2002:a05:6870:e997:b0:ce:c0c9:61d with SMTP id r23-20020a056870e99700b000cec0c9061dmr5290634oao.111.1647524670692; Thu, 17 Mar 2022 06:44:30 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm2517706otu.29.2022.03.17.06.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 06:44:30 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 10:44:13 -0300 Message-Id: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647524617.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 13:44:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 37904 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 B133427BBEA; Thu, 17 Mar 2022 13:45:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 3F10D27BBE9 for ; Thu, 17 Mar 2022 13:45:53 +0000 (GMT) Received: from localhost ([::1]:40118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUqRs-0004MR-CU for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 09:45:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUqR4-0004BR-IG for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUqR4-0001cw-9E for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUqR4-0002QX-5O for guix-patches@gnu.org; Thu, 17 Mar 2022 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v4 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 13:45: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.16475246819276 (code B ref 53523); Thu, 17 Mar 2022 13:45:02 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 13:44:41 +0000 Received: from localhost ([127.0.0.1]:53489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqQj-0002PY-9c for submit@debbugs.gnu.org; Thu, 17 Mar 2022 09:44:41 -0400 Received: from mail-oo1-f47.google.com ([209.85.161.47]:45828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqQh-0002P7-HF for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 09:44:39 -0400 Received: by mail-oo1-f47.google.com with SMTP id u30-20020a4a6c5e000000b00320d8dc2438so6417285oof.12 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 06:44:39 -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=negZGaFJimUhlMw+fUYQlTOcK+Gsan3YToQRmWsCmsk=; b=HqpmztlpZYfQU/8Zqb/hpPu37w+nckVIrNcAPLcP+mhMd+o2cIguglrYOpIZ+rZ4DC CLK7EtM4JRYqT9mZLbSqINjth+fSNfXp3I1eyNnnhS/f9g/VlrumJ1+vWHNOTJ/xUUob erWAiZDWcxUWcUxRXPdWmMhuVvPy7H3nW2IarIpacFdaHqSzZwsDylum6uVjHmFTOj9s +B2aeo1Wi/ABdD5UwwmZYQf1eHkPTlzgMFz3MwtYmbhi96oeAbVZr33mEDda1oirfbGD GfAzMy6djiLuGBywPTXvXtNAdHCP+agOEgBfmXcsiyuvHznrkO1FRfNbVes86Hpwaa30 n+vA== 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=negZGaFJimUhlMw+fUYQlTOcK+Gsan3YToQRmWsCmsk=; b=70h6TUuQ40V2KY0dKAXt0MEij9gumQKXBm4Da0u3WlWg+jlAMV/Qou3YI3en9EzkOF 9HOWvwd9pN0+uo03kFpGExcX7JrNL2OEEupSP0iH1zF7OGSUYaFx5PKabnU45w09XCES ZWdR6N8SDOyI+yhOUs//6x4f124WR42YOioErQGYMhtEN3db5ck6Icz8G4d9wcOzUBNM G3b1Mp41gZ7BhQjNOcGdQEsr6ODQ1gyQyBVo2pxC+IoJstUtZHtLmOOcAHVrnQIUs885 /5FdINVdNQi0gEHwxIABoUr86Va6yDWLDOhLoHKmCKFgxcSfejy/x7H9FzaL6P8XKDfH 15vA== X-Gm-Message-State: AOAM533xk8WTm9+54+8RuI6bTk8/PoMf8c8kYQFpJiLUd2SRoUqKfGWJ 8ElwHGmHPgpOkoxvDAtNg9gQk2rRnTb9dw== X-Google-Smtp-Source: ABdhPJxOsnaSBCU81ttCo655Ok3tvVI7Co1iP9BS7b0V1nWWEE2FFSVXY3e1Y0bp770yPWEmbWjHlg== X-Received: by 2002:a05:6870:4586:b0:da:6a35:fcd with SMTP id y6-20020a056870458600b000da6a350fcdmr1750404oao.140.1647524673821; Thu, 17 Mar 2022 06:44:33 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm2517706otu.29.2022.03.17.06.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 06:44:33 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 10:44:14 -0300 Message-Id: <03f1d49dc58a163aadabe638eca370e0e75120ee.1647524617.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647524617.git.luishenriquegh2701@gmail.com> References: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647524617.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 | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 28944dd640..1d5904935f 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,19 @@ (define-public neovim ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) + ("libiconv" ,libiconv) + ("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)