From patchwork Wed May 18 13:32:22 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: 39463 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 AAED227BBEA; Wed, 18 May 2022 14:33: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 31D3E27BBE9 for ; Wed, 18 May 2022 14:33:14 +0100 (BST) Received: from localhost ([::1]:49654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJnc-0001sU-J0 for patchwork@mira.cbaines.net; Wed, 18 May 2022 09:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJnT-0001qx-C3 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37336) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJnT-0002tX-2Y for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJnS-0006XW-W6 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v3 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, 18 May 2022 13:33: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.165288077525074 (code B ref 55045); Wed, 18 May 2022 13:33:02 +0000 Received: (at 55045) by debbugs.gnu.org; 18 May 2022 13:32:55 +0000 Received: from localhost ([127.0.0.1]:59457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnH-0006WI-4s for submit@debbugs.gnu.org; Wed, 18 May 2022 09:32:55 -0400 Received: from mail-oa1-f41.google.com ([209.85.160.41]:45486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnA-0006Vq-W1 for 55045@debbugs.gnu.org; Wed, 18 May 2022 09:32:49 -0400 Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-e93bbb54f9so2600256fac.12 for <55045@debbugs.gnu.org>; Wed, 18 May 2022 06:32:44 -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=obpV/ZlLQZCJ5p+OMHfq4PfnMDt/6DXwzapuHOBvLM22MBzzUyRVs3OFz6g8XM/1tH 3BZnravb1VEbhcwqbqmZQRwEJ3uuWVyo0qQpI5GGvl6/KASxRtxQ2iSyBg37L0rxrJG7 NJQGpaXZ+V3i1kDrLLumx6LdX2QYevomg164B2AovNlHIaEboPH0sva/6M3wBPFbvJFv fIfK0SjlBbWQ2faNwkm2fv5i1fxKqHqwtEVxfhuaYv9W7NxAqsEcjWe+8/DJ7uLTpWVT pWtaBTGl89E2PtMMBQtVYCDOzC/eemYfUnpLEHx3DRTWmuU25DIqn9bZWBFwCWTyCVMu padw== 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=Z6layYKvRGRw/IIm8mCtMkzwsRL0IUHfGF+tNnTb1ZQdyp1+ft/eB4DqESz/iq4v6l /R5I5QTIgCzhtVQTfq3xKsY7YM5sHWArecrn0uj94r1q7jl9gOnx8xFhGSvQchucBb2x noboj0GeeZxi33vI4m6kZvDylWPn3fvcRwetB624YKs/jSR0nag/Sydf4c6DcurgS3j0 h8CtI4tkfxJtFu8BNKb07klt6Tnu7Bx91uAmQHon/KsUSVEbRUPYxlF07YhLJR6EbklX F3/puobRW2k0u7Er/7kfDLmlpYHBP422LAQ3o7r+y4PsqRceAeciafxzH3VX97fO1TAD p7iQ== X-Gm-Message-State: AOAM530/bLcz1DX8UHP4b08z8qPPuI0cPRxLU4p9uGVF1oVoZcWo2+li uXJN8cBsiMA/sjM86nkf24SM+upshr9CT6kX X-Google-Smtp-Source: ABdhPJzgLHI3z+qqXw5j5TBNRENaK01vZ8O+xcMZYV7KDOFZIHuKcRuvP3jzjH4nHF4gcYP9FvFMqg== X-Received: by 2002:a05:6870:790:b0:e5:c4c7:f6b6 with SMTP id en16-20020a056870079000b000e5c4c7f6b6mr16036404oab.287.1652880758804; Wed, 18 May 2022 06:32:38 -0700 (PDT) Received: from localhost.localdomain ([179.180.243.123]) by smtp.gmail.com with ESMTPSA id b3-20020a4aac83000000b0035ec65ac944sm967600oon.16.2022.05.18.06.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 06:32:37 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 18 May 2022 10:32:22 -0300 Message-Id: <20220518133225.30983-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 Wed May 18 13:32:23 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: 39464 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 0DD9727BBEA; Wed, 18 May 2022 14:33: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 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 B309C27BBE9 for ; Wed, 18 May 2022 14:33:14 +0100 (BST) Received: from localhost ([::1]:49684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJnd-0001tm-QO for patchwork@mira.cbaines.net; Wed, 18 May 2022 09:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJnT-0001r7-Qo for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJnT-0002tj-EO for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJnT-0006Xe-Bu for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v3 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: Wed, 18 May 2022 13:33: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.165288077625095 (code B ref 55045); Wed, 18 May 2022 13:33:03 +0000 Received: (at 55045) by debbugs.gnu.org; 18 May 2022 13:32:56 +0000 Received: from localhost ([127.0.0.1]:59461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnL-0006WN-BE for submit@debbugs.gnu.org; Wed, 18 May 2022 09:32:56 -0400 Received: from mail-oi1-f174.google.com ([209.85.167.174]:33650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnF-0006Vx-7H for 55045@debbugs.gnu.org; Wed, 18 May 2022 09:32:49 -0400 Received: by mail-oi1-f174.google.com with SMTP id w130so2703682oig.0 for <55045@debbugs.gnu.org>; Wed, 18 May 2022 06:32:49 -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=hGj6qSLmdPQjqOBPFwjX6A6lcwxzMb15YIfJ6UquOkkT1QlBwubfFBVtlVfmUguH6J t0ntszJ2KabWjjPjI3TNB9oWCG+CHsPKCi2qwYHEnQK7BC59rnOrTQ7740/Bqbzdls/O d6SgA4vpDHwRmhILr+rebUGDbdUv4YC07BmT3PJvxWY6NRvXuIk8CxPp4PCp1Myo9j69 vqqul/7EgoqFB4IAzY3pbbgSDWkrCvRcqAK793Qt3p8hQ22cfR2OgnFpeLDE5va8WoAZ q95KvBZ+I1DXQHMWWH3U83m2Ob01y5WRZCkTGvPDg5DOg5vOeCmsXpuPR90psmGf5BSD cmoA== 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=YZjIyKiDeET3qZuRYFuoobfka80uRDUalE6MUgnLpBmzf2ttDFlmj4WqadBfwqfhzA 0iZ/xmxOTItmwrXmJfJDq1f0iYeCSOjWoHd0wLWj+jn1vMtE4N5o8tqgP4qDlYk8uNu5 6cGw7WdCpl9dkgyypc6A7fomzvZqvhQaTFPgJKLKoJ5uOhcAabbn5rNv95WPjIGN/qxz JgECKWv/LQF15se3Jj4hAwvSTb8xjTl9h/ZnonypeD7aX+aCXODxoCQ2HHq76TB2vpYh 7sD+e6nMkUtGyZn/5wQ1AbQtl4jUhbsJGTTn9Uv9sKqnXd3kxqJCnJl4n1OaC0e6EOpi KzIA== X-Gm-Message-State: AOAM532M2GBgW3i0scM3eTy78cZemfRAUjkrmrJsFuo2sx8Mw71uLf0A 9hYa7o0p/KO1JByCekFL3xJ4OVQR8HUgMK0D X-Google-Smtp-Source: ABdhPJwjHILa4PFMnVZ3j1KqzL1bVYgtltqIsFpmw7V9UN/85SHR8ms92cOmw1bKTTltMAge435mrg== X-Received: by 2002:a05:6808:118c:b0:2d4:4194:70db with SMTP id j12-20020a056808118c00b002d4419470dbmr12947706oil.93.1652880762830; Wed, 18 May 2022 06:32:42 -0700 (PDT) Received: from localhost.localdomain ([179.180.243.123]) by smtp.gmail.com with ESMTPSA id b3-20020a4aac83000000b0035ec65ac944sm967600oon.16.2022.05.18.06.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 06:32:42 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 18 May 2022 10:32:23 -0300 Message-Id: <20220518133225.30983-2-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220518133225.30983-1-luishenriquegh2701@gmail.com> References: <20220518133225.30983-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 Wed May 18 13:32:24 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: 39465 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 83DDC27BBEA; Wed, 18 May 2022 14:33: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 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 5630B27BBE9 for ; Wed, 18 May 2022 14:33:15 +0100 (BST) Received: from localhost ([::1]:49734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJne-0001vh-Eq for patchwork@mira.cbaines.net; Wed, 18 May 2022 09:33:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJnU-0001rF-2O for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJnT-0002tr-Q9 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJnT-0006Xl-Nq for guix-patches@gnu.org; Wed, 18 May 2022 09:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v3 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, 18 May 2022 13:33: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.165288077725111 (code B ref 55045); Wed, 18 May 2022 13:33:03 +0000 Received: (at 55045) by debbugs.gnu.org; 18 May 2022 13:32:57 +0000 Received: from localhost ([127.0.0.1]:59463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnN-0006Wv-5r for submit@debbugs.gnu.org; Wed, 18 May 2022 09:32:57 -0400 Received: from mail-ot1-f47.google.com ([209.85.210.47]:43566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnI-0006W2-A0 for 55045@debbugs.gnu.org; Wed, 18 May 2022 09:32:56 -0400 Received: by mail-ot1-f47.google.com with SMTP id m6-20020a05683023a600b0060612720715so1315569ots.10 for <55045@debbugs.gnu.org>; Wed, 18 May 2022 06:32:52 -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=kt+5yqJeiFc4wPexsVXawnG1mCRPKTEPIxFYwJh9F5aIE/uqyzBdQdReMxLgdH4XeF 6NCY97+X1H94iSaQ1DhmxEFBo4JWqU2xB03T97oMsOfmeTSjIxrakfh8VlvPU4nMFeqy TGpvTRR6HyrUPe9RpTC6NjvHi6eeKCn49RnOkNK4aqGACr2AOL2kyftk1kL4zuhQFXYu 4bbLf5fiv/xUbYxBlam2g0ku8l6u6RLQL1jDT6n8r5ZEqB7rFOJGMVkmLIijgdDwGEHf 31NS3hh91a4Od4cG+z6Zn+BVrO0+KoJMNnEy+CnTBrAtzl3Q8O343YTvAkXf3hVm4B2k TmHQ== 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=zMX9Q0IjbMeevImeG0s6PP/EJhK3mO9LfqZhS6a6qwoaOPs8eBv6s8e1fSzQ5r6n8n mPwZf1hUfXNRPg0+8adSWJM6hmFyuBsyFkP5faArdoafwUYL+0ZhI+QxjU+RE/PASsOW DifjjE+5EdBveyIYENEdOvnRE7w30jzOmJmFhVH8WlCJKSdZk95sVAivGP8vrziFbWkc MESq71VWNSDI+xYqyv609e3Me4Z7wEawQgJeQ1PQgM+0JG9ukxCTLUIEyI301y5Q0Ihp NBeMV7YoTSAefKEZ/5PbHtCx+UZv4HPdQIcpSmyHhQZ1UNlc1ME6Bxk6rBiUnkkltyNW 2BjA== X-Gm-Message-State: AOAM532zKtjYE6vDshnYsHdt+YMBO06itAsY3Rr7yeSnhvGFmIYqPRGl fNp+ewWNvPyER1TQ7jFfOxxxxcu7m0jXpJz9 X-Google-Smtp-Source: ABdhPJzELLrNX7DI3ZhemHw9pc9tOsKD6+TYqBwDtFj9RcN1yWet6yVmfQNvm9ZDT/lhUH5lzGsZpQ== X-Received: by 2002:a9d:12c6:0:b0:605:f18a:dc8c with SMTP id g64-20020a9d12c6000000b00605f18adc8cmr9982483otg.372.1652880766133; Wed, 18 May 2022 06:32:46 -0700 (PDT) Received: from localhost.localdomain ([179.180.243.123]) by smtp.gmail.com with ESMTPSA id b3-20020a4aac83000000b0035ec65ac944sm967600oon.16.2022.05.18.06.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 06:32:45 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 18 May 2022 10:32:24 -0300 Message-Id: <20220518133225.30983-3-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220518133225.30983-1-luishenriquegh2701@gmail.com> References: <20220518133225.30983-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 Wed May 18 13:32:25 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: 39466 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 958B227BBE9; Wed, 18 May 2022 14:33:35 +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 BCCFB27BBEA for ; Wed, 18 May 2022 14:33:34 +0100 (BST) Received: from localhost ([::1]:50630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJnx-0002W5-Ud for patchwork@mira.cbaines.net; Wed, 18 May 2022 09:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJnU-0001rR-E6 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJnU-0002ty-65 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJnU-0006Xs-4C for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v3 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: Wed, 18 May 2022 13:33:04 +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.165288078125123 (code B ref 55045); Wed, 18 May 2022 13:33:04 +0000 Received: (at 55045) by debbugs.gnu.org; 18 May 2022 13:33:01 +0000 Received: from localhost ([127.0.0.1]:59465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnN-0006Wy-JB for submit@debbugs.gnu.org; Wed, 18 May 2022 09:33:01 -0400 Received: from mail-ot1-f49.google.com ([209.85.210.49]:45877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnL-0006WF-0P for 55045@debbugs.gnu.org; Wed, 18 May 2022 09:32:56 -0400 Received: by mail-ot1-f49.google.com with SMTP id s18-20020a056830149200b006063fef3e17so1312935otq.12 for <55045@debbugs.gnu.org>; Wed, 18 May 2022 06:32:54 -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=Qp66y2qbJJTelQmmAd7lAFjWYsFqKUoWjBKYJF7im/Q=; b=oloA2tTjG7RVL19c1/2/vHaEPjnsJuYyQKVYN1tKUVTZDMAXdYaLvof66TyuVtLY+g 8MIujQXTa/LdRKQpiueopMgUH+vRfiVbZWeyWZzD++sZlGdv3bRiNSWHRv8igPJE0D46 W1t4HUIxTvzs0OZgU24H4q4F5oLqH4tZvcoZQ0fKNi7976NMWYQKQkRlEo247jV1fbkk xm7ViBUR7KRav5gwm7BicsEdXxE9vx4DvP75q4EY7Ny8H42SsuCaH8RtWYUKWr97Q5l+ NM2fTrXGa/kAdX5hj2KI9X5fNg7Xz4Id/PJ78UCJl5EsFZQNoExy0plQUkXU/oBukw0K sooA== 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=Qp66y2qbJJTelQmmAd7lAFjWYsFqKUoWjBKYJF7im/Q=; b=rOFJmZFwf3Kr8ZzCPU+nBYokE6kqD1lbaZ0Ua323Fij0CWNsHa/foUPmcr6M4iGJQd vXFpRMhsow0fwJL9koJ2qcOQPUAqLz03zToDYQVQRA8q3U0I2e7gkhdEjuUptuRB7a3e RoLlRgUOYvBpCSRyPwMs4xnevbOYcoCpOlPRbol6c3MAwvwU927MXNv8qzWG0yKg0Emk LYf4B2+lSUhaA2NGdUkYDEjRUe98tHvQRc7BC5xZ24dxPttpKva2SQUiMYkmdqLkb0ej bwtC/tu8QDBuBEq7nkTzi/h/Ie4lvLhHfVDUMQOqCPSpNWIaLzqm0gOT7DrgxNejfnYs sMSA== X-Gm-Message-State: AOAM5318ylNk7b4XnJxM3RJFcp+A4RbuidzBuY8Zq/Tf2XLkEFeInufp GjSEX0/s3GupbndAPJrX8bq55pQlu6VpGK1l X-Google-Smtp-Source: ABdhPJw3X2V6Xn8+RgySqFmDbluCaXR1fIj/6Bj3uichh3AHpeRYfrUcJwftIJ/xTCmx5tQlxlEdEw== X-Received: by 2002:a9d:73d9:0:b0:606:21c9:a283 with SMTP id m25-20020a9d73d9000000b0060621c9a283mr9934484otk.321.1652880769001; Wed, 18 May 2022 06:32:49 -0700 (PDT) Received: from localhost.localdomain ([179.180.243.123]) by smtp.gmail.com with ESMTPSA id b3-20020a4aac83000000b0035ec65ac944sm967600oon.16.2022.05.18.06.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 06:32:48 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 18 May 2022 10:32:25 -0300 Message-Id: <20220518133225.30983-4-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220518133225.30983-1-luishenriquegh2701@gmail.com> References: <20220518133225.30983-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 | 156 ++++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 75 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 21a22570ad..caf9ea85b3 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -659,84 +659,89 @@ (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 _ + ;; 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 (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 +749,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))))