From patchwork Sun Mar 27 22:31:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 38156 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 3C9C727BBEA; Sun, 27 Mar 2022 23:32:17 +0100 (BST) 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 B46B727BBE9 for ; Sun, 27 Mar 2022 23:32:16 +0100 (BST) Received: from localhost ([::1]:44196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYbQl-0006hB-TM for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 18:32:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYbQZ-0006h1-2U for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYbQY-0003tm-PM for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYbQY-0005ol-MH for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v8 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: Sun, 27 Mar 2022 22:32: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.164842031122338 (code B ref 53523); Sun, 27 Mar 2022 22:32:02 +0000 Received: (at 53523) by debbugs.gnu.org; 27 Mar 2022 22:31:51 +0000 Received: from localhost ([127.0.0.1]:56748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYbQN-0005o8-7I for submit@debbugs.gnu.org; Sun, 27 Mar 2022 18:31:51 -0400 Received: from mail-oi1-f182.google.com ([209.85.167.182]:44819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYbQH-0005nk-J5 for 53523@debbugs.gnu.org; Sun, 27 Mar 2022 18:31:49 -0400 Received: by mail-oi1-f182.google.com with SMTP id t21so8984925oie.11 for <53523@debbugs.gnu.org>; Sun, 27 Mar 2022 15:31:45 -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=N8USuAszhxkEE/z+nynZRoKFjdWkOjTa2xpeYqmOu/A=; b=ivAptKIOVJ4r+GX5J4ZhqnvrzqDed3XpT35SaOJCYD9B0lT6h+VwxD8zs3dWUJqHuN DEdnxh+XAnGO0/Z5ZJc4mctySEz1/NUKu7CUxPUz8bb/Eyb0/T5Ay3TJFX55qZfFuSV/ IL9jUFGhA+YruwXYqmaNclFH+E5NhH8TH+ObjrrSFQVEHp1C47xH7FsNriAcMpO0Z+Vz NCsJrwSuZ+lnU/lQm+MvXhhSD0vd1R0wLTjk40sOc+rUlRUTmJzivRs0YRTDyimLEABb f8PSVkdfCJOlCQu4k12j7j8V1NJ3TUSsNQbMd5hcTEn5KGZ62yXvP0FwbHl6CRIUvL3M AozQ== 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=N8USuAszhxkEE/z+nynZRoKFjdWkOjTa2xpeYqmOu/A=; b=Nra00X4zAa5bmr+kxCNqLIPGyaX3Qobg6+WNeh8Nz6Cx36cQFRUXkIsKWpr5ZN+pvD eWRzebZBlpR4UBtOTFwZFGY5bcEcAYiIr92zydvdyGXseMtFH5lst1XhCLBMtSJPlX01 vUaM28hpTIh4asySJ9r9ssXPUw3308DLEwTwbLjO20EOorX2pWZ/LhlMjXiwxQTEAqSF 9xQtHnwWQX2XH+Y1l1nQi/evkkpsh7hqiLyKV4bNQiECPtArEceUrqlelNhiDm+kbZw+ NKKDPmR7XgaacCmYXEsN3WIKl1lL0a5r8bsh/PpMdJ7Tu4HqIJcAvOtKizHMXVEUTaf6 EEXQ== X-Gm-Message-State: AOAM530gfUOsXpwVkd+HACMRGnDUPmolzDo242Nguzb8QaKu8hBZ7K5R CYKYDCp0liUXAKl3Igk5EbvDQYkbXIg= X-Google-Smtp-Source: ABdhPJxQpBf0tp8qiPRObCIDzIXMN6Fy/BDFDgxOstqiHNZ+OlS4omwJmmQ+kqnbFm8MJhh8JaULEw== X-Received: by 2002:a05:6808:1496:b0:2da:8662:4346 with SMTP id e22-20020a056808149600b002da86624346mr10832799oiw.9.1648420299484; Sun, 27 Mar 2022 15:31:39 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:a639:8340:7381:f0d5]) by smtp.gmail.com with ESMTPSA id 11-20020a05687013cb00b000dd9b5dd71csm5707890oat.56.2022.03.27.15.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 15:31:39 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Sun, 27 Mar 2022 19:31:27 -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 * gnu/packages/text-editors.scm (tree-sitter): New variable. --- gnu/packages/text-editors.scm | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) base-commit: 2344fb10972a4cefead8e7aa3e0b807da4cf4570 diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 45cc61765a..7cbad042c9 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. ;;; @@ -62,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 +1167,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 Sun Mar 27 22:31:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Higino X-Patchwork-Id: 38157 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 A2E2C27BBEA; Sun, 27 Mar 2022 23:32:21 +0100 (BST) 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 3B8B727BBE9 for ; Sun, 27 Mar 2022 23:32:21 +0100 (BST) Received: from localhost ([::1]:44216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYbQq-0006iF-De for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 18:32:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYbQY-0006gu-MK for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYbQY-0003th-Ch for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYbQY-0005od-A2 for guix-patches@gnu.org; Sun, 27 Mar 2022 18:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v8 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: Sun, 27 Mar 2022 22:32: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.164842031122331 (code B ref 53523); Sun, 27 Mar 2022 22:32:02 +0000 Received: (at 53523) by debbugs.gnu.org; 27 Mar 2022 22:31:51 +0000 Received: from localhost ([127.0.0.1]:56746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYbQM-0005o6-St for submit@debbugs.gnu.org; Sun, 27 Mar 2022 18:31:51 -0400 Received: from mail-oa1-f43.google.com ([209.85.160.43]:37563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYbQK-0005no-Ph for 53523@debbugs.gnu.org; Sun, 27 Mar 2022 18:31:49 -0400 Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-dee0378ce7so3098561fac.4 for <53523@debbugs.gnu.org>; Sun, 27 Mar 2022 15:31:48 -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=0zbMoimifLC/ypgYy6K/dAOV1HAjUBQ5N0ChNGdfzYI=; b=jLsWA1bkzk1W/4OEZqZ3dleWUuVrLRTJwdhUmeGL/OLBa3U4BGFvwG3U+J4XsoOJn1 XmTH0uiysJEl0CUc8bDA8/RATF013YLEWFMony8yjg21ajrzKVIULZhB1Hac8a5OhXzA ubNzVYQyHaSzzXmZbvMUo8b+6GB1ifoQX6pZrI4VPEZj2pOSMm9L/thaObjE4cbU1rEp Ro5E/BMNVn2sE4o+91mkgyftMItnb8Pg4bnDE6cezAC1ZrOYV3Mn638tf1iopyo2o/RV la8xhjvEWwfVICvR2evF3TVATTwexKn/PNHFKo1dLt+sA1zxmgkBWQQzXhjA3Lsb8Dj8 ZOkw== 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=0zbMoimifLC/ypgYy6K/dAOV1HAjUBQ5N0ChNGdfzYI=; b=KCsiSCRzes+Uh0JElY8GlxPxwUoNThfVCbTGeNJzGSacg7psuRVkXZABRRAzbs090v 2PuKh8gLcjPQnTa7qpx9Y6Up6V+pJZ5KYUx/7Z909w4GWMb2Kb7xxe3aV0pjfaMrIajx r2ihvkp4OD3A5xc8AM/j3qjeDjY0yC9hb596C4xLfw2hsNJoqoY8m7yupdpYmU8nlsuN IFqNRIPnHJruFgov0fTIIh4CxohhuyHmpqOflXIbzc+tRaHRExQGQ9NYj2wBynQ+RwfT cbpIBjjxqLPCuO6nHmzd3pE3vz203DYSHphAkRvUvsaLmKuuxPg1XV74f7ISnjv0diad yXfA== X-Gm-Message-State: AOAM5310/3+2J3FXdH3kHmXgVHiFYQeoZfsAja78sR62vGNDPjXoWPYc FCzL6Ovt0D5bY07qLSb3moAzZdSSrH8= X-Google-Smtp-Source: ABdhPJx79UuYVUAoEKpFBfvKqY1uATOlng0FohHiFbrhaWpvoUyhcgbZVK5iAmTZlvOQ3kbuPLJMKQ== X-Received: by 2002:a05:6870:42d0:b0:dd:acbd:14dc with SMTP id z16-20020a05687042d000b000ddacbd14dcmr9536617oah.87.1648420302904; Sun, 27 Mar 2022 15:31:42 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:a639:8340:7381:f0d5]) by smtp.gmail.com with ESMTPSA id 11-20020a05687013cb00b000dd9b5dd71csm5707890oat.56.2022.03.27.15.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 15:31:42 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Sun, 27 Mar 2022 19:31:28 -0300 Message-Id: <1b466abec478b683e7bb42866ba2ae0842b47ce4.1648420270.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 | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ef6c62cc69..bc5e36c6f2 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. ;;; @@ -662,7 +663,7 @@ (define-public neovim-syntastic (define-public neovim (package (name "neovim") - (version "0.4.4") + (version "0.6.1") (source (origin (method git-fetch) @@ -671,13 +672,19 @@ (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 (if (%current-target-system) + (gnu-triplet->nix-system (%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 +724,17 @@ (define-public neovim ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) + ("lua" ,(if (member (if (%current-target-system) + (gnu-triplet->nix-system (%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)