From 09b296375d8f2f00723b6cff9a3e0f38af20be20 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 17 Mar 2026 16:08:04 -0700 Subject: [PATCH] luaPackages.enet: init at 1.2-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 33 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 14 ++++++++ 3 files changed, 48 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 322e93b9760a..31971594209f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -19,6 +19,7 @@ cyan,,,,,, datafile,,,,,, digestif,,,,,5.3, dkjson,,,,,, +enet,,,,,,ulysseszhan fennel,,,,,,misterio77 fidget.nvim,,,,,5.1,mrcjkb fifo,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7797876fc18b..047793d6efa8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -675,6 +675,39 @@ final: prev: { } ) { }; + enet = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luaOlder, + }: + buildLuarocksPackage { + pname = "enet"; + version = "1.2-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/enet-1.2-1.rockspec"; + sha256 = "0jf0qxf3lsrmc1dww7b7i6srqp2cy8caqv9f1rbva7f6rnppxzra"; + }).outPath; + src = fetchFromGitHub { + owner = "leafo"; + repo = "lua-enet"; + tag = "v1.2"; + hash = "sha256-GomfJAPbR+y469LuaNPrkab0Wd3xAsAhT4uqbDo8BUA="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "http://leafo.net/lua-enet"; + description = "A library for doing network communication in Lua"; + maintainers = with lib.maintainers; [ ulysseszhan ]; + license.fullName = "MIT"; + }; + } + ) { }; + fennel = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 59765aed4c1d..6f316bd09298 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -10,6 +10,7 @@ coreutils, curl, dbus, + enet, expat, fd, fetchFromGitHub, @@ -147,6 +148,19 @@ in ''; }); + enet = prev.enet.overrideAttrs (old: { + postPatch = '' + # luaL_checkint is removed in Lua 5.3, and luaL_register is removed in Lua 5.4 + sed -i '/#include "lauxlib.h"/a\ + #if LUA_VERSION_NUM >= 502\ + #define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))\ + #define luaL_register(L,n,f) ((n) ? luaL_newlib(L,f) : luaL_setfuncs(L,f,0))\ + #endif + ' enet.c + ''; + buildInputs = old.buildInputs ++ [ enet ]; + }); + fzf-lua = prev.fzf-lua.overrideAttrs { # FIXME: https://github.com/NixOS/nixpkgs/issues/431458 # fzf-lua throws `address already in use` on darwin