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