me
/
guix
Archived
1
0
Fork 0
Code

gnu: lua-cqueues: Update to 20200726. 

* gnu/packages/lua.scm (lua-cqueues): Update to 20200726.
[source]: Fetch from git repository.
[arguments]: Use G-expressions; disable two tests that need LuaJIT's ffi
module.

Change-Id: I969a9f173339d22e57fd6a5e4689889c0268c52d
master
Ricardo Wurmus 2024-04-16 11:59:34 +02:00
parent 9374b0fe52
commit e2ec85d17d
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/lua.scm
View File

@ -485,48 +485,46 @@ secure session between the peers.")
(define (make-lua-cqueues name lua lua-ossl) (define (make-lua-cqueues name lua lua-ossl)
(package (package
(name name) (name name)
(version "20171014") (version "20200726")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://25thandclement.com/~william/" (uri (git-reference
"projects/releases/cqueues-" version ".tgz")) (url "https://github.com/wahern/cqueues")
(commit (string-append "rel-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb")))) "17gwqndlga6gnishgs6wk8cvgwzanddr42yikkg2xd4nanhcg8z9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (list
#:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 string-fun)) (ice-9 string-fun))
#:make-flags #:make-flags
(let ((out (assoc-ref %outputs "out")) #~(let ((lua-api-version #$(version-major+minor (package-version lua))))
(lua-api-version ,(version-major+minor (package-version lua)))) (list (string-append "CC=" #$(cc-for-target))
(list ,(string-append "CC=" (cc-for-target))
(string-append "LUA_APIS=" lua-api-version))) (string-append "LUA_APIS=" lua-api-version)))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(delete 'check) (delete 'check)
(replace 'install (replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(apply invoke "make" "install" (apply invoke "make" "install"
(append make-flags (append make-flags
(list (string-append "DESTDIR=" out) (list (string-append "DESTDIR=" #$output)
"prefix=")))))) "prefix=")))))
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key inputs outputs make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(let* (let*
((lua-version ,(version-major+minor (package-version lua))) ((lua-version #$(version-major+minor (package-version lua)))
(env-suffix (if (equal? lua-version "5.1") (env-suffix (if (equal? lua-version "5.1")
"" ""
(string-append (string-append
"_" "_"
(string-replace-substring lua-version "." "_")))) (string-replace-substring lua-version "." "_"))))
(lua-ossl (assoc-ref inputs "lua-ossl"))
(out (assoc-ref outputs "out"))
(lua-cpath (lambda (p) (lua-cpath (lambda (p)
(string-append p "/lib/lua/" lua-version "/?.so"))) (string-append p "/lib/lua/" lua-version "/?.so")))
(lua-path (lambda (p) (lua-path (lambda (p)
@ -536,11 +534,11 @@ secure session between the peers.")
;; precedence over the generic "LUA_CPATH" and "LUA_PATH" ;; precedence over the generic "LUA_CPATH" and "LUA_PATH"
(setenv (string-append "LUA_CPATH" env-suffix) (setenv (string-append "LUA_CPATH" env-suffix)
(string-append (string-append
(string-join (map lua-cpath (list out lua-ossl)) ";") (string-join (map lua-cpath (list #$output #$lua-ossl)) ";")
";;")) ";;"))
(setenv (string-append "LUA_PATH" env-suffix) (setenv (string-append "LUA_PATH" env-suffix)
(string-append (string-append
(string-join (map lua-path (list out lua-ossl)) ";") (string-join (map lua-path (list #$output #$lua-ossl)) ";")
";;")) ";;"))
;; Skip regression tests we expect to fail ;; Skip regression tests we expect to fail
@ -557,7 +555,10 @@ secure session between the peers.")
;; Regression tests that require LuaJIT ;; Regression tests that require LuaJIT
'("44-resolvers-gc.lua" '("44-resolvers-gc.lua"
"51-join-defunct-thread.lua") "51-join-defunct-thread.lua"
;; These both need the ffi module.
"73-starttls-buffering.lua"
"87-alpn-disappears.lua")
;; Regression tests that require Lua 5.3 ;; Regression tests that require Lua 5.3
(if (not (equal? lua-version "5.3")) (if (not (equal? lua-version "5.3"))