Merge pull request #63108 from Shados/lua-packaging-improvements-pr

Lua/luarocks packaging improvements

4 files changed, 811 insertions, 344 deletions

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d5641cf4ce2..6b6c82840c2 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -21,7 +21,7 @@ ansicolors = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/kikito/ansicolors.lua";
     description = "Library for color Manipulation.";
     license = {
@@ -34,13 +34,13 @@ argparse = buildLuarocksPackage {
   version = "0.6.0-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/argparse-0.6.0-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock;
     sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4";
   };
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/mpeterv/argparse";
     description = "A feature-rich command-line argument parser";
     license = {
@@ -65,7 +65,7 @@ basexx = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/aiq/basexx";
     description = "A base2, base16, base32, base64 and base85 library for Lua";
     license = {
@@ -84,14 +84,166 @@ binaryheap = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/Tieske/binaryheap.lua";
     description = "Binary heap implementation in pure Lua";
+    maintainers = with maintainers; [ vcunat ];
     license = {
       fullName = "MIT/X11";
     };
   };
 };
+bit32 = buildLuarocksPackage {
+  pname = "bit32";
+  version = "5.3.0-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/bit32-5.3.0-1.src.rock;
+    sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
+    description = "Lua 5.2 bit manipulation library";
+    maintainers = with maintainers; [ lblasc ];
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+busted = buildLuarocksPackage {
+  pname = "busted";
+  version = "2.0.rc13-0";
+
+  knownRockspec = (fetchurl {
+    url    = https://luarocks.org/busted-2.0.rc13-0.rockspec;
+    sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5";
+  }).outPath;
+
+  src = fetchurl {
+    url    = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz;
+    sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl";
+  };
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://olivinelabs.com/busted/";
+    description = "Elegant Lua unit testing.";
+    license = {
+      fullName = "MIT <http://opensource.org/licenses/MIT>";
+    };
+  };
+};
+cjson = buildLuarocksPackage {
+  pname = "lua-cjson";
+  version = "2.1.0.6-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock;
+    sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
+    description = "A fast JSON encoding/parsing module";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
+compat53 = buildLuarocksPackage {
+  pname = "compat53";
+  version = "0.7-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/compat53-0.7-1.src.rock;
+    sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/keplerproject/lua-compat-5.3";
+    description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
+    maintainers = with maintainers; [ vcunat ];
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
+coxpcall = buildLuarocksPackage {
+  pname = "coxpcall";
+  version = "1.17.0-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/coxpcall-1.17.0-1.src.rock;
+    sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://keplerproject.github.io/coxpcall";
+    description = "Coroutine safe xpcall and pcall";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+cqueues = buildLuarocksPackage {
+  pname = "cqueues";
+  version = "20171014.52-0";
+
+  src = fetchurl {
+    url    = https://luarocks.org/cqueues-20171014.52-0.src.rock;
+    sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx";
+  };
+  disabled = (lua.luaversion != "5.2");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://25thandclement.com/~william/projects/cqueues.html";
+    description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix.";
+    maintainers = with maintainers; [ vcunat ];
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+cyrussasl = buildLuarocksPackage {
+  pname = "cyrussasl";
+  version = "1.1.0-1";
+
+  knownRockspec = (fetchurl {
+    url    = https://luarocks.org/cyrussasl-1.1.0-1.rockspec;
+    sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc";
+  }).outPath;
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "git://github.com/JorjBauer/lua-cyrussasl",
+  "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d",
+  "date": "2015-08-21T18:24:54-04:00",
+  "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1",
+  "fetchSubmodules": true
+}
+ '') ["date"]) ;
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://github.com/JorjBauer/lua-cyrussasl";
+    description = "Cyrus SASL library for Lua 5.1+";
+    maintainers = with maintainers; [ vcunat ];
+    license = {
+      fullName = "BSD";
+    };
+  };
+};
 digestif = buildLuarocksPackage {
   pname = "digestif";
   version = "scm-1";
@@ -103,9 +255,9 @@ digestif = buildLuarocksPackage {
 
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "git://github.com/astoff/digestif",
-  "rev": "19442554ae18607707f09e6663d65bb8bb4ebb58",
-  "date": "2019-06-01T15:41:36+02:00",
-  "sha256": "1sglkgx2s1xc725h9b97jhfbi3scs32si83xss5m3n0xidwmlbzb",
+  "rev": "51c321f1b68b77f648fa6adf356de48925f69fe0",
+  "date": "2019-06-08T15:03:33+02:00",
+  "sha256": "1c9cl81vfzirc325wipdy992yn20b8xv8nqzl5mdhyz8zfp84hs7",
   "fetchSubmodules": true
 }
  '') ["date"]) ;
