wip

we need to use a lua5.1 env since openresty relies on luajit, else you get missing symbol errors.
luarocks · Aug 15, 2023 · f5bd317 · f5bd317
1 parent 49e9bcc
commit f5bd317
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 129 deletions.
diff --git a/contrib/generated-packages.nix b/contrib/generated-packages.nix
@@ -1,24 +1,45 @@
 /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT!
-  Regenerate it with:
-  nixpkgs$ ./maintainers/scripts/update-luarocks-packages
+Regenerate it with:
+nixpkgs$ ./maintainers/scripts/update-luarocks-packages
 
-  You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
+You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
 */
 
 { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args:
 final: prev:
 {
-  date = callPackage
-    ({ luaOlder, fetchgit, luaAtLeast, lua, buildLuarocksPackage }:
-      buildLuarocksPackage {
-        pname = "date";
-        version = "2.2-2";
-        knownRockspec = (fetchurl {
-          url = "mirror://luarocks/date-2.2-2.rockspec";
-          sha256 = "0z2gb4rxfrkdx3zlysmlvfpm867fk0yq0bsn7yl789pvgf591l1x";
-        }).outPath;
-        src = fetchgit (removeAttrs
-          (builtins.fromJSON ''{
+ansicolors = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }:
+buildLuarocksPackage {
+  pname = "ansicolors";
+  version = "1.0.2-3";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/ansicolors-1.0.2-3.rockspec";
+    sha256 = "19y962xdx5ldl3596ywdl7n825dffz9al6j6rx6pbgmhb7pi8s5v";
+  }).outPath;
+  src = fetchurl {
+    url    = "https://github.com/kikito/ansicolors.lua/archive/v1.0.2.tar.gz";
+    sha256 = "0r4xi57njldmar9pn77l0vr5701rpmilrm51spv45lz0q9js8xps";
+  };
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "https://github.com/kikito/ansicolors.lua";
+    description = "Library for color Manipulation.";
+    license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+  };
+}) {};
+
+date = callPackage({ luaOlder, buildLuarocksPackage, lua, luaAtLeast, fetchgit }:
+buildLuarocksPackage {
+  pname = "date";
+  version = "2.2-2";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/date-2.2-2.rockspec";
+    sha256 = "0z2gb4rxfrkdx3zlysmlvfpm867fk0yq0bsn7yl789pvgf591l1x";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/Tieske/date.git",
   "rev": "e309741edc15bde2c884b0db09d8560848773b50",
   "date": "2023-06-19T14:52:25+02:00",
@@ -30,56 +51,27 @@ final: prev:
   "deepClone": false,
   "leaveDotGit": false
 }
- '') [ "date" "path" "sha256" ]);
-
-        disabled = (luaOlder "5.0") || (luaAtLeast "5.5");
-        propagatedBuildInputs = [ lua ];
-
-        meta = {
-          homepage = "https://github.com/Tieske/date";
-          description = "Date & Time module for Lua 5.x";
-          license.fullName = "MIT";
-        };
-      })
-    { };
-
-  ansicolors = callPackage
-    ({ fetchurl, buildLuarocksPackage, lua, luaOlder }:
-      final.buildLuarocksPackage {
-        pname = "ansicolors";
-        version = "1.0.2-3";
-        knownRockspec = (fetchurl {
-          url = "mirror://luarocks/ansicolors-1.0.2-3.rockspec";
-          sha256 = "19y962xdx5ldl3596ywdl7n825dffz9al6j6rx6pbgmhb7pi8s5v";
-        }).outPath;
-        src = fetchurl {
-          url = "https://github.com/kikito/ansicolors.lua/archive/v1.0.2.tar.gz";
-          sha256 = "0r4xi57njldmar9pn77l0vr5701rpmilrm51spv45lz0q9js8xps";
-        };
-
-        disabled = (luaOlder "5.1");
-        propagatedBuildInputs = [ lua ];
-
-        meta = {
-          homepage = "https://github.com/kikito/ansicolors.lua";
-          description = "Library for color Manipulation.";
-          license.fullName = "MIT <http://opensource.org/licenses/MIT>";
-        };
-      })
-    { };
-
-
-  lapis = callPackage
-    ({ argparse, luaossl, ansicolors, lua-cjson, lua, luasocket, lpeg, fetchgit, buildLuarocksPackage, etlua, date, loadkit, pgmoon }:
-      buildLuarocksPackage {
-        pname = "lapis";
-        version = "1.14.0-1";
-        knownRockspec = (fetchurl {
-          url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lapis-1.14.0-1.rockspec";
-          sha256 = "1iax1n4nfk81vlslnb92wnpg03scci7p7983dwvkhk5nan63vnmh";
-        }).outPath;
-        src = fetchgit (removeAttrs
-          (builtins.fromJSON ''{
+ '') ["date" "path" "sha256"]) ;
+
+  disabled = (luaOlder "5.0") || (luaAtLeast "5.5");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "https://github.com/Tieske/date";
+    description = "Date & Time module for Lua 5.x";
+    license.fullName = "MIT";
+  };
+}) {};
+
+lapis = callPackage({ ansicolors, lpeg, lua, lua-cjson, pgmoon, fetchgit, buildLuarocksPackage, date, argparse, loadkit, etlua, luaossl, luasocket }:
+buildLuarocksPackage {
+  pname = "lapis";
+  version = "1.14.0-1";
+  knownRockspec = (fetchurl {
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lapis-1.14.0-1.rockspec";
+    sha256 = "1iax1n4nfk81vlslnb92wnpg03scci7p7983dwvkhk5nan63vnmh";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/leafo/lapis.git",
   "rev": "fce55fddfafca91b12fcbf21e9ac322ad68fa22e",
   "date": "2023-07-20T12:10:03-07:00",
@@ -91,17 +83,80 @@ final: prev:
   "deepClone": false,
   "leaveDotGit": false
 }
- '') [ "date" "path" "sha256" ]);
+ '') ["date" "path" "sha256"]) ;
+
+  propagatedBuildInputs = [ ansicolors argparse date etlua loadkit lpeg lua lua-cjson luaossl luasocket pgmoon ];
+
+  meta = {
+    homepage = "http://leafo.net/lapis";
+    description = "A web framework for MoonScript & Lua";
+    license.fullName = "MIT";
+  };
+}) {};
+
+pgmoon = callPackage({ luaOlder, buildLuarocksPackage, lpeg, lua, fetchgit }:
+buildLuarocksPackage {
+  pname = "pgmoon";
+  version = "1.16.0-1";
+  knownRockspec = (fetchurl {
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/pgmoon-1.16.0-1.rockspec";
+    sha256 = "0qibc6pbal0n5p7c0v0rxrc2b3qdkbbz5wpn4nihsv7vkhjaqhx8";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/leafo/pgmoon.git",
+  "rev": "7b7ef2a3f17d32881c61f0fb258d2ee01718942c",
+  "date": "2022-11-22T14:49:59-08:00",
+  "path": "/nix/store/jjyf1rij16mlqfx55rrpwadcnn8mf663-pgmoon",
+  "sha256": "1ifivvkkqwcgp9s9ynlb394973mbhwgs9yvalbyn3170n78msacb",
+  "hash": "sha256-iyld0bHghGH9omr7pB+Hq46TSBqLWp90uo9xPOfe0cU=",
+  "fetchLFS": false,
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path" "sha256"]) ;
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lpeg lua ];
+
+  meta = {
+    homepage = "https://github.com/leafo/pgmoon";
+    description = "Postgres driver for OpenResty and Lua";
+    license.fullName = "MIT";
+  };
+}) {};
+
+tableshape = callPackage({ luaOlder, buildLuarocksPackage, fetchgit, lua }:
+buildLuarocksPackage {
+  pname = "tableshape";
+  version = "2.6.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/tableshape-2.6.0-1.rockspec";
+    sha256 = "198hfddc1lnaxy21bp8nykb8paw5s1v653sl5s547yj3vmazzw2c";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/leafo/tableshape.git",
+  "rev": "88755361cfeab725f193b98fbee3930cb5fb959c",
+  "date": "2023-02-22T19:30:25-08:00",
+  "path": "/nix/store/qmyzyvcfhfmcgaq19qh7a40kpq8670yz-tableshape",
+  "sha256": "18g16alcxqyd4plk8c6zrign9ai745jnl5zs6jzrcjl98qz9n5md",
+  "hash": "sha256-rRabPkaJSpa/NPoXamUhJ6pkX8zfMDTpJc3jzqgy4aE=",
+  "fetchLFS": false,
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path" "sha256"]) ;
 
-        propagatedBuildInputs = [ ansicolors argparse date etlua loadkit lpeg lua lua-cjson luaossl luasocket pgmoon ];
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
 
-        meta = {
-          homepage = "http://leafo.net/lapis";
-          description = "A web framework for MoonScript & Lua";
-          license.fullName = "MIT";
-        };
-      })
-    { };
+  meta = {
+    homepage = "https://github.com/leafo/tableshape";
+    description = "Test the shape or structure of a Lua table";
+    license.fullName = "MIT";
+  };
+}) {};
 
   etlua = callPackage
     ({ lua, buildLuarocksPackage, fetchgit, fetchurl, luaOlder }:
@@ -118,7 +173,6 @@ final: prev:
   "rev": "8dda2e5aeb4413446172a562a9a374b700054836",
   "date": "2019-08-02T18:07:22-07:00",
   "path": "/nix/store/kk7sib6lwra0wyf6yjc8shkny7b5qnm7-etlua",
-  "sha256": "0ns7vvzslxhx39xwhxzi6cwkk2vcxidxidgysr03sq47h8daspig",
   "hash": "sha256-L16tGoKHYD1A1v612FvsbIs5OTPxd8h7Gh12qv/eR1s=",
   "fetchLFS": false,
   "fetchSubmodules": true,
@@ -138,41 +192,36 @@ final: prev:
       })
     { };
 
