From patchwork Tue Feb 1 13:04:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 36918 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 930E827BBEA; Tue, 1 Feb 2022 15:38:08 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,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 19E7627BBE9 for ; Tue, 1 Feb 2022 15:38:08 +0000 (GMT) Received: from localhost ([::1]:32790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEvEN-0001lC-2b for patchwork@mira.cbaines.net; Tue, 01 Feb 2022 10:38:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEssa-000566-Q2 for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:30 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEssC-0005n8-5y for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEssA-000211-1d for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v2 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: Tue, 01 Feb 2022 13:07: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.16437207847680 (code B ref 53523); Tue, 01 Feb 2022 13:07:01 +0000 Received: (at 53523) by debbugs.gnu.org; 1 Feb 2022 13:06:24 +0000 Received: from localhost ([127.0.0.1]:42026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEsrX-0001zn-Lt for submit@debbugs.gnu.org; Tue, 01 Feb 2022 08:06:23 -0500 Received: from mail-oi1-f169.google.com ([209.85.167.169]:34664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEsrV-0001zW-3U for 53523@debbugs.gnu.org; Tue, 01 Feb 2022 08:06:21 -0500 Received: by mail-oi1-f169.google.com with SMTP id b186so26928199oif.1 for <53523@debbugs.gnu.org>; Tue, 01 Feb 2022 05:06:21 -0800 (PST) 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=H0Y3GlNoijtv+r6mLcEEJwON8nXp0DsmgX3Nckjt8+8=; b=EP/Q+D+JLPOxf1LYPCqqr/9pdb1SUdbZqnqXbPfAliACfIWU5EpCx0UhjOIjW6pdsj +et0XFG153MHzGegEsRKZQdx9WKDWokgDMQmRlrwvoRz1B9dB5fkn1h6o4Jghn2Z812Q xC6DYHR+ggogjbHGCmvjVyoV5KJ29ox7a2+3LLthsLjp9BdLD5UzQ+T0j/IDCjTqW5y4 ntpGlK8P2QQFFYpzsCVsNByuKRiMl95XCX19A1jO5eMfgCb9COnZRLzDwLw9QLYQRnT6 YyRh1AayeLP65n0tnVhG84c37cjN+DXMXTlEIvJIvCitazzI+fYWTj35vznUMtTTOSJv x8dA== 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=H0Y3GlNoijtv+r6mLcEEJwON8nXp0DsmgX3Nckjt8+8=; b=WY0kkYu5zYHSEN7lFJ/LXIaxWWXF2F18lA6BNVXm3r0yWYxF/YwBZehsEYCp99s5os tNt+CRSfN/5jVk5P8zF7aDF6wkbtvJGGfjWGYwrTOe7u97hCpLg+xZ4ulbnirK7+0aH2 DeWk15ycfcMWepGFCkIa/6PqAXv011UxHZDyazMMMdO56GETOgRkcWfq5HCHt692XApH 6dwCFlAe/jHSWMVFhxd5kGTgrHSN5eiySdlIq3qHNO2ZNgLNm9iO/SLBGPTQ3h8szkVG N0Wol8jDy3KQRhB+Op4eWVy+csJ7j14P7l+wRkMxdDy3M773brrvlBNO0VDpdIOyXTNu LJjw== X-Gm-Message-State: AOAM532weIefsJGAnzvbrSPjxUZtKqJbCn8MWBsEYaQ/2/Jzg4k+1vd7 B6hkWcSJULFETWn4sJG+cmzjlNi+JsYsXA== X-Google-Smtp-Source: ABdhPJwCXXFv2keGdw6NpzhaLLLmtvOWpYXmOZ6O6i/sENWHqPU4NRYiGZJ5r3nUU6tZh2CAYZTOhg== X-Received: by 2002:a05:6808:230f:: with SMTP id bn15mr1065909oib.91.1643720775013; Tue, 01 Feb 2022 05:06:15 -0800 (PST) Received: from localhost.localdomain ([2804:7f2:2785:15d6:4ff3:5510:693f:e90a]) by smtp.gmail.com with ESMTPSA id s187sm13405811oib.36.2022.02.01.05.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 05:06:14 -0800 (PST) From: Luis Henrique Gomes Higino Date: Tue, 1 Feb 2022 10:04:23 -0300 Message-Id: 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 Hi guixers, this adds tree-sitter, just as the previous patch series, but now there is no neovim-luajit and neovim uses LuaJIT on supported platforms. --- Regards, Luis H. Higino * gnu/packages/text-editors.scm (tree-sitter): New variable. --- gnu/packages/text-editors.scm | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2c5f5de719..9273a8f10b 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. ;;; @@ -1165,3 +1166,47 @@ (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.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 + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* "Makefile" + (("/usr/local") (assoc-ref %outputs "out")))))) + #:tests? #f + #:make-flags + (list (string-append "prefix=" + (assoc-ref %outputs "out")) + (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 +") + (license license:expat))) From patchwork Tue Feb 1 13:04:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 36917 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 27C4227BBEA; Tue, 1 Feb 2022 15:34: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,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 B6B5327BBE9 for ; Tue, 1 Feb 2022 15:34:39 +0000 (GMT) Received: from localhost ([::1]:53114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEvB0-0004pc-NU for patchwork@mira.cbaines.net; Tue, 01 Feb 2022 10:34:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEssa-000569-QU for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:31 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEssC-0005nC-IF for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEssA-000217-EP for guix-patches@gnu.org; Tue, 01 Feb 2022 08:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v2 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: Tue, 01 Feb 2022 13:07: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.16437207897702 (code B ref 53523); Tue, 01 Feb 2022 13:07:02 +0000 Received: (at 53523) by debbugs.gnu.org; 1 Feb 2022 13:06:29 +0000 Received: from localhost ([127.0.0.1]:42029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEsrd-000209-13 for submit@debbugs.gnu.org; Tue, 01 Feb 2022 08:06:29 -0500 Received: from mail-oi1-f170.google.com ([209.85.167.170]:44682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEsrb-0001zl-Nh for 53523@debbugs.gnu.org; Tue, 01 Feb 2022 08:06:28 -0500 Received: by mail-oi1-f170.google.com with SMTP id 4so8654880oil.11 for <53523@debbugs.gnu.org>; Tue, 01 Feb 2022 05:06:27 -0800 (PST) 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=j2AB1xv/jvUk6UmSVBEwPEA0J8KA/PEGGtn3uDQxJC0=; b=B9UbtElovie19CGKify0v5+XNMEd61k2kZ5Z9fOL/9UgmS51BLXjpF3XVFJaECnQA/ ISkBBTWDHTrG2tsLxTLYEE0ShJ1vWoaLcQmfGWgqt0KPLXATqnqigCPHRgK8kGx5w0BN CsGaJpctyeDun87O4aSRuOoGGXF4GbL2eS+CUWDRUaloOCBP1gfLYOAqxapKrLqTh+Cf 0DN5pVRvdm29hF4FgoC9YJvs054nFUBU+trPGeUUl8eXrJPa6I23rkxoGgr8KmTLvOaf IdQHCZ6X/qP51hhuXblwoNId4UM3BTi2nRbm0BgXeJtFYGB9xAX/7inP90JTQ34p/3Hu 0PQQ== 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=j2AB1xv/jvUk6UmSVBEwPEA0J8KA/PEGGtn3uDQxJC0=; b=ZtCA0mYRnKgmpkqd/QqwgEbSBpYF50bMs6OBn9fsp0+Q4OfvtYvR1Gu7d8KcQjzW8C D5Ff8jF9tKFGo2QNNybiFMiX6QfsqnjMQhw+5Fa5mzfE3iHAHw3Ycyk4fbh5dSUkLNne oe0RcVk5ugAxyCAqNIxXk+RAl38Gs3ZsUIYhwh4DfCAlXL2Xm8G74AU3bgVbOzaQUwSW zRY5y3c9ceQ+bNkRl/cbeBRomaIppNEHvgcQ4Grk5ZNLUEiwpSe+RUaXKOJcvVDSK6pC gJ9Y42l/lPgFgr5I+dWHPweijUrsf7UIYzNpi5VbvG54Odt+Ef00hUcfw8VoSnsjtqAH cLkw== X-Gm-Message-State: AOAM530xybn1LU8SLJbXom2d8Bi9nKqSbN1Idvtgg6mNuyH6irXNETn+ TMlyRkgMWbsj03XImeiI9e+uGmQTyNqVsQ== X-Google-Smtp-Source: ABdhPJxSlWxuhJJSUpMZAST4eX/hHPx59bIO4ayiBdOgGzFL5o4p/W+QmJ30FoapQoVKkmSC8VhJ8Q== X-Received: by 2002:a05:6808:2210:: with SMTP id bd16mr1181104oib.321.1643720782031; Tue, 01 Feb 2022 05:06:22 -0800 (PST) Received: from localhost.localdomain ([2804:7f2:2785:15d6:4ff3:5510:693f:e90a]) by smtp.gmail.com with ESMTPSA id s187sm13405811oib.36.2022.02.01.05.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 05:06:21 -0800 (PST) From: Luis Henrique Gomes Higino Date: Tue, 1 Feb 2022 10:04:24 -0300 Message-Id: <92a9d1557cbf6d0a4aba1b80dbc69f289aa71850.1643720048.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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 | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d5667851a8..942df27107 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,18 @@ (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 (%current-target-system) + (%current-system)) + (package-supported-systems luajit)) + '() + '("-DPREFER_LUA:BOOL=YES"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-lua-paths @@ -717,11 +723,16 @@ (define-public neovim ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) ("libiconv" ,libiconv) - ("lua" ,lua-5.1) + ("lua" ,(if (member (or (%current-target-system) + (%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)