@@ -113,7 +265,7 @@ digestif = buildLuarocksPackage {
   disabled = (luaOlder "5.3");
   propagatedBuildInputs = [ lua lpeg dkjson ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/astoff/digestif/";
     description = "Code analyzer for TeX.";
     license = {
@@ -132,7 +284,7 @@ dkjson = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://dkolf.de/src/dkjson-lua.fsl/";
     description = "David Kolf's JSON module for Lua";
     license = {
@@ -150,7 +302,7 @@ fifo = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/daurnimator/fifo.lua";
     description = "A lua library/'class' that implements a FIFO";
     license = {
@@ -169,9 +321,10 @@ http = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/daurnimator/lua-http";
     description = "HTTP library for Lua";
+    maintainers = with maintainers; [ vcunat ];
     license = {
       fullName = "MIT";
     };
@@ -188,7 +341,7 @@ inspect = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/kikito/inspect.lua";
     description = "Lua table visualizer, ideal for debugging";
     license = {
@@ -212,7 +365,7 @@ ldoc = buildLuarocksPackage {
 
   propagatedBuildInputs = [ penlight markdown ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://stevedonovan.github.com/ldoc";
     description = "A Lua Documentation Tool";
     license = {
@@ -231,7 +384,7 @@ lgi = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/pavouk/lgi";
     description = "Lua bindings to GObject libraries";
     license = {
@@ -250,9 +403,10 @@ lpeg = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html";
     description = "Parsing Expression Grammars For Lua";
+    maintainers = with maintainers; [ vyp ];
     license = {
       fullName = "MIT/X11";
     };
@@ -268,7 +422,7 @@ lpeg_patterns = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua lpeg ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
     description = "a collection of LPEG patterns";
     license = {
@@ -281,13 +435,13 @@ lpeglabel = buildLuarocksPackage {
   version = "1.5.0-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/lpeglabel-1.5.0-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock;
     sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/sqmedeiros/lpeglabel/";
     description = "Parsing Expression Grammars For Lua with Labeled Failures";
     license = {
@@ -300,13 +454,13 @@ lpty = buildLuarocksPackage {
   version = "1.2.2-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/lpty-1.2.2-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock;
     sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.tset.de/lpty/";
     description = "A simple facility for lua to control other programs via PTYs.";
     license = {
@@ -319,13 +473,13 @@ lrexlib-gnu = buildLuarocksPackage {
   version = "2.9.0-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock;
     sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (GNU flavour).";
     license = {
@@ -333,18 +487,38 @@ lrexlib-gnu = buildLuarocksPackage {
     };
   };
 };
+lrexlib-pcre = buildLuarocksPackage {
+  pname = "lrexlib-pcre";
+  version = "2.9.0-1";
+
+  src = fetchurl {
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock;
+    sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://github.com/rrthomas/lrexlib";
+    description = "Regular expression library binding (PCRE flavour).";
+    maintainers = with maintainers; [ vyp ];
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 lrexlib-posix = buildLuarocksPackage {
   pname = "lrexlib-posix";
   version = "2.9.0-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock;
     sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (POSIX flavour).";
     license = {
@@ -357,13 +531,13 @@ ltermbox = buildLuarocksPackage {
   version = "0.2-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/ltermbox-0.2-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock;
     sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://code.google.com/p/termbox";
     description = "A termbox library package";
     license = {
@@ -371,25 +545,6 @@ ltermbox = buildLuarocksPackage {
     };
   };
 };
-cjson = buildLuarocksPackage {
-  pname = "lua-cjson";
-  version = "2.1.0.6-1";
-
-  src = fetchurl {
-    url    = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock;
-    sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5";
-  };
-  disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua ];
-
-  meta = {
-    homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
-    description = "A fast JSON encoding/parsing module";
-    license = {
-      fullName = "MIT";
-    };
-  };
-};
 lua-cmsgpack = buildLuarocksPackage {
   pname = "lua-cmsgpack";
   version = "0.4.0-0";
@@ -411,7 +566,7 @@ lua-cmsgpack = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/antirez/lua-cmsgpack";
     description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
     license = {
@@ -419,25 +574,6 @@ lua-cmsgpack = buildLuarocksPackage {
     };
   };
 };
-lua_cliargs = buildLuarocksPackage {
-  pname = "lua_cliargs";
-  version = "3.0-2";
-
-  src = fetchurl {
-    url    = https://luarocks.org/lua_cliargs-3.0-2.src.rock;
-    sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w";
-  };
-  disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua ];
-
-  meta = {
-    homepage = "https://github.com/amireh/lua_cliargs";
-    description = "A command-line argument parser.";
-    license = {
-      fullName = "MIT <http://opensource.org/licenses/MIT>";
-    };
-  };
-};
 lua-iconv = buildLuarocksPackage {
   pname = "lua-iconv";
   version = "7-3";
@@ -449,7 +585,7 @@ lua-iconv = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://ittner.github.com/lua-iconv/";
     description = "Lua binding to the iconv";
     license = {
@@ -478,7 +614,7 @@ lua-lsp = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua dkjson lpeglabel inspect ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/Alloyed/lua-lsp";
     description = "No summary";
     license = {
@@ -497,7 +633,7 @@ lua-messagepack = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://fperrad.frama.io/lua-MessagePack/";
     description = "a pure Lua implementation of the MessagePack serialization format";
     license = {
@@ -520,7 +656,7 @@ lua-term = buildLuarocksPackage {
   };
 
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/hoelzro/lua-term";
     description = "Terminal functions for Lua";
     license = {
@@ -539,7 +675,7 @@ lua-toml = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/jonstoler/lua-toml";
     description = "toml decoder/encoder for Lua";
     license = {
@@ -552,26 +688,46 @@ lua-zlib = buildLuarocksPackage {
   version = "1.2-0";
 
   src = fetchurl {
-    url    = https://luarocks.org/lua-zlib-1.2-0.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock;
     sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/brimworks/lua-zlib";
     description = "Simple streaming interface to zlib for Lua.";
+    maintainers = with maintainers; [ koral ];
     license = {
       fullName = "MIT";
     };
   };
 };
+lua_cliargs = buildLuarocksPackage {
+  pname = "lua_cliargs";
+  version = "3.0-2";
+
+  src = fetchurl {
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock;
+    sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/amireh/lua_cliargs";
+    description = "A command-line argument parser.";
+    license = {
+      fullName = "MIT <http://opensource.org/licenses/MIT>";
+    };
+  };
+};
 luabitop = buildLuarocksPackage {
   pname = "luabitop";
   version = "1.0.2-3";
 
   knownRockspec = (fetchurl {
-    url    = https://luarocks.org/luabitop-1.0.2-3.rockspec;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec;
     sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc";
   }).outPath;
 
@@ -587,7 +743,7 @@ luabitop = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://bitop.luajit.org/";
     description = "Lua Bit Operations Module";
     license = {
@@ -595,6 +751,101 @@ luabitop = buildLuarocksPackage {
     };
   };
 };
+luacheck = buildLuarocksPackage {
+  pname = "luacheck";
+  version = "0.23.0-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luacheck-0.23.0-1.src.rock;
+    sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua argparse luafilesystem ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mpeterv/luacheck";
+    description = "A static analyzer and a linter for Lua";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
+luadbi = buildLuarocksPackage {
+  pname = "luadbi";
+  version = "0.7.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luadbi-0.7.2-1.src.rock;
+    sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mwild1/luadbi";
+    description = "Database abstraction layer";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+luadbi-mysql = buildLuarocksPackage {
+  pname = "luadbi-mysql";
+  version = "0.7.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock;
+    sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua luadbi ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mwild1/luadbi";
+    description = "Database abstraction layer";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+luadbi-postgresql = buildLuarocksPackage {
+  pname = "luadbi-postgresql";
+  version = "0.7.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock;
+    sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua luadbi ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mwild1/luadbi";
+    description = "Database abstraction layer";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+luadbi-sqlite3 = buildLuarocksPackage {
+  pname = "luadbi-sqlite3";
+  version = "0.7.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock;
+    sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua luadbi ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mwild1/luadbi";
+    description = "Database abstraction layer";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 luaevent = buildLuarocksPackage {
   pname = "luaevent";
   version = "0.4.6-1";
@@ -606,7 +857,7 @@ luaevent = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/harningt/luaevent";
     description = "libevent binding for Lua";
     license = {
@@ -614,22 +865,23 @@ luaevent = buildLuarocksPackage {
     };
   };
 };
-luacheck = buildLuarocksPackage {
-  pname = "luacheck";
-  version = "0.23.0-1";
+luaexpat = buildLuarocksPackage {
+  pname = "luaexpat";
+  version = "1.3.3-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/luacheck-0.23.0-1.src.rock;
-    sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl";
+    url    = https://luarocks.org/luaexpat-1.3.3-1.src.rock;
+    sha256 = "0ahpfnby9qqgj22bajmrqvqq70nx19388lmjm9chljfzszy0hndm";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
-  propagatedBuildInputs = [ lua argparse luafilesystem ];
+  disabled = (luaOlder "5.0");
+  propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "https://github.com/mpeterv/luacheck";
-    description = "A static analyzer and a linter for Lua";
+  meta = with stdenv.lib; {
+    homepage = "http://www.keplerproject.org/luaexpat/";
+    description = "XML Expat parsing";
+    maintainers = with maintainers; [ flosse ];
     license = {
-      fullName = "MIT";
+      fullName = "MIT/X11";
     };
   };
 };
@@ -644,7 +896,7 @@ luaffi = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/facebook/luaffifb";
     description = "FFI library for calling C functions from lua";
     license = {
@@ -652,200 +904,218 @@ luaffi = buildLuarocksPackage {
     };
   };
 };
+luafilesystem = buildLuarocksPackage {
+  pname = "luafilesystem";
+  version = "1.7.0-2";
+
+  src = fetchurl {
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock;
+    sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "git://github.com/keplerproject/luafilesystem";
+    description = "File System Library for the Lua Programming Language";
+    maintainers = with maintainers; [ flosse vcunat ];
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+luaossl = buildLuarocksPackage {
+  pname = "luaossl";
+  version = "20190612-0";
+
+  src = fetchurl {
+    url    = https://luarocks.org/luaossl-20190612-0.src.rock;
+    sha256 = "0q47rsfjnx3rbbr9jl2j5nlj56c6mwmnnma9m4rrbsza2p98wb4s";
+  };
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://25thandclement.com/~william/projects/luaossl.html";
+    description = "Most comprehensive OpenSSL module in the Lua universe.";
+    maintainers = with maintainers; [ vcunat ];
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 luaposix = buildLuarocksPackage {
   pname = "luaposix";
   version = "34.0.4-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/luaposix-34.0.4-1.src.rock;
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock;
     sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2";
   };
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ bit32 lua std_normalize ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/luaposix/luaposix/";
     description = "Lua bindings for POSIX";
+    maintainers = with maintainers; [ vyp lblasc ];
     license = {
       fullName = "MIT/X11";
     };
   };
 };
-luazip = buildLuarocksPackage {
-  pname = "luazip";
-  version = "1.2.7-1";
+luasec = buildLuarocksPackage {
+  pname = "luasec";
+  version = "0.8-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/luazip-1.2.7-1.src.rock;
-    sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l";
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock;
+    sha256 = "063rgz0zdmaizirsm6jbcfijgkpdcrb8a2fvhvg3y2s8ixbaff13";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
-  propagatedBuildInputs = [ lua ];
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua luasocket ];
 
-  meta = {
-    homepage = "https://github.com/mpeterv/luazip";
-    description = "Library for reading files inside zip files";
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/brunoos/luasec/wiki";
+    description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
+    maintainers = with maintainers; [ flosse ];
     license = {
       fullName = "MIT";
     };
   };
 };
-luuid = buildLuarocksPackage {
-  pname = "luuid";
-  version = "20120509-2";
+luasocket = buildLuarocksPackage {
+  pname = "luasocket";
+  version = "3.0rc1-2";
 
   src = fetchurl {
-    url    = https://luarocks.org/luuid-20120509-2.src.rock;
-    sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg";
+    url    = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock;
+    sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq";
   };
-  disabled = (luaOlder "5.2") || (luaAtLeast "5.4");
+  disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
-    description = "A library for UUID generation";
+  meta = with stdenv.lib; {
+    homepage = "http://luaforge.net/projects/luasocket/";
+    description = "Network support for the Lua language";
     license = {
-      fullName = "Public domain";
+      fullName = "MIT";
     };
   };
 };
-markdown = buildLuarocksPackage {
-  pname = "markdown";
-  version = "0.33-1";
+luasql-sqlite3 = buildLuarocksPackage {
+  pname = "luasql-sqlite3";
+  version = "2.4.0-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/markdown-0.33-1.src.rock;
-    sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y";
+    url    = https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock;
+    sha256 = "0pdk8c9iw0625imf5wdrhq60484jn475b85rvp0xgh86bsyalbsh";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "https://github.com/mpeterv/markdown";
-    description = "Markdown text-to-html markup system.";
+  meta = with stdenv.lib; {
+    homepage = "http://www.keplerproject.org/luasql/";
+    description = "Database connectivity for Lua (SQLite3 driver)";
+    maintainers = with maintainers; [ vyp ];
     license = {
       fullName = "MIT/X11";
     };
   };
 };
-penlight = buildLuarocksPackage {
-  pname = "penlight";
-  version = "1.5.4-1";
+luassert = buildLuarocksPackage {
+  pname = "luassert";
+  version = "1.7.11-0";
 
   knownRockspec = (fetchurl {
-    url    = https://luarocks.org/penlight-1.5.4-1.rockspec;
-    sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p";
+    url    = https://luarocks.org/luassert-1.7.11-0.rockspec;
+    sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s";
   }).outPath;
 
   src = fetchurl {
-    url    = http://stevedonovan.github.io/files/penlight-1.5.4.zip;
-    sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q";
-  };
-
-  propagatedBuildInputs = [ luafilesystem ];
-
-  meta = {
-    homepage = "http://stevedonovan.github.com/Penlight";
-    description = "Lua utility libraries loosely based on the Python standard libraries";
-    license = {
-      fullName = "MIT/X11";
-    };
+    url    = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz;
+    sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka";
   };
-};
-rapidjson = buildLuarocksPackage {
-  pname = "rapidjson";
-  version = "0.5.1-1";
 
-  src = fetchurl {
-    url    = https://luarocks.org/rapidjson-0.5.1-1.src.rock;
-    sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay";
-  };
   disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua ];
+  propagatedBuildInputs = [ lua say ];
 
-  meta = {
-    homepage = "https://github.com/xpol/lua-rapidjson";
-    description = "Json module based on the very fast RapidJSON.";
+  meta = with stdenv.lib; {
+    homepage = "http://olivinelabs.com/busted/";
+    description = "Lua Assertions Extension";
     license = {
-      fullName = "MIT";
+      fullName = "MIT <http://opensource.org/licenses/MIT>";
     };
   };
 };
-say = buildLuarocksPackage {
-  pname = "say";
-  version = "1.3-1";
-
-  knownRockspec = (fetchurl {
-    url    = https://luarocks.org/say-1.3-1.rockspec;
-    sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv";
-  }).outPath;
+luasystem = buildLuarocksPackage {
+  pname = "luasystem";
+  version = "0.2.1-0";
 
   src = fetchurl {
-    url    = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz;
-    sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13";
+    url    = https://luarocks.org/luasystem-0.2.1-0.src.rock;
+    sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi";
   };
-
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://olivinelabs.com/busted/";
-    description = "Lua String Hashing/Indexing Library";
+  meta = with stdenv.lib; {
+    homepage = "http://olivinelabs.com/luasystem/";
+    description = "Platform independent system calls for Lua.";
     license = {
       fullName = "MIT <http://opensource.org/licenses/MIT>";
     };
   };
 };
-std__debug = buildLuarocksPackage {
-  pname = "std._debug";
-  version = "1.0.1-1";
+luazip = buildLuarocksPackage {
+  pname = "luazip";
+  version = "1.2.7-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/std._debug-1.0.1-1.src.rock;
-    sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz";
+    url    = https://luarocks.org/luazip-1.2.7-1.src.rock;
+    sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://lua-stdlib.github.io/_debug";
-    description = "Debug Hints Library";
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mpeterv/luazip";
+    description = "Library for reading files inside zip files";
     license = {
-      fullName = "MIT/X11";
+      fullName = "MIT";
     };
   };
 };
-std_normalize = buildLuarocksPackage {
-  pname = "std.normalize";
-  version = "2.0.2-1";
+luuid = buildLuarocksPackage {
+  pname = "luuid";
+  version = "20120509-2";
 
   src = fetchurl {
-    url    = https://luarocks.org/std.normalize-2.0.2-1.src.rock;
-    sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh";
+    url    = https://luarocks.org/luuid-20120509-2.src.rock;
+    sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
-  propagatedBuildInputs = [ lua std__debug ];
+  disabled = (luaOlder "5.2") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "https://lua-stdlib.github.io/normalize";
-    description = "Normalized Lua Functions";
+  meta = with stdenv.lib; {
+    homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
+    description = "A library for UUID generation";
     license = {
-      fullName = "MIT/X11";
+      fullName = "Public domain";
     };
   };
 };
 luv = buildLuarocksPackage {
   pname = "luv";
-  version = "1.29.1-1";
+  version = "1.29.1-2";
 
   src = fetchurl {
-    url    = https://luarocks.org/luv-1.29.1-1.src.rock;
-    sha256 = "0x801pp8h2035lbncsb6vkwgxqrai69ri3sp9g1dwnfnipsfsvrg";
+    url    = https://luarocks.org/luv-1.29.1-2.src.rock;
+    sha256 = "180g06lkhapb76nhlgsa8ik8z6mrlkvq9mpb8rx74lr101h1yqxg";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/luvit/luv";
     description = "Bare libuv bindings for lua";
     license = {
@@ -853,22 +1123,22 @@ luv = buildLuarocksPackage {
     };
   };
 };
-luasystem = buildLuarocksPackage {
-  pname = "luasystem";
-  version = "0.2.1-0";
+markdown = buildLuarocksPackage {
+  pname = "markdown";
+  version = "0.33-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/luasystem-0.2.1-0.src.rock;
-    sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi";
+    url    = https://luarocks.org/markdown-0.33-1.src.rock;
+    sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y";
   };
-  disabled = (luaOlder "5.1");
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://olivinelabs.com/luasystem/";
-    description = "Platform independent system calls for Lua.";
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mpeterv/markdown";
+    description = "Markdown text-to-html markup system.";
     license = {
-      fullName = "MIT <http://opensource.org/licenses/MIT>";
+      fullName = "MIT/X11";
     };
   };
 };
@@ -876,14 +1146,20 @@ mediator_lua = buildLuarocksPackage {
   pname = "mediator_lua";
   version = "1.1.2-0";
 
+  knownRockspec = (fetchurl {
+    url    = https://luarocks.org/mediator_lua-1.1.2-0.rockspec;
+    sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm";
+  }).outPath;
+
   src = fetchurl {
-    url    = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock;
-    sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if";
+    url    = https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz;
+    sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs";
   };
+
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://olivinelabs.com/mediator_lua/";
     description = "Event handling through channels";
     license = {
@@ -906,7 +1182,7 @@ mpack = buildLuarocksPackage {
   };
 
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz";
     description = "Lua binding to libmpack";
     license = {
@@ -925,7 +1201,7 @@ nvim-client = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua mpack luv coxpcall ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz";
     description = "Lua client to Nvim";
     license = {
@@ -933,62 +1209,127 @@ nvim-client = buildLuarocksPackage {
     };
   };
 };
-busted = buildLuarocksPackage {
-  pname = "busted";
-  version = "2.0.rc12-1";
+penlight = buildLuarocksPackage {
+  pname = "penlight";
+  version = "1.5.4-1";
+
+  knownRockspec = (fetchurl {
+    url    = https://luarocks.org/penlight-1.5.4-1.rockspec;
+    sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p";
+  }).outPath;
 
   src = fetchurl {
-    url    = http://luarocks.org/manifests/teto/busted-2.0.rc12-1.src.rock;
-    sha256 = "18fzdc7ww4nxwinnw9ah5hi329ghrf0h8xrwcy26lk9qcs9n079z";
+    url    = http://stevedonovan.github.io/files/penlight-1.5.4.zip;
+    sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q";
+  };
+
+  propagatedBuildInputs = [ luafilesystem ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://stevedonovan.github.com/Penlight";
+    description = "Lua utility libraries loosely based on the Python standard libraries";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+rapidjson = buildLuarocksPackage {
+  pname = "rapidjson";
+  version = "0.5.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/rapidjson-0.5.2-1.src.rock;
+    sha256 = "17lgbzv9kairx49kwa0m8xwyly95mg6fw60jan2dpqwnnkf2m8y6";
   };
   disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
+  propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://olivinelabs.com/busted/";
-    description = "Elegant Lua unit testing.";
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/xpol/lua-rapidjson";
+    description = "Json module based on the very fast RapidJSON.";
     license = {
-      fullName = "MIT <http://opensource.org/licenses/MIT>";
+      fullName = "MIT";
     };
   };
 };
-luassert = buildLuarocksPackage {
-  pname = "luassert";
-  version = "1.7.11-0";
+say = buildLuarocksPackage {
+  pname = "say";
+  version = "1.3-1";
 
   knownRockspec = (fetchurl {
-    url    = https://luarocks.org/luassert-1.7.11-0.rockspec;
-    sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s";
+    url    = https://luarocks.org/say-1.3-1.rockspec;
+    sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv";
   }).outPath;
 
   src = fetchurl {
-    url    = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz;
-    sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka";
+    url    = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz;
+    sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13";
   };
 
   disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua say ];
+  propagatedBuildInputs = [ lua ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://olivinelabs.com/busted/";
-    description = "Lua Assertions Extension";
+    description = "Lua String Hashing/Indexing Library";
     license = {
       fullName = "MIT <http://opensource.org/licenses/MIT>";
     };
   };
 };
-coxpcall = buildLuarocksPackage {
-  pname = "coxpcall";
-  version = "1.17.0-1";
+std__debug = buildLuarocksPackage {
+  pname = "std._debug";
+  version = "1.0.1-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock;
-    sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
+    url    = https://luarocks.org/std._debug-1.0.1-1.src.rock;
+    sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz";
   };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
+  propagatedBuildInputs = [ lua ];
 
-  meta = {
-    homepage = "http://keplerproject.github.io/coxpcall";
-    description = "Coroutine safe xpcall and pcall";
+  meta = with stdenv.lib; {
+    homepage = "http://lua-stdlib.github.io/_debug";
+    description = "Debug Hints Library";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+std_normalize = buildLuarocksPackage {
+  pname = "std.normalize";
+  version = "2.0.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/std.normalize-2.0.2-1.src.rock;
+    sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua std__debug ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://lua-stdlib.github.io/normalize";
+    description = "Normalized Lua Functions";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+stdlib = buildLuarocksPackage {
+  pname = "stdlib";
+  version = "41.2.2-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/stdlib-41.2.2-1.src.rock;
+    sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://lua-stdlib.github.io/lua-stdlib";
+    description = "General Lua Libraries";
+    maintainers = with maintainers; [ vyp ];
     license = {
       fullName = "MIT/X11";
     };
diff --git a/pkgs/development/lua-modules/luasql.patch b/pkgs/development/lua-modules/luasql.patch
deleted file mode 100644
index e91840101ee..00000000000
--- a/pkgs/development/lua-modules/luasql.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/config	2013-02-18 19:36:44.000000000 +0400
-+++ b/config	2014-10-01 08:36:37.104254404 +0400
-@@ -1,12 +1,12 @@
- # $Id: config,v 1.10 2008/05/30 17:21:18 tomas Exp $
- 
- # Driver (leave uncommented ONLY the line with the name of the driver)
--T= mysql
-+#T= mysql
- #T= oci8
- #T= odbc
- #T= postgres
- #T= sqlite
--#T=sqlite3
-+T=sqlite3
- #T=firebird
- 
- # Installation directories
-@@ -37,8 +37,8 @@
- ######## MySQL
- #DRIVER_LIBS= -L/usr/local/mysql/lib -lmysqlclient -lz
- #DRIVER_INCS= -I/usr/local/mysql/include
--DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
--DRIVER_INCS= -I/usr/include/mysql
-+#DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
-+#DRIVER_INCS= -I/usr/include/mysql
- ######## Oracle OCI8
- #DRIVER_LIBS= -L/home/oracle/OraHome1/lib -lz -lclntsh
- #DRIVER_INCS= -I/home/oracle/OraHome1/rdbms/demo -I/home/oracle/OraHome1/rdbms/public
-@@ -51,7 +51,7 @@
- #DRIVER_LIBS= -lsqlite
- #DRIVER_INCS=
- ######## SQLite3 
--#DRIVER_LIBS= -L/opt/local/lib -lsqlite3
-+DRIVER_LIBS= -lsqlite3
- #DRIVER_INCS= -I/opt/local/include
- ######## ODBC
- #DRIVER_LIBS= -L/usr/local/lib -lodbc
diff --git a/pkgs/development/lua-modules/luuid.patch b/pkgs/development/lua-modules/luuid.patch
new file mode 100644
index 00000000000..039d522be6d
--- /dev/null
+++ b/pkgs/development/lua-modules/luuid.patch
@@ -0,0 +1,16 @@
+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);
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 0f448343e96..9f03b84588e 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -5,113 +5,260 @@ with super;
   ##########################################3
   #### manual fixes for generated packages
   ##########################################3
-  lgi = super.lgi.overrideAttrs(oa: {
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection];
+  bit32 = super.bit32.override({
+    disabled = !isLua51;
+    # Theoretically works with luajit, but it does redefine at least one Lua
+    # 5.2 function that Luajit 2.1 provides, see:
+    # https://github.com/LuaJIT/LuaJIT/issues/325
+  });
+
+  busted = super.busted.override({
+    postConfigure = ''
+      substituteInPlace ''${rockspecFilename} \
+        --replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1',"
+    '';
+    postInstall = ''
+      install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted
+      install -D completions/bash/busted.bash $out/share/bash-completion/completions/busted
+    '';
+  });
+
+  cqueues = super.cqueues.override(rec {
+    # Parse out a version number without the Lua version inserted
+    version = with pkgs.lib; let
+      version' = super.cqueues.version;
+      rel = splitString "." version';
+      date = head rel;
+      rev = last (splitString "-" (last rel));
+    in "${date}-${rev}";
+    nativeBuildInputs = [
+      pkgs.gnum4
+    ];
+    externalDeps = [
+      { name = "CRYPTO"; dep = pkgs.openssl; }
+      { name = "OPENSSL"; dep = pkgs.openssl; }
+    ];
     patches = [
-        (pkgs.fetchpatch {
-            name = "lgi-find-cairo-through-typelib.patch";
-            url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch";
-            sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
-        })
+      # https://github.com/wahern/cqueues/issues/216 &
+      # https://github.com/wahern/cqueues/issues/217
+      (pkgs.fetchpatch {
+        name = "find-version-fix.patch";
+        url = "https://github.com/wahern/cqueues/pull/217.patch";
+        sha256 = "0068ql0jlxmjkvhzydyy52sjd0k4vad6b8w4y5szpbv4vb2lzcsc";
+      })
     ];
+    disabled = luaOlder "5.1" || luaAtLeast "5.4";
+    # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
+    # version, which doesn't work well for us, so modify it
+    postConfigure = let inherit (super.cqueues) pname; in ''
+      # 'all' target auto-detects correct Lua version, which is fine for us as
+      # we only have the right one available :)
+      sed -Ei ''${rockspecFilename} \
+        -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \
+        -e 's|build_target = "[^"]+"|build_target = "all"|' \
+        -e 's|version = "[^"]+"|version = "${version}"|'
+      specDir=$(dirname ''${rockspecFilename})
+      cp ''${rockspecFilename} "$specDir/${pname}-${version}.rockspec"
+      rockspecFilename="$specDir/${pname}-${version}.rockspec"
+    '';
   });
 
-  ltermbox = super.ltermbox.override( {
-    disabled = !isLua51 || isLuaJIT;
+  cyrussasl = super.cyrussasl.override({
+    externalDeps = [
+      { name = "LIBSASL"; dep = pkgs.cyrus_sasl; }
+    ];
   });
 
-  lua-cmsgpack = super.lua-cmsgpack.override({
-    # TODO this should work with luajit once we fix luajit headers ?
-    disabled = (!isLua51) || isLuaJIT;
+  http = super.http.override({
+    patches = [
+      (pkgs.fetchpatch {
+        name = "invalid-state-progression.patch";
+        url = "https://github.com/daurnimator/lua-http/commit/cb7b59474a.diff";
+        sha256 = "1vmx039n3nqfx50faqhs3wgiw28ws416rhw6vh6srmh9i826dac7";
+      })
+    ];
+    /* TODO: separate docs derivation? (pandoc is heavy)
+    nativeBuildInputs = [ pandoc ];
+    makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ];
+    */
   });
 
-  lrexlib-posix = super.lrexlib-posix.override({
-    buildInputs = [ pkgs.glibc.dev ];
+  lgi = super.lgi.override({
+    nativeBuildInputs = [
+      pkgs.pkgconfig
+    ];
+    buildInputs = [
+      pkgs.glib
+      pkgs.gobjectIntrospection
+    ];
+    patches = [
+      (pkgs.fetchpatch {
+        name = "lgi-find-cairo-through-typelib.patch";
+        url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch";
+        sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
+      })
+    ];
   });
+
   lrexlib-gnu = super.lrexlib-gnu.override({
-    buildInputs = [ pkgs.gnulib ];
+    buildInputs = [
+      pkgs.gnulib
+    ];
+  });
+
+  lrexlib-pcre = super.lrexlib-pcre.override({
+    externalDeps = [
+      { name = "PCRE"; dep = pkgs.pcre; }
+    ];
+  });
+
+  lrexlib-posix = super.lrexlib-posix.override({
+    buildInputs = [
+      pkgs.glibc.dev
+    ];
+  });
+
+  ltermbox = super.ltermbox.override( {
+    disabled = !isLua51 || isLuaJIT;
   });
+
+  lua-iconv = super.lua-iconv.override({
+    buildInputs = [
+      pkgs.libiconv
+    ];
+  });
+
   lua-zlib = super.lua-zlib.override({
-    buildInputs = [ pkgs.zlib.dev ];
-    disabled=luaOlder "5.1" || luaAtLeast "5.4";
+    buildInputs = [
+      pkgs.zlib.dev
+    ];
+    disabled = luaOlder "5.1" || luaAtLeast "5.4";
   });
-  luaevent = super.luaevent.override({
-    buildInputs = with pkgs; [ libevent.dev libevent ];
-    propagatedBuildInputs = [ luasocket ];
-    extraConfig = ''
-      variables={
-        EVENT_INCDIR="${pkgs.libevent.dev}/include";
-        EVENT_LIBDIR="${pkgs.libevent}/lib";
-      }
+
+  luadbi-mysql = super.luadbi-mysql.override({
+    extraVariables = ''
+      -- Can't just be /include, unfortunately
+      MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
     '';
-    disabled= luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
+    buildInputs = [
+      pkgs.mysql.client
+      pkgs.mysql.connector-c
+    ];
   });
-  lua-iconv = super.lua-iconv.override({
-    buildInputs = [ pkgs.libiconv ];
+
+  luadbi-postgresql = super.luadbi-postgresql.override({
+    buildInputs = [
+      pkgs.postgresql
+    ];
+  });
+
+  luadbi-sqlite3 = super.luadbi-sqlite3.override({
+    externalDeps = [
+      { name = "SQLITE"; dep = pkgs.sqlite; }
+    ];
   });
+
+  luaevent = super.luaevent.override({
+    propagatedBuildInputs = [
+      luasocket
+    ];
+    externalDeps = [
+      { name = "EVENT"; dep = pkgs.libevent; }
+    ];
+    disabled = luaOlder "5.1" || luaAtLeast "5.4";
+  });
+
+  luaexpat = super.luaexpat.override({
+    externalDeps = [
+      { name = "EXPAT"; dep = pkgs.expat; }
+    ];
+  });
+
+  # TODO Somehow automatically amend buildInputs for things that need luaffi
+  # but are in luajitPackages?
+  luaffi = super.luaffi.override({
+    # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3
+    src = pkgs.fetchFromGitHub {
+      owner = "facebook"; repo = "luaffifb";
+      rev = "532c757e51c86f546a85730b71c9fef15ffa633d";
+      sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig";
+    };
+    knownRockspec = with super.luaffi; "${pname}-${version}.rockspec";
+    disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
+  });
+
+  luaossl = super.luaossl.override({
+    externalDeps = [
+      { name = "CRYPTO"; dep = pkgs.openssl; }
+      { name = "OPENSSL"; dep = pkgs.openssl; }
+    ];
+  });
+
+  luasec = super.luasec.override({
+    externalDeps = [
+      { name = "OPENSSL"; dep = pkgs.openssl; }
+    ];
+  });
+
+  luasql-sqlite3 = super.luasql-sqlite3.override({
+    externalDeps = [
+      { name = "SQLITE"; dep = pkgs.sqlite; }
+    ];
+  });
+
+  luasystem = super.luasystem.override({
+    buildInputs = [
+      pkgs.glibc
+    ];
+  });
+
   luazip = super.luazip.override({
-    buildInputs = [ pkgs.zziplib ];
+    buildInputs = [
+      pkgs.zziplib
+    ];
   });
-  luv = super.luv.overrideAttrs(oa: {
+
+  luuid = super.luuid.override(old: {
+    externalDeps = [
+      { name = "LIBUUID"; dep = pkgs.libuuid; }
+    ];
+    meta = old.meta // {
+      platforms = pkgs.lib.platforms.linux;
+    };
+    # Trivial patch to make it work in both 5.1 and 5.2.  Basically just the
+    # tiny diff between the two upstream versions placed behind an #if.
+    # Upstreams:
+    # 5.1: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz
+    # 5.2: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz
+    patchFlags = "-p2";
+    patches = [
+      ./luuid.patch
+    ];
+    postConfigure = let inherit (super.luuid) version pname; in ''
+      sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
+    '';
+    disabled = luaOlder "5.1" || (luaAtLeast "5.4");
+  });
+
+  luv = super.luv.override({
     # Use system libuv instead of building local and statically linking
     # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which
-    # should be possible but I'm unable to make work.
+    # is not possible with luarocks and the current luv rockspec
     # While at it, remove bundled libuv source entirely to be sure.
     # We may wish to drop bundled lua submodules too...
     preBuild = ''
      sed -i 's,\(option(WITH_SHARED_LIBUV.*\)OFF,\1ON,' CMakeLists.txt
      rm -rf deps/libuv
     '';
-    propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ];
-  });
-
-  busted = super.busted.overrideAttrs(oa: {
-    postInstall = ''
-      install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted
-    '';
-  });
-
-  luuid = super.luuid.override(oa: {
-    buildInputs = [ pkgs.libuuid ];
-    extraConfig = ''
-      variables = {
-        LIBUUID_INCDIR="${pkgs.lib.getDev pkgs.libuuid}/include";
-        LIBUUID_LIBDIR="${pkgs.lib.getLib pkgs.libuuid}/lib";
-      }
-    '';
-    meta = oa.meta // {
-      platforms = pkgs.lib.platforms.linux;
-    };
+    propagatedBuildInputs = [
+      pkgs.libuv
+    ];
   });
 
-  rapidjson = super.rapidjson.overrideAttrs(oa: {
+  rapidjson = super.rapidjson.override({
     preBuild = ''
       sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
       sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
     '';
   });
-
-  binaryheap = super.binaryheap.overrideAttrs(oa: {
-    meta = oa.meta // {
-      maintainers = with pkgs.lib.maintainers; oa.meta.maintainers ++ [ vcunat ];
-    };
-  });
-
-  http = super.http.overrideAttrs(oa: {
-    patches = oa.patches or [] ++ [
-      (pkgs.fetchpatch {
-        name = "invalid-state-progression.patch";
-        url = "https://github.com/daurnimator/lua-http/commit/cb7b59474a.diff";
-        sha256 = "1vmx039n3nqfx50faqhs3wgiw28ws416rhw6vh6srmh9i826dac7";
-      })
-    ];
-    /* TODO: separate docs derivation? (pandoc is heavy)
-    nativeBuildInputs = [ pandoc ];
-    makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ];
-    */
-    meta = oa.meta // {
-      maintainers = with pkgs.lib.maintainers; oa.meta.maintainers ++ [ vcunat ];
-    };
-  });
 }