;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2020 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
- #:use-module (gnu packages readline)
- #:use-module (gnu packages m4)
- #:use-module (gnu packages tls)
- #:use-module (gnu packages xml)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages build-tools)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages xorg)
- #:use-module (gnu packages gtk))
+ #:use-module (gnu packages pretty-print)
+ #:use-module (gnu packages re2c)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages vim)
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages xorg))
(define-public lua
(package
language.")
(license license:x11)))
+(define-public luajit-lua52-openresty
+ (package
+ (inherit luajit)
+ (name "luajit-lua52-openresty")
+ (version "2.1-20201229")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openresty/luajit2.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07haj27kbpbnkv836c2nd36h2xislrmri52w0zbpxvl68xk6g96p"))))
+ (arguments
+ `(#:tests? #f ;no test
+ #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'enable-lua52-compat
+ (lambda _
+ (substitute* "src/Makefile"
+ (("#(XCFLAGS\\+= -DLUAJIT_ENABLE_LUA52COMPAT)" _ flag) flag))
+ #t)))))
+ (home-page "https://github.com/openresty/luajit2")
+ (synopsis "OpenResty's Branch of LuaJIT 2")
+ (description
+ "This is the official OpenResty branch of LuaJIT. It is not to be
+considered a fork, since changes are regularly synchronized from the upstream
+LuaJIT project. This package also enables the Lua 5.2 compat mode needed by
+some projects.")))
+
(define (make-lua-expat name lua)
(package
(name name)
`(#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "LUA_LDIR=" out "/share/lua/" lua-version)
(string-append "LUA_CDIR=" out "/lib/lua/" lua-version)))
#:phases
`(#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-api-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
"CFLAGS='-D HAVE_SYS_SYSCTL_H=0'" ; sys/sysctl.h is deprecated
(string-append "prefix=" out)
(string-append "LUA_APIS=" lua-api-version)))
(let ((out (assoc-ref %outputs "out"))
(lua-version ,(version-major+minor (package-version lua))))
(list "linux"
- "CC=gcc"
+ ,(string-append "CC=" (cc-for-target))
"LD=gcc"
(string-append "LUAPATH=" out "/share/lua/" lua-version)
(string-append "LUACPATH=" out "/lib/lua/" lua-version)))
#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-api-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "LUA_APIS=" lua-api-version)))
#:phases
(modify-phases %standard-phases
(build-system gnu-build-system)
(arguments
`(#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;TODO: Run the test suite.
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
shell command executions.")
(license license:bsd-3)))
+(define-public emilua
+ (package
+ (name "emilua")
+ (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, 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
+ ;; releases.
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "124fj73722c03znwdyqp1i0jygwv3s11f6s1j9rzym513qrf7fnd"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:meson ,meson-0.55
+ ;; Tests are disabled for now due to an issue that affecs guix:
+ ;; <https://gitlab.com/emilua/emilua/-/issues/22>
+ #:configure-flags
+ (list "-Denable_http=true"
+ "-Denable_tests=false"
+ "-Denable_manpages=false"
+ "-Dversion_suffix=-guix1")))
+ (native-inputs
+ `(("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)
+ ("xxd" ,xxd)))
+ (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
+ ;; configure flag[2] for some features to work (e.g. __pairs on HTTP
+ ;; headers).
+ ;;
+ ;; [1] <http://hacksoflife.blogspot.com/2012/12/integrating-luajit-with-x-plane-64-bit.html>
+ ;; [2] <http://luajit.org/extensions.html#lua52>
+ ("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
+ "Emilua is a LuaJIT-based Lua execution engine that supports async IO,
+fibers and actor-inspired threading. The experimental builtin HTTP module is
+enabled.")
+ (license license:boost1.0)))
+
(define-public fennel
(package
(name "fennel")
- (version "0.7.0")
+ (version "0.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "17pdcwhfw754fblppw46qphnsvxrn3b7066cz54lv8c0c12iryim"))
+ "07qgycf5cxm9zcc4fgpgvplg95ndavh3ynpdjpvzkikzbnyj7xia"))
(modules '((guix build utils)))
(snippet
'(begin
(build-system gnu-build-system)
(arguments
'(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:tests? #t ; even on cross-build
#:test-target "test"
#:phases
(modify-phases %standard-phases
(delete 'configure)
+ (add-before 'build 'patch-lua-calls
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua")))
+ (setenv "LUA" lua)
+ (substitute* "old/launcher.lua"
+ (("/usr/bin/env lua") lua))
+ #t)))
(add-after 'build 'patch-fennel
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "fennel"
- (("/usr/bin/env lua") (which "lua")))
+ (("/usr/bin/env .*lua")
+ (string-append (assoc-ref inputs "lua") "/bin/lua")))
+ #t))
+ (delete 'check)
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'install 'install-manpage
+ (lambda* (#:key outputs #:allow-other-keys)
+ (install-file "fennel.1"
+ (string-append (assoc-ref outputs "out")
+ "/share/man/man1"))
#t)))))
(inputs `(("lua" ,lua)))
(home-page "https://fennel-lang.org/")
- (synopsis "A Lisp that compiles to Lua")
+ (synopsis "Lisp that compiles to Lua")
(description
"Fennel is a programming language that brings together the speed,
simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro