From 6fd5a80dbe7013fc37aa1228051d02b42ee76527 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Jan 2019 14:05:37 +0100 Subject: gnu: Remove unnecessary build-side module imports. * gnu/packages/batik.scm, gnu/packages/boost.scm, gnu/packages/calendar.scm, gnu/packages/gl.scm, gnu/packages/lua.scm, gnu/packages/qt.scm, gnu/packages/simulation.scm, gnu/packages/terminals.scm: Remove unnecessary import of (guix build utils). * gnu/packages/emacs.scm: Remove unnecessary imports of (guix ...). * gnu/packages/libcanberra.scm: Use (srfi srfi-1) instead of (guix build utils) for 'alist-delete'. * gnu/packages/wxwidgets.scm: Likewise. --- gnu/packages/lua.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 2dc1452ccce..bab166e3e82 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -32,7 +32,6 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) -- cgit v1.3 From 7c97a0631e1fc26d1df42b5a1982c084aef9211e Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 8 Jan 2019 13:49:17 +0100 Subject: gnu: Add lua5.2-expat. * gnu/packages/lua.scm (lua5.2-expat): New variable. (make-lua-expat): New procedure. (lua5.1-expat, lua5.2-expat): Call it. --- gnu/packages/lua.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index bab166e3e82..4c0286a0d67 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 doncatnip -;;; Copyright © 2016, 2017 Clément Lassieur +;;; Copyright © 2016, 2017, 2019 Clément Lassieur ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial @@ -148,9 +148,9 @@ language. It may be embedded or used as a general-purpose, stand-alone language.") (license license:x11))) -(define-public lua5.1-expat +(define (make-lua-expat name lua) (package - (name "lua5.1-expat") + (name name) (version "1.3.0") (source (origin (method url-fetch) @@ -162,10 +162,11 @@ language.") (build-system gnu-build-system) (arguments `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) (list "CC=gcc" - (string-append "LUA_LDIR=" out "/share/lua/$(LUA_V)") - (string-append "LUA_CDIR=" out "/lib/lua/$(LUA_V)"))) + (string-append "LUA_LDIR=" out "/share/lua/" lua-version) + (string-append "LUA_CDIR=" out "/lib/lua/" lua-version))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -176,13 +177,19 @@ language.") (invoke "lua" "tests/test.lua") (invoke "lua" "tests/test-lom.lua")))))) (inputs - `(("lua" ,lua-5.1) + `(("lua" ,lua) ("expat" ,expat))) (home-page "http://matthewwild.co.uk/projects/luaexpat/") (synopsis "SAX XML parser based on the Expat library") (description "LuaExpat is a SAX XML parser based on the Expat library.") (license (package-license lua-5.1)))) +(define-public lua5.1-expat + (make-lua-expat "lua5.1-expat" lua-5.1)) + +(define-public lua5.2-expat + (make-lua-expat "lua5.2-expat" lua-5.2)) + (define-public lua5.1-socket (package (name "lua5.1-socket") -- cgit v1.3 From 253aab77c5e62a977be78fdb2d7af6b30632fb8b Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 8 Jan 2019 13:49:24 +0100 Subject: gnu: Add lua5.2-socket. * gnu/packages/lua.scm (lua5.2-socket): New variable. (make-lua-socket): New procedure. (lua5.1-socket, lua5.2-socket): Call it. --- gnu/packages/lua.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 4c0286a0d67..3669aafad5b 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -190,9 +190,9 @@ language.") (define-public lua5.2-expat (make-lua-expat "lua5.2-expat" lua-5.2)) -(define-public lua5.1-socket +(define (make-lua-socket name lua) (package - (name "lua5.1-socket") + (name name) (version "3.0-rc1") (source (origin (method url-fetch) @@ -206,8 +206,10 @@ language.") (build-system gnu-build-system) (arguments `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "INSTALL_TOP=" out))) + (let ((out (assoc-ref %outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) + (list (string-append "INSTALL_TOP=" out) + (string-append "LUAV?=" lua-version))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -219,7 +221,7 @@ language.") (invoke "lua" "test/testsrvr.lua")) (invoke "lua" "test/testclnt.lua")))))) (inputs - `(("lua" ,lua-5.1))) + `(("lua" ,lua))) (home-page "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/") (synopsis "Socket library for Lua") (description "LuaSocket is a Lua extension library that is composed by two @@ -234,7 +236,13 @@ to the functionality defined by each protocol. In addition, you will find that the MIME (common encodings), URL (anything you could possible want to do with one) and LTN12 (filters, sinks, sources and pumps) modules can be very handy.") - (license (package-license lua-5.1)))) + (license license:expat))) + +(define-public lua5.1-socket + (make-lua-socket "lua5.1-socket" lua-5.1)) + +(define-public lua5.2-socket + (make-lua-socket "lua5.2-socket" lua-5.2)) (define-public lua5.1-filesystem (package -- cgit v1.3 From d994325747486e7beddbf03255c8c95d58d08dc8 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 8 Jan 2019 13:49:29 +0100 Subject: gnu: Add lua-filesystem and lua5.2-filesystem. * gnu/packages/lua.scm (lua-filesystem, lua5.2-filesystem): New variables. (make-lua-filesystem): New procedure. (lua-filesystem, lua5.1-filesystem, lua5.2-filesystem): Call it. --- gnu/packages/lua.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 3669aafad5b..5e73f1ed898 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -244,9 +244,9 @@ handy.") (define-public lua5.2-socket (make-lua-socket "lua5.2-socket" lua-5.2)) -(define-public lua5.1-filesystem +(define (make-lua-filesystem name lua) (package - (name "lua5.1-filesystem") + (name name) (version "1.6.3") (source (origin (method url-fetch) @@ -260,13 +260,16 @@ handy.") (build-system gnu-build-system) (arguments `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) + (list (string-append "PREFIX=" out) + (string-append "LUA_LIBDIR=" out "/lib/lua/" lua-version))) #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs - `(("lua" ,lua-5.1))) + `(("lua" ,lua))) (home-page "https://keplerproject.github.io/luafilesystem/index.html") (synopsis "File system library for Lua") (description "LuaFileSystem is a Lua library developed to complement the @@ -275,6 +278,15 @@ distribution. LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.") (license (package-license lua-5.1)))) +(define-public lua-filesystem + (make-lua-filesystem "lua-filesystem" lua)) + +(define-public lua5.1-filesystem + (make-lua-filesystem "lua5.1-filesystem" lua-5.1)) + +(define-public lua5.2-filesystem + (make-lua-filesystem "lua5.2-filesystem" lua-5.2)) + (define-public lua5.1-sec (package (name "lua5.1-sec") -- cgit v1.3 From eb5b6c57775993fcfb61f8a845d79a8ee11fc5f6 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 8 Jan 2019 13:49:34 +0100 Subject: gnu: Add lua5.2-sec. * gnu/packages/lua.scm (lua5.2-sec): New variable. (make-lua-sec): New procedure. (lua5.1-sec, lua5.2-sec): Call it. --- gnu/packages/lua.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 5e73f1ed898..69827335792 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -287,9 +287,9 @@ directory structure and file attributes.") (define-public lua5.2-filesystem (make-lua-filesystem "lua5.2-filesystem" lua-5.2)) -(define-public lua5.1-sec +(define (make-lua-sec name lua) (package - (name "lua5.1-sec") + (name name) (version "0.6") (source (origin (method url-fetch) @@ -301,27 +301,37 @@ directory structure and file attributes.") (build-system gnu-build-system) (arguments `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) (list "linux" "CC=gcc" "LD=gcc" - (string-append "LUAPATH=" out "/share/lua/5.1") - (string-append "LUACPATH=" out "/lib/lua/5.1"))) + (string-append "LUAPATH=" out "/share/lua/" lua-version) + (string-append "LUACPATH=" out "/lib/lua/" lua-version))) #:tests? #f ; no tests included #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs - `(("lua" ,lua-5.1) + `(("lua" ,lua) ("openssl" ,openssl))) (propagated-inputs - `(("lua-socket" ,lua5.1-socket))) + `(("lua-socket" + ,(make-lua-socket + (format #f "lua~a-socket" + (version-major+minor (package-version lua))) lua)))) (home-page "https://github.com/brunoos/luasec/wiki") (synopsis "OpenSSL bindings for Lua") (description "LuaSec is a binding for OpenSSL library to provide TLS/SSL communication. It takes an already established TCP connection and creates a secure session between the peers.") - (license (package-license lua-5.1)))) + (license license:expat))) + +(define-public lua5.1-sec + (make-lua-sec "lua5.1-sec" lua-5.1)) + +(define-public lua5.2-sec + (make-lua-sec "lua5.2-sec" lua-5.2)) (define-public lua-lgi (package -- cgit v1.3