From 370fe9aacee55705593d11e7c14a02b3435903cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20dos=20Santos=20Oliveira?= Date: Wed, 17 Mar 2021 14:25:50 -0300 Subject: [PATCH] gnu: emilua: Update to 0.3.0. * gnu/packages/lua.scm (emilua): Update to 0.3.0. --- gnu/packages/lua.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 16996572d7..13f63bdbb9 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1108,14 +1108,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 +1124,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 +1142,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 +1154,10 @@ shell command executions.") ("luajit-lua52-openresty" ,luajit-lua52-openresty) ("ncurses" ,ncurses) ("openssl" ,openssl))) + (native-search-paths + (list (search-path-specification + (variable "EMILUA_PATH") + (files '("lib/emilua-0.3"))))) (home-page "https://gitlab.com/emilua/emilua") (synopsis "Lua execution engine") (description -- 2.30.2