summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorCarlo Zancanaro <carlo@zancanaro.id.au>2026-06-09 22:28:21 +1000
committerNguyễn Gia Phong <cnx@loang.net>2026-06-17 22:05:10 +0900
commit509b7e8f3adb59b43f137f8caabc72e6b5635c3d (patch)
treed5965ba8ef3a1ce5e32b329915ef2851351a1218 /gnu/packages
parent20fccdd23227e6a3b952bc0dc2410b7edda2dad1 (diff)
gnu: lua-djot: Define variants with package rewrites.
* gnu/packages/lua.scm (make-lua-djot): Remove procedure. (lua-djot): Convert to direct package definition. (lua5.4-djot, lua5.3-djot, lua5.2-djot, lua5.1-djot): Define as rewrite of lua-djot. Merges: https://codeberg.org/guix/guix/pulls/9183 Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/lua.scm22
1 files changed, 8 insertions, 14 deletions
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index bcc0e6c61f0..145a95b3688 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1327,9 +1327,9 @@ on numbers.")
1327 (lua-5.2 lua5.2-bitop) 1327 (lua-5.2 lua5.2-bitop)
1328 (lua-5.1 lua5.1-bitop)) 1328 (lua-5.1 lua5.1-bitop))
1329 1329
1330(define (make-lua-djot name lua) 1330(define-public lua-djot
1331 (package 1331 (package
1332 (name name) 1332 (name "lua-djot")
1333 (version "0.2.1") 1333 (version "0.2.1")
1334 (source 1334 (source
1335 (origin 1335 (origin
@@ -1364,7 +1364,7 @@ on numbers.")
1364 (string-append 1364 (string-append
1365 #$output 1365 #$output
1366 "/share/lua/" 1366 "/share/lua/"
1367 #$(version-major+minor (package-version lua))))) 1367 #$(this-lua-version))))
1368 (install-file "djot.lua" lua-path) 1368 (install-file "djot.lua" lua-path)
1369 (copy-recursively "djot" (string-append lua-path "/djot")))))))) 1369 (copy-recursively "djot" (string-append lua-path "/djot"))))))))
1370 (native-inputs (list lua)) 1370 (native-inputs (list lua))
@@ -1377,17 +1377,11 @@ that identify elements by source position, which could be used
1377for syntax highlighting or a linting tool.") 1377for syntax highlighting or a linting tool.")
1378 (license license:expat))) 1378 (license license:expat)))
1379 1379
1380(define-public lua5.4-djot 1380(define-public-lua-variants lua-djot
1381 (make-lua-djot "lua5.4-djot" lua-5.4)) 1381 (lua-5.4 lua5.4-djot)
1382 1382 (lua-5.3 lua5.3-djot)
1383(define-public lua-djot 1383 (lua-5.2 lua5.2-djot)
1384 (make-lua-djot "lua-djot" lua)) 1384 (lua-5.1 lua5.1-djot))
1385
1386(define-public lua5.2-djot
1387 (make-lua-djot "lua5.2-djot" lua-5.2))
1388
1389(define-public lua5.1-djot
1390 (make-lua-djot "lua5.1-djot" lua-5.1))
1391 1385
1392(define-public djot 1386(define-public djot
1393 (package 1387 (package