From patchwork Tue May 17 23:16:44 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: 39458 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 C65C527BBEA; Wed, 18 May 2022 00:18:14 +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 9671627BBE9 for ; Wed, 18 May 2022 00:18:13 +0100 (BST) Received: from localhost ([::1]:45708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nr6SC-0003HL-Ow for patchwork@mira.cbaines.net; Tue, 17 May 2022 19:18:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr6S1-0003Ge-WC for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nr6S1-00078j-No for guix-patches@gnu.org; Tue, 17 May 2022 19:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nr6S1-0000YT-KO for guix-patches@gnu.org; Tue, 17 May 2022 19:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v2 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: Tue, 17 May 2022 23:18:01 +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.16528294402055 (code B ref 55045); Tue, 17 May 2022 23:18:01 +0000 Received: (at 55045) by debbugs.gnu.org; 17 May 2022 23:17:20 +0000 Received: from localhost ([127.0.0.1]:58361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RG-0000Wm-PJ for submit@debbugs.gnu.org; Tue, 17 May 2022 19:17:20 -0400 Received: from mail-oi1-f179.google.com ([209.85.167.179]:33317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RE-0000WU-5b for 55045@debbugs.gnu.org; Tue, 17 May 2022 19:17:12 -0400 Received: by mail-oi1-f179.google.com with SMTP id w130so768746oig.0 for <55045@debbugs.gnu.org>; Tue, 17 May 2022 16:17:12 -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=qN6doWGqEkv/fzdsPs31Nu7eQ6Z8DZaF2pgtQhVYs+w=; b=cJZNkzUzhqotZdidsjAGo9dY/wdTe1fBQ7lxz6gIziN9o0gKs+XjvMl+ACj7tVt2MU TLWjmyZKCVnPDiWnV1LCTvAfz7pu6RAkSka2a+ijhLXShhy5chLpO0vEWzleL6o5wEtY ubZ2StBsiWMkjTP/fbW00TV/q+7Te9/r8iDyZCEi0k+SJpXVi3RfOXx9NFP2/aGmjQ6z Sg9bd3MFybPKKHwMiXb8FKqq0iOILvUWb2OftwmTBOcDgFvj96KEx07cAEJovFEjoiQT jnMPVOaEagx4odOmBSvzmAVUDX3BVC0Mr6mhovYDu2BKk3WlwTnAT466zloIhBf8MlqT VupA== 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=qN6doWGqEkv/fzdsPs31Nu7eQ6Z8DZaF2pgtQhVYs+w=; b=1ZkKqboYdlQMm1wzXVVqHZNjTnG5epuTlj4gZr3eVUZGLKDqYTqql17LAceadVjx/z Nn9hYVwd1U7vvrocVfhAgDyw5HtrEQjcMfOx1kWGblyX1nBQiFYjvRCgBwTd8fC5lbxD QQ8/yDs3TJJSK0zLvnhotkWFJ7k3nkZN9tPmyU8bKw3dsKk/kdazjh7ekDXgew7QvMg6 6faQkVODhTEUp/fBPeqkylCyDBz76xgWVnRhz5axfXiOglTIJFfToRNbkCdrRmkRPOxb csFZPZ2va/UatmKjddYzcLpvEnyNctHreykNJjcs84Si2Tg6+6tz4PRS7Kg6ACVyEBJB PXGw== X-Gm-Message-State: AOAM530BfgJeWqwbhAzCScDgbfwFXS2KLbbj2NHaRQBt5v5Attfa+ud2 pYgqddK098xXOGqF3Y13I8SYnXL9TUmCWJJz X-Google-Smtp-Source: ABdhPJyg2wqkcPR8B6roykLH4oetYYs/fKhkKHzsMFK+7D9ow1Q/eViSmVlLa31LUUTtSjJg8W29HA== X-Received: by 2002:aca:abcd:0:b0:326:ad9c:d88e with SMTP id u196-20020acaabcd000000b00326ad9cd88emr11458440oie.223.1652829425917; Tue, 17 May 2022 16:17:05 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:c200:fc7:399f:1d5:1b26:e154]) by smtp.gmail.com with ESMTPSA id r3-20020a4a83c3000000b0035eb4e5a6c2sm340976oog.24.2022.05.17.16.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 16:17:05 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Tue, 17 May 2022 20:16:44 -0300 Message-Id: <20220517231647.18336-1-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.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/libevent.scm (libuv-for-luv): New variable * gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0. [inputs]: Change libuv to libuv-for-luv. [native-inputs]: Update lua-compat-5.3 to 0.10. --- gnu/packages/libevent.scm | 17 +++++++++++++++++ gnu/packages/lua.scm | 13 +++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b3a5cd915e..d807315906 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,6 +170,22 @@ (define-public libuv-julia (home-page "https://github.com/JuliaLang/libuv") (properties '((hidden? . #t)))))) +(define-public libuv-for-luv + ;; When upgrading make-lua-luv, also upgrade this. Get the version from + ;; https://github.com/luvit/luv/blob/master/CMakeLists.txt + (package + (inherit libuv) + (name "libuv") + (version "1.43.0") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh")))) + (properties '((hidden? . #t))))) + (define-public perl-anyevent (package (name "perl-anyevent") diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index ee4b7727e0..0662b2d064 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,22 +814,22 @@ (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 - (list lua libuv)) + (list lua libuv-for-luv)) (native-inputs `(("lua-compat" ,(origin (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 Tue May 17 23:16:45 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: 39459 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 2170E27BBEC; Wed, 18 May 2022 00:18:14 +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 B802127BBEB for ; Wed, 18 May 2022 00:18:13 +0100 (BST) Received: from localhost ([::1]:45716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nr6SC-0003II-TI for patchwork@mira.cbaines.net; Tue, 17 May 2022 19:18:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr6S2-0003Gm-E0 for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nr6S2-00078p-5P for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nr6S2-0000Yb-1F for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 May 2022 23:18:01 +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.16528294402062 (code B ref 55045); Tue, 17 May 2022 23:18:01 +0000 Received: (at 55045) by debbugs.gnu.org; 17 May 2022 23:17:20 +0000 Received: from localhost ([127.0.0.1]:58365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RM-0000X6-2q for submit@debbugs.gnu.org; Tue, 17 May 2022 19:17:20 -0400 Received: from mail-oi1-f176.google.com ([209.85.167.176]:44926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RH-0000WY-Fg for 55045@debbugs.gnu.org; Tue, 17 May 2022 19:17:16 -0400 Received: by mail-oi1-f176.google.com with SMTP id i66so673847oia.11 for <55045@debbugs.gnu.org>; Tue, 17 May 2022 16:17:15 -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=8TsoQt4KZ4n5w2hIMrrgxUDQf9baL/sOFnXtVpgye6U=; b=cH6uFoPD5oD2gLslS0sFjsK/8b4rqAC67ruDb4cIG/mRTSCl/A15OvftGoa/AOiXtm Y4DYK6aGFixU4TZ9kQNYwXw1ME1IojH4oLWD4yqaAvBcZEBH64ptzJeeayY0MZE80+h+ ldEQYVkLHS00kHFbhghQ7oegUejSudsZqQWDpiY5Sm6XwNbGwVpx8fgFLutiyyfVQU+P Teex3RouH1mE6WyPKExEFRE4XHXwryUHStgNcM09KY7+Da8eRh2bCbyfpgmBRl7nUpBR xBr9gOoWLYWPPZx19biWTdCshzquyFEGKX8msNjGT+QpAuXzpKiA3vhEI21gzG10nyld jj7Q== 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=8TsoQt4KZ4n5w2hIMrrgxUDQf9baL/sOFnXtVpgye6U=; b=eekU1DODZZaLFwo4uB0KryjYNvg2VK1HvoO4rT9JfkWbhVG7oR4+GhiH0kQ+2pQ48U FR+4IqMNy3YBpovzW5ubXD67BYcKZcjSvQzrtbFDW4vhEhASOXcy7fBGqfUfwzWa2Zcn xPgZ+oFYJrNsIR4WiyIdZjxUzSQ2Rk37OVHrr47JQD1z+oOBrERXPyLq3F9tNTxLafXl 91OixptICJy5M4X0lqFyDtMUloQxKHh+eLMa5Hft0HGNt4B29Z5Po9/7OfIDKvBr2NIb P36wbHs5btOYRVihslO9TF9Xq9/8rFed7hoBJLo5wFPl84WeubdZPHoigIkQO4fj1doX yeJA== X-Gm-Message-State: AOAM531QUNCoA501pdOhGs9swjwyGYlQ5a+FON99ouNmOzm9iw5dOIjj 9fgcXDk5rXZz4wL+J3VSDIwqmbjmp06iUqLh X-Google-Smtp-Source: ABdhPJzsL3CyoRsVBuUT8NGzUrEnnSbyLqGYbf3Sdub+WLSX6FUtDEGwmMV0gKst+dXeO7+uhP7M8A== X-Received: by 2002:a05:6808:230c:b0:326:4acf:1517 with SMTP id bn12-20020a056808230c00b003264acf1517mr17019272oib.117.1652829429406; Tue, 17 May 2022 16:17:09 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:c200:fc7:399f:1d5:1b26:e154]) by smtp.gmail.com with ESMTPSA id r3-20020a4a83c3000000b0035eb4e5a6c2sm340976oog.24.2022.05.17.16.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 16:17:08 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Tue, 17 May 2022 20:16:45 -0300 Message-Id: <20220517231647.18336-2-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517231647.18336-1-luishenriquegh2701@gmail.com> References: <20220517231647.18336-1-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/lua.scm (lua-luv)[arguments]: Rewrite using 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 0662b2d064..afebc6bc1f 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-for-luv)) (native-inputs From patchwork Tue May 17 23:16:46 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: 39457 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 86C2927BBEB; Wed, 18 May 2022 00:18:13 +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 5A06D27BBE9 for ; Wed, 18 May 2022 00:18:13 +0100 (BST) Received: from localhost ([::1]:45710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nr6SC-0003HO-HN for patchwork@mira.cbaines.net; Tue, 17 May 2022 19:18:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr6S2-0003Gv-Qa for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nr6S2-00078v-Ht for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nr6S2-0000Yi-ER for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v2 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: Tue, 17 May 2022 23:18: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.16528294542091 (code B ref 55045); Tue, 17 May 2022 23:18:02 +0000 Received: (at 55045) by debbugs.gnu.org; 17 May 2022 23:17:34 +0000 Received: from localhost ([127.0.0.1]:58367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RM-0000XD-AX for submit@debbugs.gnu.org; Tue, 17 May 2022 19:17:34 -0400 Received: from mail-oi1-f176.google.com ([209.85.167.176]:37548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RK-0000Wk-JN for 55045@debbugs.gnu.org; Tue, 17 May 2022 19:17:18 -0400 Received: by mail-oi1-f176.google.com with SMTP id r1so713505oie.4 for <55045@debbugs.gnu.org>; Tue, 17 May 2022 16:17: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=XUl2LP4MK4VcuaEWTXXK2L8MmSqeG1vw+gRySLAZKjA=; b=Mw/MNP5Ohnt9l1qyQ8hewrqJupLDUi1Ft1OjoT3QgJ3FzhTOCkptIUMnevlX+ZDQkZ nuAF4vJAYoQr0tDKyBmv27CAyxXRzltL54972EeWkpD5V0zh26jLOBamc1YXQjsMQccC UcM9C+PdJcYL9GA/9XJgKQbEj47fSoEeST3zPBggrSbNqMPdTL2loI34EpxR55mRjfT9 Yh/Vc71Td9zQlBE4mtpqsveKy4I2u8hDCcA24ycBWiZwA0pkekDgsm46B8zPhnvCvcTX W+OYfEafAxi45M3bs5a27IVzDhAkZtTWz5Fg/mJs8L8Y7odjDL0Fm70jnU2+ulDVwCtX 9cLQ== 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=XUl2LP4MK4VcuaEWTXXK2L8MmSqeG1vw+gRySLAZKjA=; b=e0euZXsF3BT/5rCuxJdyNgkekaDmAO35egQY69sBIdjYjJI3lHznFjttpL77OBRlXx ynomdgH8y4A9WD7OAYMb2WzdIzStJJYWJCBuEfPjJftn1cj0dA+kCBktYAIiN58Ie+zQ vj3pRWMyebf3XEmxdmRHf8VxzOs3r2/JDs9XvdbCY1CuJM+d9m3M33Bjse5d2i4v6u3E /8EMMqYMjNNQRYor/rXU/y4FsBJiqECSSD7qQOk+ke1HYLLcKdWRaVGwFMKM/CvuEM37 S3thRwyEDCOlfF+IlZV3pv0G3Kk3FPHljfiiqPhqnFBA8dW5Ir74fwdnZ3h/wiG9wZvc DOVg== X-Gm-Message-State: AOAM530casZV2l3IX8vW1TRcsxTLTlDbK9QgRE4Teu83eXfO02fUUT07 ZBtBQSpMRSmCienNQquZdgkPVm5fjVkUeBCx X-Google-Smtp-Source: ABdhPJzrAS2KGHxuv0KM0fHm7P2pzh6ACFA30B0cKU9fxA039NTimVYnIfDyWQKuJidv7KXa64hm5Q== X-Received: by 2002:aca:a98e:0:b0:326:b029:33ef with SMTP id s136-20020acaa98e000000b00326b02933efmr17122502oie.123.1652829432676; Tue, 17 May 2022 16:17:12 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:c200:fc7:399f:1d5:1b26:e154]) by smtp.gmail.com with ESMTPSA id r3-20020a4a83c3000000b0035eb4e5a6c2sm340976oog.24.2022.05.17.16.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 16:17:12 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Tue, 17 May 2022 20:16:46 -0300 Message-Id: <20220517231647.18336-3-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517231647.18336-1-luishenriquegh2701@gmail.com> References: <20220517231647.18336-1-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.7.0. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index bb459933b0..21a22570ad 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -658,7 +658,7 @@ (define-public neovim-syntastic (define-public neovim (package (name "neovim") - (version "0.6.1") + (version "0.7.0") (source (origin (method git-fetch) @@ -667,7 +667,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) @@ -713,7 +713,7 @@ (define-public neovim (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) #t))))) (inputs - `(("libuv" ,libuv) + `(("libuv" ,libuv-for-luv) ("msgpack" ,msgpack) ("libtermkey" ,libtermkey) ("libvterm" ,libvterm) From patchwork Tue May 17 23:16:47 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: 39460 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 EDAB727BBEA; Wed, 18 May 2022 00:18:15 +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 58EB927BBE9 for ; Wed, 18 May 2022 00:18:15 +0100 (BST) Received: from localhost ([::1]:45798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nr6SE-0003LF-FM for patchwork@mira.cbaines.net; Tue, 17 May 2022 19:18:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr6S3-0003H6-6v for guix-patches@gnu.org; Tue, 17 May 2022 19:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nr6S2-000791-Un for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nr6S2-0000Yp-R4 for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 May 2022 23:18: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.16528294552098 (code B ref 55045); Tue, 17 May 2022 23:18:02 +0000 Received: (at 55045) by debbugs.gnu.org; 17 May 2022 23:17:35 +0000 Received: from localhost ([127.0.0.1]:58370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6Ra-0000Xg-Gq for submit@debbugs.gnu.org; Tue, 17 May 2022 19:17:34 -0400 Received: from mail-oa1-f51.google.com ([209.85.160.51]:33832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RN-0000Wr-Gt for 55045@debbugs.gnu.org; Tue, 17 May 2022 19:17:21 -0400 Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-f189b07f57so592502fac.1 for <55045@debbugs.gnu.org>; Tue, 17 May 2022 16:17:21 -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=RBxLmKmfAMj7GBIwidfBX7HjpSKd1SjlezzYUJMZ9AM=; b=ATVzMbETFkSpBrR97JCLXvayadfjR30vS0GQNEVZybwPYy+ZnGrQOT9JTPexEo+Rsw O20VDZm8K4GKfkfbopOXrJ3pgUVoaaRZ0hn6TqXZoTLkTUUCxB/XTWdhZYBJrLWVS0Rh ocUsUw/sK5zyhwLbLKffemw/1VuOXaboWRJtnBHL0ZVRw44qCqolGr+9T6IdYY7hwMX7 bE6oBlljFckT010448lDaK6k6J/Nq94r2dwhJh91qnIvtGifURKMO7Le3Behr1bbyaqJ 3OJlJwUWah7jP+7V+vNHUsfvLrNfxizAuYRg0jhDA+kdtSDqEYqllk5ZJ7n5dplICWv0 Fjkg== 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=RBxLmKmfAMj7GBIwidfBX7HjpSKd1SjlezzYUJMZ9AM=; b=KzVfX/ylMV3nMpARYa1X03sc/WaHlC0WXosgBFQn0epf7xqlK4IFshUp4mcS7On4fN BLxaZBNP3cwI6YZJUrtXKPonNmkFvGSw1j87kDngUExAo4/Rw5apbVAEJRqJEhxZYUaq QbkXjOB3eVuCE9EWhNZb3BfEuBPVu/SnONOBISTMzqj3jlwn1LP4kxzzX0SRrx2Luwl9 l48C+JVmIWeLiFrpg/6mqH7WxpiBEiefCV5AFuNW1GO8lpPel7vYC9oWeC+iu4UuGKHJ LmVQGew1vIOLGWPhXwPgretzD+nhoQI/ox/wgLxRXowapgioh7e3b4/QFRnqx+1rr4yQ HvWw== X-Gm-Message-State: AOAM532yZpKjStY/sFVBYDHu2eMf8WHbAnE350T779BHcEj7i7e7RqCf 2P/mOJ4DNf0UKSuwz3NDj1ck863zxyoPHvfy X-Google-Smtp-Source: ABdhPJxv6ruYd46iowdhmvM7q8DeR3bAZciRgWbu2V+SAkilDr23XCOae+IzAuCNy4ULP8IoLoNi7A== X-Received: by 2002:a05:6870:b025:b0:e6:283a:9553 with SMTP id y37-20020a056870b02500b000e6283a9553mr14001613oae.62.1652829435416; Tue, 17 May 2022 16:17:15 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:c200:fc7:399f:1d5:1b26:e154]) by smtp.gmail.com with ESMTPSA id r3-20020a4a83c3000000b0035eb4e5a6c2sm340976oog.24.2022.05.17.16.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 16:17:14 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Tue, 17 May 2022 20:16:47 -0300 Message-Id: <20220517231647.18336-4-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517231647.18336-1-luishenriquegh2701@gmail.com> References: <20220517231647.18336-1-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): Use new style. [source]: Rewrite using gexps. [arguments]: Rewrite using gexps. [inputs and native-inputs]: Remove input labels. [description]: Run `guix style`. --- 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 21a22570ad..0dfaa45813 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -659,84 +659,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-for-luv) - ("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-for-luv + 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 @@ -744,7 +746,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))))