From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6ATFL507M2LRGQEAgWs5BA (envelope-from ) for ; Thu, 17 Mar 2022 14:46:05 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YB0pLJ07M2LqXgEAauVa8A (envelope-from ) for ; Thu, 17 Mar 2022 14:46:05 +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 63F4D13DF6 for ; Thu, 17 Mar 2022 14:46:05 +0100 (CET) Received: from localhost ([::1]:40118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUqRt-0004MR-8i for larch@yhetil.org; Thu, 17 Mar 2022 09:45:53 -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 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=1647524765; 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=negZGaFJimUhlMw+fUYQlTOcK+Gsan3YToQRmWsCmsk=; b=N48YI58dyHtAcec/UqmUuxFfyffoDxjaJwphHwr0v8MLtO6jfOjZ+HFwrFApPqClg50FxG gtGHiAQfPFUhnYNaC7cX5dlw1Oun0ZBnAgiFsbSgUR31V4AKF3aDv60FwxoheO68O2GnvW NqHiA01qIzKiafBMLoNs3MYtx5/3vBocNh686fW6TgIwgSmcJu4ZEnoVlOyYIbR4EHYjVI 2EG/07UPY1ESwTMfCRHfqKraruOvvJDaTxFdsl6qNa4qRjraNZfXMBRQ8hJ9/9Zgz8QO+1 U/FAiruaV88ob+hqTppKGzdyHiBU+hSof1nxJcbKe72A0XL3noVNE948S+YdQA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647524765; a=rsa-sha256; cv=none; b=L/lx0LjZV7zhHErXkEnFehJxz0RyulPay4ko/QNGR8MEZgXoqlJl4K76iUsde3dynQHh4z /39pMVDFp2CM2CDM6QhYZpexHm2hRhq5SFu/98eyOLd++cS13STxDoqo+efk4wCyq1/5iC zlpkuNFD5JY3ehiGuE4NtwbC+jwd8NPRZ1rVSj2wpANuvOcER6xgvHwTM8KrtlnSX8FDNw bPN2qU3RAZFWj1NPJZyuilW1S3kOX+fcspVGReQmoIvsaHah0bLwBW01JK+ZT04dsewv0/ aUlLSeHZ9drnRu3eIoCENYYfHsxMqUv+AOJx1WJm86ZTp+lXHV+dOPK8lK8NKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Hqpmztlp; 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.54 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Hqpmztlp; 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: 63F4D13DF6 X-Spam-Score: 5.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: vWPvHps6GEoM * 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) -- 2.34.0