From 21893799714b03c9d5e308daa3a4aad6b747b5e6 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 17 Mar 2026 16:07:34 -0700 Subject: [PATCH 1/3] luaPackages.md5: init at 1.3-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 392b0bc0541e..c16de7cbbfe7 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -113,6 +113,7 @@ lzextras,,,,,,birdee lzn-auto-require,,,,,,mrcjkb magick,,,,,5.1,donovanglover markdown,,,,,, +md5,,,,,, mediator_lua,,,,,, middleclass,,,,,, mimetypes,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c8429e62e8d7..a4d6a9388760 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3710,6 +3710,35 @@ final: prev: { } ) { }; + md5 = callPackage ( + { + buildLuarocksPackage, + fetchurl, + luaOlder, + }: + buildLuarocksPackage { + pname = "md5"; + version = "1.3-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/md5-1.3-1.rockspec"; + sha256 = "08kx00ik1hly4p1a1bvvw3bvbddc64vdhpr21jy3asrj9nz86bnr"; + }).outPath; + src = fetchurl { + url = "https://github.com/keplerproject/md5/archive/1.3.tar.gz"; + sha256 = "193dsjgnzrnykpmx68njkv72fxh2gb3llqgx2lgbgnf5i66shiq7"; + }; + + disabled = luaOlder "5.0"; + + meta = { + homepage = "http://keplerproject.github.io/md5/"; + description = "Checksum library"; + license.fullName = "MIT/X11"; + }; + } + ) { }; + mediator_lua = callPackage ( { buildLuarocksPackage, From 5ee828f5b80eb4cabd17b45b35e57ad6b51124af Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 17 Mar 2026 16:07:39 -0700 Subject: [PATCH 2/3] luaPackages.utf8: init at 1.3-0-f36cc914ae9015cd3045987abadd83bbcfae98f0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 32 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 10 ++++++ 3 files changed, 43 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c16de7cbbfe7..a144c5abc346 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -159,6 +159,7 @@ toml-edit,,,,,5.1,mrcjkb tree-sitter-http,,,,0.0.33-1,, tree-sitter-norg,,,,,5.1,mrcjkb tree-sitter-orgmode,,,,,5.1, +utf8,,,,,, vstruct,,,,,, vusted,,,,,, xml2lua,,,,,,teto diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index a4d6a9388760..ed254d70dc8b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5242,6 +5242,38 @@ final: prev: { } ) { }; + utf8 = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luaOlder, + }: + buildLuarocksPackage { + pname = "utf8"; + version = "1.3-0"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/utf8-1.3-0.rockspec"; + sha256 = "1szsrwb15yyvrqwyqrr7g5ivihc0kl4pc7qq439q235f3x8jv2jp"; + }).outPath; + src = fetchFromGitHub { + owner = "dannote"; + repo = "luautf8"; + rev = "f36cc914ae9015cd3045987abadd83bbcfae98f0"; + hash = "sha256-xLWqglAzqcxY+R8GOC+D3uzL2+9ZriEx8Kj41LkI5vU="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "http://github.com/starwing/luautf8"; + description = "A UTF-8 support module for Lua"; + license.fullName = "MIT"; + }; + } + ) { }; + vstruct = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 59765aed4c1d..dd324466c410 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1129,6 +1129,16 @@ in meta.broken = lua.luaversion != "5.1"; }); + utf8 = prev.utf8.overrideAttrs { + postPatch = '' + sed -i '/#include /a\ + #ifndef lua_assert\ + #define lua_assert(x) assert(x)\ + #endif + ' lutf8lib.c + ''; + }; + vstruct = prev.vstruct.overrideAttrs (_: { meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); From 436c497347058e551a30448ae495e31f19924821 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 17 Mar 2026 16:07:45 -0700 Subject: [PATCH 3/3] luaPackages.lsqlite3: init at 0.9.6-1 --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/by-name/ol/olympus-unwrapped/package.nix | 11 +------ .../lua-modules/generated-packages.nix | 31 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 5 +++ 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a144c5abc346..38ee02c3cd17 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -48,6 +48,7 @@ lrexlib-oniguruma,,,,,,junestepp lrexlib-pcre,,,,,, lrexlib-posix,,,,,, lsp-progress.nvim,,,,,5.1,gepbird +lsqlite3,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 2d0f43ede95d..034c603c4d41 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -15,16 +15,7 @@ let lua_cpath = with luajitPackages; lib.concatMapStringsSep ";" getLuaCPath [ - (buildLuarocksPackage { - pname = "lsqlite3"; - version = "0.9.6-1"; - src = fetchzip { - url = "http://lua.sqlite.org/home/zip/lsqlite3_v096.zip"; - hash = "sha256-Mq409A3X9/OS7IPI/KlULR6ZihqnYKk/mS/W/2yrGBg="; - }; - buildInputs = [ sqlite.dev ]; - }) - + lsqlite3 lua-subprocess nfd ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index ed254d70dc8b..f4ecc8718ae6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1608,6 +1608,37 @@ final: prev: { } ) { }; + lsqlite3 = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaAtLeast, + luaOlder, + }: + buildLuarocksPackage { + pname = "lsqlite3"; + version = "0.9.6-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/lsqlite3-0.9.6-1.rockspec"; + sha256 = "1wb51lsfllmbzrjfl0dzxpg597nd54nn06c9plpvqwwjz4l9lrjf"; + }).outPath; + src = fetchzip { + url = "https://lua.sqlite.org/home/zip/lsqlite3_v096.zip?uuid=v0.9.6"; + sha256 = "0p24g17y6s0x1951y9pyndggp71drh4zrzb2a05nb9sk5s3z9dnm"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + + meta = { + homepage = "http://lua.sqlite.org/"; + description = "A binding for Lua to the SQLite3 database library"; + license.fullName = "MIT"; + }; + } + ) { }; + lua-cjson = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index dd324466c410..a0d13262625d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -402,6 +402,11 @@ in ]; }); + lsqlite3 = prev.lsqlite3.overrideAttrs (old: { + src = old.src.overrideAttrs { extension = "zip"; }; + buildInputs = old.buildInputs ++ [ sqlite.dev ]; + }); + lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs { strictDeps = false; meta.broken = isLuaJIT;