From patchwork Wed Apr 20 17:52:38 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: 38711 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 5623827BBEA; Wed, 20 Apr 2022 18:54: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 DF94727BBE9 for ; Wed, 20 Apr 2022 18:54:16 +0100 (BST) Received: from localhost ([::1]:45526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhEWu-0007H1-0n for patchwork@mira.cbaines.net; Wed, 20 Apr 2022 13:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEWg-0007GS-JD for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEWg-0007SW-BA for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhEWg-000734-AY for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0. References: <87mtgf63xj.fsf@gmail.com> In-Reply-To: <87mtgf63xj.fsf@gmail.com> Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Apr 2022 17:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55045@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 55045-submit@debbugs.gnu.org id=B55045.165047719426982 (code B ref 55045); Wed, 20 Apr 2022 17:54:02 +0000 Received: (at 55045) by debbugs.gnu.org; 20 Apr 2022 17:53:14 +0000 Received: from localhost ([127.0.0.1]:47392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEVt-000717-KY for submit@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:13 -0400 Received: from mail-oo1-f48.google.com ([209.85.161.48]:45946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEVr-00070r-Qv for 55045@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:12 -0400 Received: by mail-oo1-f48.google.com with SMTP id i21-20020a4ad395000000b0033a4c45246dso413948oos.12 for <55045@debbugs.gnu.org>; Wed, 20 Apr 2022 10:53:11 -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=SC4ksO4HgQDZFFEBNpw9xxMv9l3iGQDfhdDJ/KKL77E=; b=HBBFjJ8v5Q57H9XenOtpyaVosPe6VfopiljeArFHukDARFAX0r/XcZY2w2RYS4aYYW GOnFjiKzDCyiJU2t4iLBf6cRppasmJec6gj0T5CbMzkZn0NKkvL0ZsXdyRTfSlVr29TM FjCz7uLk/oSgh4Is3vqdfS3gijouj9BZeXtxSYDZ5TALC/bBzSHK9n8bO0yKrSfoMSI0 3eS+sM7NiD40LRVG/qX+Jxu865HBL/u5QkcMDNnFiUmygGtqXS1MkXBMWHf0HQt1PtEj dLtIuwdOAejoVvIaLuHIuana6zzwbJOKuuLwo79sMxj7/P96O0B9dy/yMOjmXzIh5t07 bWSg== 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=SC4ksO4HgQDZFFEBNpw9xxMv9l3iGQDfhdDJ/KKL77E=; b=EchwFSsVqDh/bEFosLJnQAVI8AVY/ubOveJV1U4XwNS9tbYrP/PZ/5yOwc3H6n0Cdh 0uIF7uCtwuj5rGh63pwe9ZD3qVy+fi80mOWoq7lKSYWAER/Wy254LqJ/fLdqZyhX98Zv f4CFUjycdm4N8CcrAbxYrUAc3l1RNXGz7k8ICdMPtpfNWFPOV6DN19OBciJsA94PEbdQ PiU/95GI7Ojmp8ub5MsRYDf5C5pYv7DxYNAgfftBagV58CltiTZ82kALxtbw6EDFoXC7 48GXlILXt1DBwsHEfyb6yIct094F8K7LQtYwce2Y/CYc926AShRdnBJLKpCPt4NIqsxK x3EQ== X-Gm-Message-State: AOAM530CTlTzC2+/kxvtdMaKqmQWSxaNn0Y/BJBsB6FLaNnvYuHAIMOk Ehn70gGb/O0uHOWClmhMzS/1Fth75/k= X-Google-Smtp-Source: ABdhPJzoVItkJ0rsHunxpFNTBitHiwLfPO2v1eSGY/DqR6ZMby7Et3criMg4NC/4Z9iOfcECJAuuAw== X-Received: by 2002:a4a:e217:0:b0:329:b0d:c32d with SMTP id b23-20020a4ae217000000b003290b0dc32dmr7574592oot.34.1650477185758; Wed, 20 Apr 2022 10:53:05 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2787:e10d:8125:629f:8cfe:dda8]) by smtp.gmail.com with ESMTPSA id f24-20020a9d5e98000000b006055789d903sm1935519otl.16.2022.04.20.10.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 10:53:05 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 20 Apr 2022 14:52:38 -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/lua.scm (lua-luv): Update to 1.43.0-0. Update lua-compat-5.3. --- gnu/packages/lua.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index ee4b7727e0..2f89d42ba5 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 Vinícius dos Santos Oliveira ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Brandon Lucas +;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; ;;; This file is part of GNU Guix. ;;; @@ -785,7 +786,7 @@ (define-public lua5.2-lpeg (define (make-lua-luv name lua) (package (name name) - (version "1.32.0-0") + (version "1.43.0-0") (source (origin ;; The release tarball includes the sources of libuv but does ;; not include the pkg-config files. @@ -796,7 +797,7 @@ (define (make-lua-luv name lua) (file-name (git-file-name name version)) (sha256 (base32 - "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh")))) + "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are none @@ -813,7 +814,7 @@ (define (make-lua-luv name lua) (copy-recursively (assoc-ref inputs "lua-compat") "lua-compat") (setenv "CPATH" - (string-append (getcwd) "/lua-compat:" + (string-append (getcwd) "/lua-compat/c-api:" (or (getenv "CPATH") ""))) #t))))) (inputs @@ -824,11 +825,11 @@ (define (make-lua-luv name lua) (method git-fetch) (uri (git-reference (url "https://github.com/keplerproject/lua-compat-5.3") - (commit "daebe77a2f498817713df37f0bb316db1d82222f"))) + (commit "v0.10"))) (file-name "lua-compat-5.3-checkout") (sha256 (base32 - "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz")))))) + "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4")))))) (home-page "https://github.com/luvit/luv/") (synopsis "Libuv bindings for Lua") (description From patchwork Wed Apr 20 17:52:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 38714 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 360BC27BBEA; Wed, 20 Apr 2022 18:54:28 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 F352927BBE9 for ; Wed, 20 Apr 2022 18:54:27 +0100 (BST) Received: from localhost ([::1]:46164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhEX5-0007jO-5l for patchwork@mira.cbaines.net; Wed, 20 Apr 2022 13:54:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Ga-0h for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53507) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEWg-0007Se-Om for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhEWg-00073B-NE for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Apr 2022 17:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55045@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 55045-submit@debbugs.gnu.org id=B55045.165047720127001 (code B ref 55045); Wed, 20 Apr 2022 17:54:02 +0000 Received: (at 55045) by debbugs.gnu.org; 20 Apr 2022 17:53:21 +0000 Received: from localhost ([127.0.0.1]:47395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW0-00071R-W8 for submit@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:21 -0400 Received: from mail-oi1-f180.google.com ([209.85.167.180]:40462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEVy-000714-M4 for 55045@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:18 -0400 Received: by mail-oi1-f180.google.com with SMTP id r85so2906823oie.7 for <55045@debbugs.gnu.org>; Wed, 20 Apr 2022 10:53:18 -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=gekOsquYeG+Lbnr+IO+Xwn62yBM6TJgBTmG93UF7HQQ=; b=endNoImhiz9Zw3c8faop+Chnib+c9erN9jfSGTrSMkQ+edW6tzeJYVWm8B8uT/nhP5 kwLFVWNv5VajHkYbb4eZuwfGsP+jFuiSfVUJ0jCYe9l/2XR/jkbPoxYlI63YnyrAsnrY rqq1o6Suy1evN+YfY3Dqb4Kxv7D/t2Ox8+hzsKD8q8uPBmPmbY202rrBrCk72TkiWoqR IPb/O2UX8+o9FKI6G+l4y63sdb+5CrCWM5gyzRUFvKB9tWVtjry2+mOloXjyrhPKpQvj I6xbwwGQV6pdyDbwPWROdq91bz+tnfQ2Mt0DOJ7DXhAKwHhTXT0Gr2E0wIg54HvTc+6o oiDA== 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=gekOsquYeG+Lbnr+IO+Xwn62yBM6TJgBTmG93UF7HQQ=; b=K8c/8AVLuGIEi/puy9xo5bko0Zbfxq+sSdJzuNi4rObokkldk5syFiI++zmO4my3mx 9c6pKigc2qwEodOpeg0RjzPYLdOvmW1cu0ML58oYEF++W1Km4hbXZSuz1qLofZfNFSoR LfnJTs5Plwu899BevzIFypWBpkWdPLFSKj74+raH08gsNAslyO1XBfAgLnYk/99Gy1pt OuO4IBBzTeP2TIa9QnRXyM09yqhGG4lnO0GD8yW/11ypl45iq6lGxb4RZNioWmnQ/UN7 ITSljZHiffwIVy+8e5j6zu15LbUWVTZMASrgifOWLAYEC33P/JVtOe8aWIuVMkQTfMeh 1Z+A== X-Gm-Message-State: AOAM532WxsSd5lNE8U3++HP/DTRtokm1XNTbXAFQGsyFBi+hPzu59fq+ VMEItMm4jnCeoq/4ML2W9V6IZN4FcOo= X-Google-Smtp-Source: ABdhPJzxCpVdh3Vmu+ebEisjifwb9o8bN9gH8LpsD+WrAtYizKjE34YGgN3RalAgj+Jmow2RZVKt1g== X-Received: by 2002:aca:ead4:0:b0:2ec:ba66:12df with SMTP id i203-20020acaead4000000b002ecba6612dfmr2468884oih.194.1650477192613; Wed, 20 Apr 2022 10:53:12 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2787:e10d:8125:629f:8cfe:dda8]) by smtp.gmail.com with ESMTPSA id f24-20020a9d5e98000000b006055789d903sm1935519otl.16.2022.04.20.10.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 10:53:12 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 20 Apr 2022 14:52:39 -0300 Message-Id: <9840ff3c42bcd4d8b8adcc402e935be3b213163a.1650477097.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/lua.scm (lua-luv): replace sexps with gexps. --- gnu/packages/lua.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 2f89d42ba5..ba101f0d6c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -800,23 +800,23 @@ (define (make-lua-luv name lua) "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; there are none - #:configure-flags - '("-DWITH_LUA_ENGINE=Lua" - "-DWITH_SHARED_LIBUV=On" - "-DBUILD_MODULE=Off" - "-DBUILD_SHARED_LIBS=On" - "-DLUA_BUILD_TYPE=System") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-lua-compat - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "lua-compat") - "lua-compat") - (setenv "CPATH" - (string-append (getcwd) "/lua-compat/c-api:" - (or (getenv "CPATH") ""))) - #t))))) + (list #:tests? #f ; there are none + #:configure-flags + #~'("-DWITH_LUA_ENGINE=Lua" + "-DWITH_SHARED_LIBUV=On" + "-DBUILD_MODULE=Off" + "-DBUILD_SHARED_LIBS=On" + "-DLUA_BUILD_TYPE=System") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-lua-compat + (lambda* _ + (copy-recursively #+(this-package-native-input "lua-compat") + "lua-compat") + (setenv "CPATH" + (string-append (getcwd) "/lua-compat/c-api:" + (or (getenv "CPATH") ""))) + #t))))) (inputs (list lua libuv)) (native-inputs From patchwork Wed Apr 20 17:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 38712 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 A9A8D27BBEA; Wed, 20 Apr 2022 18:54: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 7F54D27BBE9 for ; Wed, 20 Apr 2022 18:54:17 +0100 (BST) Received: from localhost ([::1]:45534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhEWu-0007Hb-Kp for patchwork@mira.cbaines.net; Wed, 20 Apr 2022 13:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Gi-C1 for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Sn-3U for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhEWh-00073J-2u for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH 3/4] gnu: neovim: Update to 0.7.0. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Apr 2022 17:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55045@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 55045-submit@debbugs.gnu.org id=B55045.165047720327017 (code B ref 55045); Wed, 20 Apr 2022 17:54:03 +0000 Received: (at 55045) by debbugs.gnu.org; 20 Apr 2022 17:53:23 +0000 Received: from localhost ([127.0.0.1]:47398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW3-00071h-7R for submit@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:23 -0400 Received: from mail-oi1-f171.google.com ([209.85.167.171]:37608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW2-00071I-Kx for 55045@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:22 -0400 Received: by mail-oi1-f171.google.com with SMTP id q129so2923375oif.4 for <55045@debbugs.gnu.org>; Wed, 20 Apr 2022 10:53:22 -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=1ZSIThxqZp9z+CpxQWpFVLjnf8V5FpoGV/lhNW2fij4=; b=PrBSjVbt4zOUKlPKlouYAzZ+81CfDKCCiZY+FYfJ5LYaJ2d79vio2L7z3WjAhb6Ifu 6fkN8vyjLAfeXtHi9tQiv85WgmVk468Ypa4aikkdGsOIHUKcP8ZmrmjeHhKv7EWSRKPs RrlYhoHbEe3j/Jha4l+WNTrUBCaINHMJSKB6A1rteu3i9SjrXJcHbq17a8rtnt+9WH14 vVQ4vGeB3DJxv4Pq70marE0n6yo98PggVsJdk+2FgJ+nuFpNpUAWA6wFwmSjHjeUTJFy pPMgxeSO4qDi/fNCn5ifV8eHZRADlfYAjUBPaYWpdEP015p9u3F48napgB6EYxQEEyb5 QQTg== 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=1ZSIThxqZp9z+CpxQWpFVLjnf8V5FpoGV/lhNW2fij4=; b=wiZ+A3flYEbzMfANXe6KMdnm2JRzDGknf4cikP6Ey0JqwPVZ7t+XamvgmWERVoAoMt kn5dA5O0gDP6WCkwdSOb6Y3/uSgRPVXKUyl+tLFlHuykwidMci+Lqs+40VgEdqm+G6lV nS+zcCuVPIE6sG91hGpzWUwbN/jkgYR7lmW+PGmjo6ZMN0J5CACYrYu2ScYCuV2nlJQX EVmUzBpyrB+D5KM5Q2pGI2MuAPeBt+VWyY7IqvgERZaxMMp2/g4lX9ye2HDcaAouTRdH f1mxR86BUjGpMaR70sZEQJ/314OHGwnahR4aW+xSl91+hSQDURak1+WOYVAxfKcMfLLR jFFg== X-Gm-Message-State: AOAM530jW2rRfVstna33A2BlJ6SplvUXbnsZwW6QiWAubyyNrz/Qy+kK Qhj9Ja8kaAOgHwk3YRPT/zbQBsEA/SE= X-Google-Smtp-Source: ABdhPJwWAq5JmrjHEYYezhslUU7RodK0wdB2lQVr+RZ27+sElfnZAWXyRWQPEFu26znLZU4bv9mckQ== X-Received: by 2002:a05:6808:17a9:b0:2fa:17b7:184d with SMTP id bg41-20020a05680817a900b002fa17b7184dmr2264958oib.45.1650477196814; Wed, 20 Apr 2022 10:53:16 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2787:e10d:8125:629f:8cfe:dda8]) by smtp.gmail.com with ESMTPSA id f24-20020a9d5e98000000b006055789d903sm1935519otl.16.2022.04.20.10.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 10:53:16 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 20 Apr 2022 14:52:40 -0300 Message-Id: <2f8057a93dcd498199f587f2b4f384c90ca253a5.1650477097.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.7.0. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7279798fe6..d04ee49775 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -668,7 +668,7 @@ (define-public neovim-syntastic (define-public neovim (package (name "neovim") - (version "0.6.1") + (version "0.7.0") (source (origin (method git-fetch) @@ -677,7 +677,7 @@ (define-public neovim (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx")))) + (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) From patchwork Wed Apr 20 17:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 38713 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 665A127BBEA; Wed, 20 Apr 2022 18:54:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 C486A27BBE9 for ; Wed, 20 Apr 2022 18:54:17 +0100 (BST) Received: from localhost ([::1]:45564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhEWu-0007J2-Ul for patchwork@mira.cbaines.net; Wed, 20 Apr 2022 13:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Gq-OY for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Sw-Fr for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhEWh-00073Q-Fg for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Apr 2022 17:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55045@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 55045-submit@debbugs.gnu.org id=B55045.165047720927040 (code B ref 55045); Wed, 20 Apr 2022 17:54:03 +0000 Received: (at 55045) by debbugs.gnu.org; 20 Apr 2022 17:53:29 +0000 Received: from localhost ([127.0.0.1]:47401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW8-000724-EJ for submit@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:29 -0400 Received: from mail-oi1-f173.google.com ([209.85.167.173]:39890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW6-00071Y-Kk for 55045@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:27 -0400 Received: by mail-oi1-f173.google.com with SMTP id z2so2909115oic.6 for <55045@debbugs.gnu.org>; Wed, 20 Apr 2022 10:53:26 -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=qgwBCASOLdQFWbcv9YjpWJ+JsqrHIvNuACf+Lasl33w=; b=PQRS79mtHDTQRA24r3f7Fob71g2tjb06ewJ4cLlbAgzJUvTyx19q17YU1PMPuHTkCZ n8SQM6D8CfRxVhoGz54avV2NlrMeOXP16X7sd+oe0CcGJmhHTe+LJNBZppFvDmiAQrXu A6NFhlZXdHQkSuc1DdJM73YKtLA+eTKhKqa8qG6W2hCcVwVnV4SH9NEXAjCF2YMBNGAu FN+3lkWX+khe4TFmnmSAk4PGbEPmXvyq/DrAYnuxo9cBBEij0PnAVtYCIdh+ICnIR9U3 ldhe0FF/7pYTyzP9XRgzWxx8IpVRjPu0jfMgbnE0nlcWfvPUbUMadxHBUTCGzwSuvaYh b+fg== 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=qgwBCASOLdQFWbcv9YjpWJ+JsqrHIvNuACf+Lasl33w=; b=yDjFPOeOMfVPfYGTMrJ+/zQQNAamV/KF5rlihetnyE+U8vcMG3HiJNUkra0Bx7M4kB EJZZ/pBV7IPCDqa/MjqEvSY5PQuAxkPB1jBIxTjljAKuuwVla0lEL2s0BihuKhwDmX3A nnhlwbSYDdVZJdhLw291NHWE1VrmJ3N79tjRstlUWiyhUdWqlk4i/+HLRB0/lker77+r TWG/i/vS5O7biRZ3r5+PYG3xUXSVvhHdhMCKdgSi95n0XwW0c7nageGF2DCO6S1WWZnG hOlAodvm8iIdX+cQW0qUMApeCjAmuMXa5WMVPX+sInlvOjoX6sv+z1yTWggy2MngD9TD JI8A== X-Gm-Message-State: AOAM532JNeqiaM3rC/OcCAhhHNkMJuBEDY82uaQ27Ocp3L+x9PEmRuQN /lFlsQTRbBbCDW65dVFHcdyMQ6WBZWU= X-Google-Smtp-Source: ABdhPJysGIO5s7YsWBCAh+JmnGMVjOIhIx8ONmd8djSHroTeGahXzQf53UGCkBh7K+KI4KBSF2DFFQ== X-Received: by 2002:aca:f188:0:b0:2fa:6d3f:c316 with SMTP id p130-20020acaf188000000b002fa6d3fc316mr2246771oih.86.1650477200820; Wed, 20 Apr 2022 10:53:20 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2787:e10d:8125:629f:8cfe:dda8]) by smtp.gmail.com with ESMTPSA id f24-20020a9d5e98000000b006055789d903sm1935519otl.16.2022.04.20.10.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 10:53:20 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 20 Apr 2022 14:52:41 -0300 Message-Id: <90d9b054aa3eb057828ccdfee15a224fe6d0992e.1650477097.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): replace sexps with gexps. Also run `guix style neovim`. --- gnu/packages/vim.scm | 153 ++++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d04ee49775..8ded61e097 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -669,84 +669,86 @@ (define-public neovim (package (name "neovim") (version "0.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/neovim/neovim") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neovim/neovim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) (build-system cmake-build-system) (arguments - `(#:modules ((srfi srfi-26) - (guix build cmake-build-system) - (guix build utils)) - #: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 - (lambda* (#:key inputs #:allow-other-keys) - (let* ((lua-version "5.1") - (lua-cpath-spec - (lambda (prefix) - (let ((path (string-append prefix "/lib/lua/" lua-version))) - (string-append path "/?.so;" path "/?/?.so")))) - (lua-path-spec - (lambda (prefix) - (let ((path (string-append prefix "/share/lua/" lua-version))) - (string-append path "/?.lua;" path "/?/?.lua")))) - (lua-inputs (map (cute assoc-ref inputs <>) - '("lua" - "lua-luv" - "lua-lpeg" - "lua-bitop" - "lua-libmpack")))) - (setenv "LUA_PATH" - (string-join (map lua-path-spec lua-inputs) ";")) - (setenv "LUA_CPATH" - (string-join (map lua-cpath-spec lua-inputs) ";")) - #t))) - (add-after 'unpack 'prevent-embedding-gcc-store-path - (lambda _ - ;; nvim remembers its build options, including the compiler with - ;; its complete path. This adds gcc to the closure of nvim, which - ;; doubles its size. We remove the refirence here. - (substitute* "cmake/GetCompileFlags.cmake" - (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) - (inputs - `(("libuv" ,libuv) - ("msgpack" ,msgpack) - ("libtermkey" ,libtermkey) - ("libvterm" ,libvterm) - ("unibilium" ,unibilium) - ("jemalloc" ,jemalloc) - ("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) - ("tree-sitter" ,tree-sitter))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("gperf" ,gperf))) + (list #:modules + '((srfi srfi-26) (guix build cmake-build-system) + (guix build utils)) + #: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 + (lambda* _ + (let* ((lua-version "5.1") + (lua-cpath-spec (lambda (prefix) + (let ((path (string-append + prefix + "/lib/lua/" + lua-version))) + (string-append + path + "/?.so;" + path + "/?/?.so")))) + (lua-path-spec (lambda (prefix) + (let ((path (string-append prefix + "/share/lua/" + lua-version))) + (string-append path "/?.lua;" + path "/?/?.lua")))) + (lua-inputs (list (or #$(this-package-input "lua") + #$(this-package-input "luajit")) + #$lua5.1-luv + #$lua5.1-lpeg + #$lua5.1-bitop + #$lua5.1-libmpack))) + (setenv "LUA_PATH" + (string-join (map lua-path-spec lua-inputs) ";")) + (setenv "LUA_CPATH" + (string-join (map lua-cpath-spec lua-inputs) ";")) + #t))) + (add-after 'unpack 'prevent-embedding-gcc-store-path + (lambda _ + (substitute* "cmake/GetCompileFlags.cmake" + (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) + #t))))) + (inputs (list libuv + msgpack + libtermkey + libvterm + unibilium + jemalloc + (if (member (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + (%current-system)) + (package-supported-systems luajit)) + luajit + lua-5.1) + lua5.1-luv + lua5.1-lpeg + lua5.1-bitop + lua5.1-libmpack + tree-sitter)) + (native-inputs (list pkg-config gettext-minimal gperf)) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") - (description "Neovim is a project that seeks to aggressively + (description + "Neovim is a project that seeks to aggressively refactor Vim in order to: @itemize @@ -754,7 +756,8 @@ (define-public neovim @item Split the work between multiple developers @item Enable advanced external UIs without modifications to the core @item Improve extensibility with a new plugin architecture -@end itemize\n") +@end itemize +") ;; Neovim is licensed under the terms of the Apache 2.0 license, ;; except for parts that were contributed under the Vim license. (license (list license:asl2.0 license:vim))))