mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-21 05:04:00 +00:00
274715cbc3
luaPackages replaced by generated ones: - bit32 - compat53 - cqueues - luacyrussasl -> cyrussasl (luarocks name) - luaexpat - luadbi -> luadbi front-end module + separate backend modules luadbi-{mysql,postgresql,sqlite3} - luafilesystem - luaossl - luasec - luasocket - luastdlib -> stdlib (luarocks name) - lrexlib -> lrexlib-pcre (we already have lrexlib-gnu and lrexlib-posix, lrexlib-pcre however appears to be the variant used in mudlet, which is the only current dep in nixpkgs) - luasqlite -> luasql-sqlite3 (luarocks name) - lfs -> luafilesytem (we literally had two manually written luafilesystem expressions, under different names) Changes and additions to overrides to generated luarocks packgaes, including: - busted: Install bash completions along with the zsh ones - cqueues: - Perform minor surgery on the rockspec to allow using a single rockspec to build for all supported Lua versions - Add a patch by @vcunat to work around a build issue - luuid: Wrote a tiny patch to allow for Lua 5.1/Luajit compatibility - General changes: - Sorted the packages - Attempted to make the formatting consistent - Preferenced `.override` instead of `.overrideAttrs` wherever possible Minor changes to other packages to adjust for the Lua package changes: - luakit expression simplified - prosody expression simplified; but users will now need to specify the luadbi backend module they intend to use in withExtraLibs - knot-resolver inputs correctd - mudlet inputs corrected (although this package was and should still be broken)
17 lines
448 B
Diff
17 lines
448 B
Diff
diff -Naur 5.2/uuid/luuid.c rock/uuid/luuid.c
|
|
--- 5.2/uuid/luuid.c 2012-05-10 11:22:00.000000000 +1000
|
|
+++ rock/uuid/luuid.c 2019-06-13 15:13:10.374134079 +1000
|
|
@@ -64,7 +64,11 @@
|
|
|
|
LUALIB_API int luaopen_uuid(lua_State *L)
|
|
{
|
|
- luaL_newlib(L,R);
|
|
+ #if LUA_VERSION_NUM == 501
|
|
+ luaL_register(L,MYNAME,R);
|
|
+ #else
|
|
+ luaL_newlib(L,R);
|
|
+ #endif
|
|
lua_pushliteral(L,"version"); /** version */
|
|
lua_pushliteral(L,MYVERSION);
|
|
lua_settable(L,-3);
|