From eedb267f7acc41c36875effcfba2e336b0b239cc Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Tue, 9 Jun 2026 00:47:37 +1000 Subject: gnu: lua-sec: Define variants with package rewrites. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lua.scm (make-lua-sec): Remove procedure. (lua-sec): Convert to direct package definition. (lua5.5-sec, lua5.4-sec, lua5.3-sec, lua5.2-sec, lua5.1-sec): Define as rewrite of lua-sec. Merges: https://codeberg.org/guix/guix/pulls/9183 Signed-off-by: Nguyễn Gia Phong --- gnu/packages/lua.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 3e0f0ea1e5f..3a65f0d5246 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -873,9 +873,9 @@ interfaces.") (lua-5.2 lua5.2-ossl) (lua-5.1 lua5.1-ossl)) -(define (make-lua-sec name lua lua-socket) +(define-public lua-sec (package - (name name) + (name "lua-sec") (version "1.3.2") (source (origin (method git-fetch) @@ -891,7 +891,7 @@ interfaces.") (list #:tests? #f ;no tests #:make-flags - #~(let* ((lua-api-version #$(version-major+minor (package-version lua))) + #~(let* ((lua-api-version #$(this-lua-version)) (lua-path (string-append #$output "/share/lua/" lua-api-version)) (lua-cpath (string-append #$output "/lib/lua/" lua-api-version))) (list "linux" @@ -911,20 +911,12 @@ It takes an already established TCP connection and creates a secure session between the peers.") (license license:expat))) -(define-public lua5.1-sec - (make-lua-sec "lua5.1-sec" lua-5.1 lua5.1-socket)) - -(define-public lua5.2-sec - (make-lua-sec "lua5.2-sec" lua-5.2 lua5.2-socket)) - -(define-public lua-sec - (make-lua-sec "lua-sec" lua lua-socket)) - -(define-public lua5.4-sec - (make-lua-sec "lua5.4-sec" lua-5.4 lua5.4-socket)) - -(define-public lua5.5-sec - (make-lua-sec "lua5.5-sec" lua-5.5 lua5.5-socket)) +(define-public-lua-variants lua-sec + (lua-5.5 lua5.5-sec) + (lua-5.4 lua5.4-sec) + (lua-5.3 lua5.3-sec) + (lua-5.2 lua5.2-sec) + (lua-5.1 lua5.1-sec)) (define (make-lua-cqueues name lua lua-ossl) (package -- cgit v1.2.3