diff options
| author | Carlo Zancanaro <carlo@zancanaro.id.au> | 2026-06-09 00:47:37 +1000 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-06-17 22:02:39 +0900 |
| commit | eedb267f7acc41c36875effcfba2e336b0b239cc (patch) | |
| tree | 7f3ac367d67ef00bc91a2cbd1e3b84b0fdadc721 | |
| parent | c970723e9f9f40eaab6f20f4284e2c118eff9262 (diff) | |
gnu: lua-sec: Define variants with package rewrites.
* 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 <cnx@loang.net>
| -rw-r--r-- | gnu/packages/lua.scm | 26 |
1 files 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.") | |||
| 873 | (lua-5.2 lua5.2-ossl) | 873 | (lua-5.2 lua5.2-ossl) |
| 874 | (lua-5.1 lua5.1-ossl)) | 874 | (lua-5.1 lua5.1-ossl)) |
| 875 | 875 | ||
| 876 | (define (make-lua-sec name lua lua-socket) | 876 | (define-public lua-sec |
| 877 | (package | 877 | (package |
| 878 | (name name) | 878 | (name "lua-sec") |
| 879 | (version "1.3.2") | 879 | (version "1.3.2") |
| 880 | (source (origin | 880 | (source (origin |
| 881 | (method git-fetch) | 881 | (method git-fetch) |
| @@ -891,7 +891,7 @@ interfaces.") | |||
| 891 | (list | 891 | (list |
| 892 | #:tests? #f ;no tests | 892 | #:tests? #f ;no tests |
| 893 | #:make-flags | 893 | #:make-flags |
| 894 | #~(let* ((lua-api-version #$(version-major+minor (package-version lua))) | 894 | #~(let* ((lua-api-version #$(this-lua-version)) |
| 895 | (lua-path (string-append #$output "/share/lua/" lua-api-version)) | 895 | (lua-path (string-append #$output "/share/lua/" lua-api-version)) |
| 896 | (lua-cpath (string-append #$output "/lib/lua/" lua-api-version))) | 896 | (lua-cpath (string-append #$output "/lib/lua/" lua-api-version))) |
| 897 | (list "linux" | 897 | (list "linux" |
| @@ -911,20 +911,12 @@ It takes an already established TCP connection and creates a secure session | |||
| 911 | between the peers.") | 911 | between the peers.") |
| 912 | (license license:expat))) | 912 | (license license:expat))) |
| 913 | 913 | ||
| 914 | (define-public lua5.1-sec | 914 | (define-public-lua-variants lua-sec |
| 915 | (make-lua-sec "lua5.1-sec" lua-5.1 lua5.1-socket)) | 915 | (lua-5.5 lua5.5-sec) |
| 916 | 916 | (lua-5.4 lua5.4-sec) | |
| 917 | (define-public lua5.2-sec | 917 | (lua-5.3 lua5.3-sec) |
| 918 | (make-lua-sec "lua5.2-sec" lua-5.2 lua5.2-socket)) | 918 | (lua-5.2 lua5.2-sec) |
| 919 | 919 | (lua-5.1 lua5.1-sec)) | |
| 920 | (define-public lua-sec | ||
| 921 | (make-lua-sec "lua-sec" lua lua-socket)) | ||
| 922 | |||
| 923 | (define-public lua5.4-sec | ||
| 924 | (make-lua-sec "lua5.4-sec" lua-5.4 lua5.4-socket)) | ||
| 925 | |||
| 926 | (define-public lua5.5-sec | ||
| 927 | (make-lua-sec "lua5.5-sec" lua-5.5 lua5.5-socket)) | ||
| 928 | 920 | ||
| 929 | (define (make-lua-cqueues name lua lua-ossl) | 921 | (define (make-lua-cqueues name lua lua-ossl) |
| 930 | (package | 922 | (package |
