From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0PF3OVxJM2IjPQEAgWs5BA (envelope-from ) for ; Thu, 17 Mar 2022 15:44:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2JsoNlxJM2IwUwEAauVa8A (envelope-from ) for ; Thu, 17 Mar 2022 15:44:44 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A4BE33AE74 for ; Thu, 17 Mar 2022 15:44:44 +0100 (CET) Received: from localhost ([::1]:40728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUrMo-0006UT-4E for larch@yhetil.org; Thu, 17 Mar 2022 10:44:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUqiV-0002aq-BH for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUqiV-0004ig-1o for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUqiU-0005Rl-US for guix-patches@gnu.org; Thu, 17 Mar 2022 10:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53523] [PATCH v5 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 14:03: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.164752573720422 (code B ref 53523); Thu, 17 Mar 2022 14:03:02 +0000 Received: (at 53523) by debbugs.gnu.org; 17 Mar 2022 14:02:17 +0000 Received: from localhost ([127.0.0.1]:54864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhl-0005J2-3k for submit@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:17 -0400 Received: from mail-ot1-f44.google.com ([209.85.210.44]:42915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUqhj-0005CL-1C for 53523@debbugs.gnu.org; Thu, 17 Mar 2022 10:02:15 -0400 Received: by mail-ot1-f44.google.com with SMTP id t8-20020a0568301e2800b005b235a56f2dso3541894otr.9 for <53523@debbugs.gnu.org>; Thu, 17 Mar 2022 07:02: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=E70vNDswo2danu/eVufB5q3Vmd1LahISwLs3RUXwkaY=; b=dWnMmZD0/XA2/xR825g3yh9xYnyaiRNmAp7rimSJawM3Bn+BeMZW5+Eg246/e4wjO6 L1qjg3uf77EiZ0cyc/R6VAj4HSYOkYSZnqPPY1KIMB6I93avA3n36n8CYiSGhYIhpDso ZSLxj+8XU/d7SG4E9J6J0pPatqltx2zVV4eTRbieJdusBNXi4UGOUTg/yyS1zhpnFUDC H1UJ7HTZNwG49fD94pN2otzjtOC4d58yc6U+NrH+oIEAd+AsdQjPTKo8WCMAZsfE6XmF dvgQFYhnpdIpu4T1/WqCTGAtKdV6H9KOdURKFJT+kEmbr0RsNZZpjLrAAtj1YWIZSk1L DSkA== 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=E70vNDswo2danu/eVufB5q3Vmd1LahISwLs3RUXwkaY=; b=Jbs/rXnJCw2xkly71Q/9t1tKkQhkgpG+4exIu/28y6m+F7Sz819jJhWi0U1NkanQFP D0EIhcddSLyAveFLQwrByHfj2OQoZMOCKLrFEwJkQECOsF1dK3eoGT+PpBL+V5+SephX KwuwqZcno4KSRELe3X1IAKan4lPZfI/UmUdAW8lsx4S/ug6AbdddkrOAGPxGWdGuaeF7 QlSyBNYhNvCvmvWspwvVjzQavKzbA7f4hXyD37cIw8QbeaT6gUIAensBdul8kZ84M1WA j4DXzmb4QP55IrV77Bh4mzm9EAsiIQnOikJ9UCmxJah+mS9Xus1d0mz3I3nHAp9Kl4y/ Kpcw== X-Gm-Message-State: AOAM532osadN2xKrQAaoYwfZ88DlmI4c+hZjz3o5wVIeoeJo7295L8kZ 1vPBm3X1xArU+mXkwELohK8QVdKqXqPuug== X-Google-Smtp-Source: ABdhPJwxIPur95QUzPr4SzngbZBUMOsx+R0u+iImQaePnSgqdSmhxSPMLS4pHeR/cf03X/TRTq+wWw== X-Received: by 2002:a05:6830:1012:b0:5b2:36d1:f15d with SMTP id a18-20020a056830101200b005b236d1f15dmr1590018otp.219.1647525729193; Thu, 17 Mar 2022 07:02:09 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2785:9515:6317:5895:57ed:345b]) by smtp.gmail.com with ESMTPSA id z4-20020a056870738400b000dda8416641sm2135456oam.38.2022.03.17.07.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:02:09 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Thu, 17 Mar 2022 11:01:55 -0300 Message-Id: <725e87adeda2ce8a7092c319c6d50c1b3116ec6f.1647525709.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647525709.git.luishenriquegh2701@gmail.com> References: <1e4edd37cfd4e6724ef6b65547da01efdf023d71.1647525709.git.luishenriquegh2701@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647528284; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=E70vNDswo2danu/eVufB5q3Vmd1LahISwLs3RUXwkaY=; b=buPWOQKb4nKpvd59z89aDGFuBD63AdKa2jY/DSM5sn6qb2yx1ssQlT/fdBNk50tOntJqVF H59klp3HQyJimlJgJpL9EjzCTsu/Aykt0MVRx8IUCI3n3H3QmRtmtTNNCx6vU+rlIn68Ez Hdtv+HC/A/e2NN5foWDC8G5OprDSs0sYaK9JNlJgBXfSYbj0FjyAUbpDrjIe6ZgO0twTyN FwyuQiXQEW2s0sgNfc+3qJTSalst23D5ZbzqA9MkdaROYzJdcqQIWViJUGlS3egZkEfc/5 PHNuOzEjOiyNFEg+Of+KSH+XYxQvCwPZaiHoQo1UnEE/rY+3eOorgekMGbALOQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647528284; a=rsa-sha256; cv=none; b=mdhjToArlVmgKFIuyfbDcqaKlIO0brCfYcf12q66SbVBK11awpa4WmL8ePk2v1GIAyzNmj TvhL6bBvIUIZ7Pyhksi4kiB0+4iySwrS8v0KAhlKrdQLlIfcqcI7W/CJQj8kYWmsVCggWr PDbc8myxqljqdAQ6gnmuE8oME0+XGH2Rfi6CzJEhKY49hHHxMgy6P3I8KoqYC8B3/F7VAe XPFAOur7ikXSoFcosB2jXSiuu0dO5Y5ubBGQOEqcc2j1lQ8NhVvpYQwpCpPK4gc3mADWh+ Bd2Fc7/BHseG1KjDyru+KBU1onQ/CzfeQ/pkMR3pLIW4TdaIzrScNnkty9zDmg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=dWnMmZD0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.55 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=dWnMmZD0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A4BE33AE74 X-Spam-Score: 5.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: GQT3how76pAR * 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 28944dd640..62c0bc2b5c 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,18 @@ (define-public neovim ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("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) -- 2.34.0