mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
luaPackages.luaexpat: 1.3.0-1 -> 1.4.1-1
This commit is contained in:
parent
5b7eede1e7
commit
67f45a4362
@ -52,7 +52,7 @@ luadbi-postgresql,,,,,,
|
||||
luadbi-sqlite3,,,,,,
|
||||
luaepnf,,,,,,
|
||||
luaevent,,,,,,
|
||||
luaexpat,,,,1.3.0-1,,arobyn flosse
|
||||
luaexpat,,,,1.4.1-1,,arobyn flosse
|
||||
luaffi,,,http://luarocks.org/dev,,,
|
||||
luafilesystem,,,,1.7.0-2,,flosse
|
||||
lualogging,,,,,,
|
||||
|
|
@ -1602,25 +1602,33 @@ buildLuarocksPackage {
|
||||
}) {};
|
||||
|
||||
luaexpat = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchurl, lua
|
||||
, fetchgit, lua
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "luaexpat";
|
||||
version = "1.3.0-1";
|
||||
version = "1.4.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "https://luarocks.org/luaexpat-1.3.0-1.rockspec";
|
||||
sha256 = "14f7y2acycbgrx95w3darx5l1qm52a09f7njkqmhyk10w615lrw4";
|
||||
url = "https://luarocks.org/luaexpat-1.4.1-1.rockspec";
|
||||
sha256 = "1abwd385x7wnza7qqz5s4aj6m2l1c23pjmbgnpq73q0s17pn1h0c";
|
||||
}).outPath;
|
||||
src = fetchurl {
|
||||
url = "http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz";
|
||||
sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
|
||||
};
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lunarmodules/luaexpat.git",
|
||||
"rev": "7d99eec9685087e6b3a57a09d672591c2aa0f4f6",
|
||||
"date": "2022-04-01T17:08:05+02:00",
|
||||
"path": "/nix/store/b6jyh79ggjdqgizk9amzh74lq4lwm3nm-luaexpat",
|
||||
"sha256": "0yia3xpf6pwmy10yg2dnyfg3v774jay24qfyvm9pj21h2ad7ckm1",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
disabled = with lua; (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.keplerproject.org/luaexpat/";
|
||||
homepage = "https://lunarmodules.github.io/luaexpat";
|
||||
description = "XML Expat parsing";
|
||||
maintainers = with lib.maintainers; [ arobyn flosse ];
|
||||
license.fullName = "MIT/X11";
|
||||
|
@ -1,36 +0,0 @@
|
||||
diff --git a/src/lxplib.c b/src/lxplib.c
|
||||
index 1c972db..5712611 100644
|
||||
--- a/src/lxplib.c
|
||||
+++ b/src/lxplib.c
|
||||
@@ -590,7 +590,7 @@ static void set_info (lua_State *L) {
|
||||
/*
|
||||
** Adapted from Lua 5.2.0
|
||||
*/
|
||||
-static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
|
||||
+static void compat_luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
|
||||
luaL_checkstack(L, nup, "too many upvalues");
|
||||
for (; l->name != NULL; l++) { /* fill the table with given functions */
|
||||
int i;
|
||||
@@ -602,6 +602,8 @@ static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
|
||||
}
|
||||
lua_pop(L, nup); /* remove upvalues */
|
||||
}
|
||||
+#else
|
||||
+#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -612,11 +614,11 @@ int luaopen_lxp (lua_State *L) {
|
||||
lua_pushvalue(L, -2);
|
||||
lua_rawset(L, -3);
|
||||
|
||||
- luaL_setfuncs (L, lxp_meths, 0);
|
||||
+ compat_luaL_setfuncs (L, lxp_meths, 0);
|
||||
lua_pop (L, 1); /* remove metatable */
|
||||
|
||||
lua_newtable (L);
|
||||
- luaL_setfuncs (L, lxp_funcs, 0);
|
||||
+ compat_luaL_setfuncs (L, lxp_funcs, 0);
|
||||
set_info (L);
|
||||
return 1;
|
||||
}
|
@ -206,9 +206,6 @@ with prev;
|
||||
externalDeps = [
|
||||
{ name = "EXPAT"; dep = pkgs.expat; }
|
||||
];
|
||||
patches = [
|
||||
./luaexpat.patch
|
||||
];
|
||||
});
|
||||
|
||||
# TODO Somehow automatically amend buildInputs for things that need luaffi
|
||||
|
Loading…
Reference in New Issue
Block a user