From 5ee828f5b80eb4cabd17b45b35e57ad6b51124af Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 17 Mar 2026 16:07:39 -0700 Subject: [PATCH] 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"; });