From patchwork Thu Mar 17 23:04:11 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: 37911 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 F1BC727BBEA; Thu, 17 Mar 2022 23:05:45 +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 8C51A27BBE9 for ; Thu, 17 Mar 2022 23:05:45 +0000 (GMT) Received: from localhost ([::1]:59706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUzBg-0007Kr-I6 for patchwork@mira.cbaines.net; Thu, 17 Mar 2022 19:05:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUzB0-0007Ki-RG for guix-patches@gnu.org; Thu, 17 Mar 2022 19:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUzB0-0007Yw-Hr for guix-patches@gnu.org; Thu, 17 Mar 2022 19:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUzB0-0000Q8-D7 for guix-patches@gnu.org; Thu, 17 Mar 2022 19:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v7 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 23:05: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.16475582751571 (code B ref 53523); Thu, 17 Mar 2022 23:05:02 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 23:04:35 +0000 Received: from localhost ([127.0.0.1]:55618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUzAZ-0000PG-24 for submit@debbugs.gnu.org; Thu, 17 Mar 2022 19:04:35 -0400 Received: from mail-oo1-f54.google.com ([209.85.161.54]:45920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUzAX-0000On-2F for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 19:04:33 -0400 Received: by mail-oo1-f54.google.com with SMTP id u30-20020a4a6c5e000000b00320d8dc2438so8264647oof.12 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 16:04:33 -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=MYT7vmV+zALD/MqHyMPCR65NTWfkiXAJiV2bp7fUrBY=; b=StmaRp+Q3W/pVCxd4xm/QaexFvhC72zbFwWvehF6i8+619c8L9UyaRJVjFD9Bl6rrN aQ1zMt6b5U4qrDkCXCC6Imj1aDm+NFWGog15iNEi47tMdl+YyL07GA3a3veb97r/00ZD rcLKCK0utvTceONzBsiTOJpwDheHEMf7iuzSdiFMavS8ibsXeUA7eNCi8M5KbFQfnDjz GzJyMja/V28y5OopJy40XCRUl28eM9QSopi3F9yK6tc1EIVIpMay//tzXKIrfEXIiVNB +QGSVb8Xkn6GcB0sQ4IPZd6T52X+E0Cdg2mF3evlDGBz6AKCyeAJrIhqSWr5xNifPTjl B9lg== 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=MYT7vmV+zALD/MqHyMPCR65NTWfkiXAJiV2bp7fUrBY=; b=BrZFlNDDywhwK1U7LZ+4CwCzaULANA9wRPzBpaGXL61knZNcG3qsVx8o9U6VJmgXGf eN8QxVelyNioHWzVKAjkqrxu7LqHX0hPwJP+PQgdSDc9kFji5YWg7SBq3ZZqcp284s6x RHgimsIim4YYF9aWPblvmf0IPNjiV9LiKavhtCYI6aCBT/oXeXVOSgSl/Rz1MVUyiEJY r9u1l3t8OdrQi2fmFtbUg0YFhp0bclEjrXP2RicIFabdVJmKnldcNCLiopKFrNCWZ8f1 3/mANg1WzCkHrS9ONyp3OnTj7miN4KaPp2kYQfb8WyzN8emeNeIqX3MBes2r5RWtJ8pE Tatw== X-Gm-Message-State: AOAM531Tyno2GKqjCxXGA+cqlyWdt6rwRA0iXzJxgVRWWw31xcCx4mQM SmDywnhVr2EdpMKd56PDwvzHAelHd9O+5Q== X-Google-Smtp-Source: ABdhPJyPVlL1mRPTusi59SHV36BI1nSzOHtmiL9nwFuBE0NwLN2R+UfQPsyvAyEB5nDtLhFFLY5gpQ== X-Received: by 2002:a05:6870:241a:b0:da:b3f:2b7c with SMTP id n26-20020a056870241a00b000da0b3f2b7cmr6500628oap.283.1647558267106; Thu, 17 Mar 2022 16:04:27 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id m17-20020a0568301e7100b005b256697d7csm2977849otr.72.2022.03.17.16.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 16:04:26 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 20:04:11 -0300 Message-Id: <52f6eca6dc79d92bf5b821e8f8857e82b54eddf6.1647558246.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647558246.git.luishenriquegh2701@gmail.com> References: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647558246.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 | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 28944dd640..5a417cb456 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,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 @@ -716,11 +723,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)