From patchwork Wed Mar 17 21:07:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Vin=C3=ADcius_dos_Santos_Oliveira?= X-Patchwork-Id: 27937 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 9DAD427BCD7; Wed, 17 Mar 2021 21:08:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9035A27BCD6 for ; Wed, 17 Mar 2021 21:08:50 +0000 (GMT) Received: from localhost ([::1]:54118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMdPN-0003AG-KW for patchwork@mira.cbaines.net; Wed, 17 Mar 2021 17:08:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMdOc-0002hV-LJ for guix-patches@gnu.org; Wed, 17 Mar 2021 17:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMdOb-0001sa-Qz for guix-patches@gnu.org; Wed, 17 Mar 2021 17:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMdOb-00041N-N5 for guix-patches@gnu.org; Wed, 17 Mar 2021 17:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47216] Update emilua to 0.3.0 Resent-From: =?utf-8?b?Vmluw61jaXVz?= dos Santos Oliveira Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Mar 2021 21:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47216 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Efraim Flashner Cc: 47216@debbugs.gnu.org Received: via spool by 47216-submit@debbugs.gnu.org id=B47216.161601527315442 (code B ref 47216); Wed, 17 Mar 2021 21:08:01 +0000 Received: (at 47216) by debbugs.gnu.org; 17 Mar 2021 21:07:53 +0000 Received: from localhost ([127.0.0.1]:44230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMdOS-000410-N8 for submit@debbugs.gnu.org; Wed, 17 Mar 2021 17:07:53 -0400 Received: from mail-io1-f51.google.com ([209.85.166.51]:35720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMdOQ-00040m-KL for 47216@debbugs.gnu.org; Wed, 17 Mar 2021 17:07:51 -0400 Received: by mail-io1-f51.google.com with SMTP id v3so47624ioq.2 for <47216@debbugs.gnu.org>; Wed, 17 Mar 2021 14:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XYTSAZjyfLEhuW+Pv+ygdEaq5WrbuohJ74c9EiVapYs=; b=RmPUjqeBEt3a1MQb07CT9wLnSeaqgtOnDmRrHdKQKo45tHzK/u2rBV6TL9TVT0asfw +zohwl5JY4qlJz/6r0NPbsXddoiPGDHqPOZIV0HaCiQ8R3RaZENxRB/P9Rk5pMjZpXLJ 04dEab35g4UgLYR06LLM4flxWMfkiTHzECGNL8oQ46bLqRSC5/w4G5bqBwDPfUVsdQSM moHHv+Gn+hN4Tkp46VZYzYjG/1zK9xUwob+8ZHXoEm4rey13r5T+v+Z6LyqQp45RqaUy bgeLXLIfpU9j1DGIBU1BslXUMXEoFEcEAnE/xqXj0d/MztLBZ9havNFdhH6IkplaXnaL v7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XYTSAZjyfLEhuW+Pv+ygdEaq5WrbuohJ74c9EiVapYs=; b=c/aGQ/+pD6q7GeHtKfrAUXn6YoN+JmftwNgmTkrS7eebC121ZNwXh7H8XBEE468rCs ELoztq70wNc0EnbL5YBjFQMjaE4S1z3tFxmHBROkbXME1CqYe0ZMKbX4sU+6pV8kQlz/ Ho3gchagA1/n+ZUNtdK7PAUdMitcNJA8upE7uGZHnc9eQImlNFeicl64k0e97nddq90r 8Z+luI/fUPNulshxhj1F0sV8fXt1DrexvSP07JFw7znq9jywPH97jkeJnBs2pRYTVs7K efSgyk8vUulKpi28YvAt0HG4D0dVm7/M7smG+/W+q1f/+Mn5BqlQUiAbNBxhoMmjIICO o/PQ== X-Gm-Message-State: AOAM532yhOkCIdteDltoXBY+pOh9T6Ic/V/aMwEmkD5eKy1y4VxZEUlv uwl74O7tKUppEUhogDc8gvGjOneJplgNboVqgjYBMU/c X-Google-Smtp-Source: ABdhPJxkfb5wuFfNrwH30IOSmyogW01hwiDN17dM9X7DoZCE+jur3BpfXv5YKETRvExd8+5vjfXVV4liIkCPIXlog4Y= X-Received: by 2002:a6b:d20e:: with SMTP id q14mr8234474iob.200.1616015265027; Wed, 17 Mar 2021 14:07:45 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?utf-8?b?Vmluw61jaXVz?= dos Santos Oliveira Date: Wed, 17 Mar 2021 18:07:27 -0300 Message-ID: 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 Em qua., 17 de mar. de 2021 às 16:31, Efraim Flashner escreveu: > Thanks. Some inlined comments. Okay. You may find a new version of the patch attached. > > * gnu/packages/lua.scm (emilua): Update to 0.3.0. > > The other changes should be listed here. For example > [search-paths]: New field. Fixed. > > + '("-Denable_http=true" "-Denable_tests=false" "-Dversion_suffix=-guix1"))) > > Why are we adding '-guix1' as a version suffix? $ emilua --version Emilua 0.3.0-guix1 That's the only difference. When people fill bug reports, it'll make it easy to identify which platform they're using. > > (native-inputs > > - `(("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs > > + `(("asciidoctor" ,ruby-asciidoctor) > > If possible I'd prefer to not pull in ruby-asciidoctor, it pulls in > pandoc, which will limit this package to GHC supported systems only, ie > x86_64 and i686. You sure about that? I failed to follow the dependencies track to pandoc. In any case, asciidoctor is only used to build the manpages (and it doesn't need pandoc here) and it'd be okay to cross-build. Also manpage generation can be disabled easily with the flag -Denable_manpages=false if desired. What's your call? > > + ("fmt" ,fmt) > > You'll also need to import pretty-print at the top of the file. My bad. Fixed. > > + (native-search-paths > > + (list (search-path-specification > > + (variable "EMILUA_PATH") > > + (files '("lib/emilua-0.3"))))) > > this can be (list (string-append "/lib/emilua-" > (version-major+minor version))) Fixed. --- Vinícius dos Santos Oliveira https://vinipsmaker.github.io/ From 36c446d4a9c65bbb50ee21a7535cb62ca3f64d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20dos=20Santos=20Oliveira?= Date: Wed, 17 Mar 2021 18:03:31 -0300 Subject: [PATCH] gnu: emilua: Update to 0.3.0. * gnu/packages/lua.scm (emilua): Update to 0.3.0. * gnu/packages/lua.scm (emilua): Update deps to match newer version. * gnu/packages/lua.scm (emilua): [search-paths]: New field. * gnu/packages/lua.scm (emilua): Enable HTTP module. * gnu/packages/lua.scm (emilua): "-Dversion_suffix=-guix1". --- gnu/packages/lua.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 16996572d7..67cc00d641 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -56,6 +56,8 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages vim) #:use-module (gnu packages re2c) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages ruby) #:use-module (gnu packages xorg) #:use-module (gnu packages gtk)) @@ -1108,14 +1110,14 @@ shell command executions.") (define-public emilua (package (name "emilua") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/emilua/emilua.git") (commit (string-append "v" version)) - ;; Current version requires bundled CLI11 and fmt, but at some - ;; future release the ones found in the system could be used + ;; Current version requires bundled CLI11, but at some future + ;; release the one found in the system could be used ;; instead. Current version also requires Trial.Protocol and ;; the HTTP lib developed as part of GSoC 2014 for Boost, but ;; these are dependencies unlikely to be "unbundled" in future @@ -1124,15 +1126,17 @@ shell command executions.") (file-name (git-file-name name version)) (sha256 (base32 - "1d6k5v6x85fbvz2ijq1imnfdwvqmsav4xp021a5v3ah4mgy7yann")))) + "124fj73722c03znwdyqp1i0jygwv3s11f6s1j9rzym513qrf7fnd")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 ;; Tests are disabled for now due to an issue that affecs guix: ;; - #:configure-flags '("-Denable_http=false" "-Denable_tests=false"))) + #:configure-flags + '("-Denable_http=true" "-Denable_tests=false" "-Dversion_suffix=-guix1"))) (native-inputs - `(("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs + `(("asciidoctor" ,ruby-asciidoctor) + ("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs ("luajit-lua52-openresty" ,luajit-lua52-openresty) ("pkg-config" ,pkg-config) ("re2c" ,re2c) @@ -1140,6 +1144,7 @@ shell command executions.") (inputs `(("boost" ,boost) ("boost-static" ,boost-static) + ("fmt" ,fmt) ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty ;; fork. Emilua is severely affected by this limit, so the upstream package ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT @@ -1151,6 +1156,12 @@ shell command executions.") ("luajit-lua52-openresty" ,luajit-lua52-openresty) ("ncurses" ,ncurses) ("openssl" ,openssl))) + (native-search-paths + (list + (search-path-specification + (variable "EMILUA_PATH") + (files + (list (string-append "lib/emilua-" (version-major+minor version))))))) (home-page "https://gitlab.com/emilua/emilua") (synopsis "Lua execution engine") (description -- 2.30.2