-  pgmoon = callPackage
-    ({ lua, luaOlder, buildLuarocksPackage, lpeg, fetchgit }:
-      buildLuarocksPackage {
-        pname = "pgmoon";
-        version = "1.16.0-1";
-        knownRockspec = (fetchurl {
-          url = "mirror://luarocks/pgmoon-1.16.0-1.rockspec";
-          sha256 = "0qibc6pbal0n5p7c0v0rxrc2b3qdkbbz5wpn4nihsv7vkhjaqhx8";
-        }).outPath;
-        src = fetchgit (removeAttrs
-          (builtins.fromJSON ''{
-  "url": "https://github.com/leafo/pgmoon.git",
-  "rev": "7b7ef2a3f17d32881c61f0fb258d2ee01718942c",
-  "date": "2022-11-22T14:49:59-08:00",
-  "path": "/nix/store/jjyf1rij16mlqfx55rrpwadcnn8mf663-pgmoon",
-  "sha256": "1ifivvkkqwcgp9s9ynlb394973mbhwgs9yvalbyn3170n78msacb",
-  "hash": "sha256-iyld0bHghGH9omr7pB+Hq46TSBqLWp90uo9xPOfe0cU=",
+lapis-console = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lapis, lua }:
+buildLuarocksPackage {
+  pname = "lapis-console";
+  version = "1.2.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/lapis-console-1.2.0-1.rockspec";
+    sha256 = "1947hsr891z47hwxynrcx6binzwshg3rr81wzcjszybhqv7hprkp";
+  }).outPath;
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/leafo/lapis-console.git",
+  "rev": "b76ad976086e2ddb87603a3c8a31a8efa483450a",
+  "date": "2021-01-25T08:51:59-08:00",
+  "path": "/nix/store/rapxaa6ca3grwxbxpyhbcha2048vzcp8-lapis-console",
+  "sha256": "0344p3cr29c5lzp1whxsh4fsyp2bk7f78wzqx5h9y0234k20jbc1",
+  "hash": "sha256-gS0JxCRDAJ9g6fhzdNyZS1yvHYG6Qx7up4Ulkdm4hAw=",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,
   "leaveDotGit": false
 }
- '') [ "date" "path" "sha256" ]);
-
-        disabled = (luaOlder "5.1");
-        propagatedBuildInputs = [ lpeg lua ];
-
-        meta = {
-          homepage = "https://github.com/leafo/pgmoon";
-          description = "Postgres driver for OpenResty and Lua";
-          license.fullName = "MIT";
-        };
-      })
-    { };
+ '') ["date" "path" "sha256"]) ;
 
+  disabled = (lua.luaversion != "5.1");
+  propagatedBuildInputs = [ lapis lua ];
 
+  meta = {
+    homepage = "git://github.com/leafo/lapis-console.git";
+    description = "An interactive web based console for Lapis";
+    license.fullName = "MIT";
+  };
+}) {};
 }
 /* GENERATED - do not edit this file */
diff --git a/contrib/luarocks-packages.csv b/contrib/luarocks-packages.csv
@@ -1,5 +1,7 @@
 name,src,ref,server,version,luaversion,maintainers
 ansicolors,,,,,,
 date,,,,,,
+etlua,,,,,,
 lapis,,,,,,
 pgmoon,,,,,,
+tableshape,,,,,,