luaPackages: update

6 files changed, 462 insertions, 466 deletions

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 48a9d0e3d3a9..8a590e1185c5 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -1,89 +1,88 @@
-name,server,version,luaversion,maintainers
-alt-getopt,,,,arobyn
-ansicolors,,,,
-bit32,,5.3.0-1,lua5_1,lblasc
-argparse,,,,
-basexx,,,,
-binaryheap,,,,vcunat
-busted,,,,
-cassowary,,,,marsam alerque
-compat53,,0.7-1,,vcunat
-cosmo,,,,marsam
-coxpcall,,1.17.0-1,,
-cqueues,,,,vcunat
-cyrussasl,,,,
-digestif,,0.2-1,lua5_3,
-dkjson,,,,
-fifo,,,,
-gitsigns.nvim,,,lua5_1,
-http,,0.3-0,,vcunat
-inspect,,,,
-ldbus,http://luarocks.org/dev,,,
-ldoc,,,,
-lgi,,,,
-linenoise,,,,
-ljsyscall,,,lua5_1,lblasc
-lpeg,,,,vyp
-lpeg_patterns,,,,
-lpeglabel,,,,
-lpty,,,,
-lrexlib-gnu,,,,
-lrexlib-pcre,,,,vyp
-lrexlib-posix,,,,
-ltermbox,,,,
-lua-cjson,,,,
-lua-cmsgpack,,,,
-lua-iconv,,,,
-lua-lsp,http://luarocks.org/dev,,,
-lua-messagepack,,,,
-lua-resty-http,,,,
-lua-resty-jwt,,,,
-lua-resty-openidc,,,,
-lua-resty-openssl,,,,
-lua-resty-session,,,,
-lua-term,,,,
-lua-toml,,,,
-lua-zlib,,,,koral
-lua_cliargs,,,,
-luabitop,,,,
-luacheck,,,,
-luacov,,,,
-luadbi,,,,
-luadbi-mysql,,,,
-luadbi-postgresql,,,,
-luadbi-sqlite3,,,,
-luadoc,,,,
-luaepnf,,,,
-luaevent,,,,
-luaexpat,,1.3.0-1,,arobyn flosse
-luaffi,http://luarocks.org/dev,,,
-luafilesystem,,1.7.0-2,,flosse
-lualogging,,,,
-luaossl,,,lua5_1,
-luaposix,,34.1.1-1,,vyp lblasc
-luarepl,,,,
-luasec,,,,flosse
-luasocket,,,,
-luasql-sqlite3,,,,vyp
-luassert,,,,
-luasystem,,,,
-luautf8,,,,pstn
-luazip,,,,
-lua-yajl,,,,pstn
-luuid,,,,
-luv,,1.30.0-0,,
-lyaml,,,,lblasc
-markdown,,,,
-mediator_lua,,,,
-mpack,,,,
-moonscript,,,,arobyn
-nvim-client,,,,
-penlight,,,,
-plenary.nvim,,,lua5_1,
-rapidjson,,,,
-readline,,,,
-say,,,,
-std._debug,,,,
-std.normalize,,,,
-stdlib,,,,vyp
-vstruct,,,,
+name,src,ref,server,version,luaversion,maintainers
+alt-getopt,,,,,,arobyn
+ansicolors,https://github.com/kikito/ansicolors.lua,,,,,
+bit32,,,,5.3.0-1,lua5_1,lblasc
+argparse,https://github.com/luarocks/argparse.git,,,,,
+basexx,https://github.com/teto/basexx.git,,,,,
+binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat
+busted,,,,,,
+cassowary,,,,,,marsam alerque
+compat53,,,,0.7-1,,vcunat
+cosmo,,,,,,marsam
+coxpcall,,,,1.17.0-1,,
+cqueues,,,,,,vcunat
+cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
+digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3,
+dkjson,,,,,,
+fifo,,,,,,
+gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1,
+http,,,,0.3-0,,vcunat
+inspect,,,,,,
+ldbus,,,http://luarocks.org/dev,,,
+ldoc,https://github.com/stevedonovan/LDoc.git,,,,,
+linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,,
+ljsyscall,,,,,lua5_1,lblasc
+lpeg,,,,,,vyp
+lpeg_patterns,,,,,,
+lpeglabel,,,,,,
+lpty,,,,,,
+lrexlib-gnu,,,,,,
+lrexlib-pcre,,,,,,vyp
+lrexlib-posix,,,,,,
+ltermbox,,,,,,
+lua-cjson,,,,,,
+lua-cmsgpack,,,,,,
+lua-iconv,,,,,,
+lua-lsp,,,,,,
+lua-messagepack,,,,,,
+lua-resty-http,,,,,,
+lua-resty-jwt,,,,,,
+lua-resty-openidc,,,,,,
+lua-resty-openssl,,,,,,
+lua-resty-session,,,,,,
+lua-term,,,,,,
+lua-toml,,,,,,
+lua-zlib,,,,,,koral
+lua_cliargs,https://github.com/amireh/lua_cliargs.git,,,,,
+luabitop,https://github.com/teto/luabitop.git,,,,,
+luacheck,,,,,,
+luacov,,,,,,
+luadbi,,,,,,
+luadbi-mysql,,,,,,
+luadbi-postgresql,,,,,,
+luadbi-sqlite3,,,,,,
+luadoc,,,,,,
+luaepnf,,,,,,
+luaevent,,,,,,
+luaexpat,,,,1.3.0-1,,arobyn flosse
+luaffi,,,http://luarocks.org/dev,,,
+luafilesystem,,,,1.7.0-2,,flosse
+lualogging,,,,,,
+luaossl,,,,,lua5_1,
+luaposix,,,,34.1.1-1,,vyp lblasc
+luarepl,,,,,,
+luasec,,,,,,flosse
+luasocket,,,,,,
+luasql-sqlite3,,,,,,vyp
+luassert,,,,,,
+luasystem,,,,,,
+luautf8,,,,,,pstn
+luazip,,,,,,
+lua-yajl,,,,,,pstn
+luuid,,,,,,
+luv,,,,1.30.0-0,,
+lyaml,,,,,,lblasc
+markdown,,,,,,
+mediator_lua,,,,,,
+mpack,,,,,,
+moonscript,,,,,,arobyn
+nvim-client,https://github.com/neovim/lua-client.git,,,,,
+penlight,https://github.com/Tieske/Penlight.git,,,,,
+plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
+rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
+readline,,,,,,
+say,https://github.com/Olivine-Labs/say.git,,,,,
+std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
+std.normalize,git://github.com/lua-stdlib/normalize.git,,,,,
+stdlib,https://github.com/lua-stdlib/lua-stdlib.git,,,,,vyp
+vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index e0bdfec53bf9..55076f889e99 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -1,7 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell update-luarocks-shell.nix -i python3
 
-
 # format:
 # $ nix run nixpkgs.python3Packages.black -c black update.py
 # type-check:
@@ -20,7 +19,7 @@ import logging
 import textwrap
 from multiprocessing.dummy import Pool
 
-from typing import List, Tuple
+from typing import List, Tuple, Optional
 from pathlib import Path
 
 log = logging.getLogger()
@@ -51,10 +50,21 @@ FOOTER="""
 @dataclass
 class LuaPlugin:
     name: str
-    version: str
+    '''Name of the plugin, as seen on luarocks.org'''
+    src: str
+    '''address to the git repository'''
+    ref: str
+    '''git reference (branch name/tag)'''
+    version: Optional[str]
+    '''Set it to pin a package '''
     server: str
-    luaversion: str
-    maintainers: str
+    '''luarocks.org registers packages under different manifests.
+    Its value can be 'http://luarocks.org/dev'
+    '''
+    luaversion: Optional[str]
+    '''Attribue of the lua interpreter if a package is available only for a specific lua version'''
+    maintainers: Optional[str]
+    ''' Optional string listing maintainers separated by spaces'''
 
     @property
     def normalized_name(self) -> str:
@@ -150,16 +160,33 @@ def generate_pkg_nix(plug: LuaPlugin):
     Our cache key associates "p.name-p.version" to its rockspec
     '''
     log.debug("Generating nix expression for %s", plug.name)
-    cmd = [ "luarocks", "nix", plug.name]
+    cmd = [ "luarocks", "nix"]
 
-    if plug.server:
-        cmd.append(f"--only-server={plug.server}")
 
     if plug.maintainers:
         cmd.append(f"--maintainers={plug.maintainers}")
 
-    if plug.version:
-        cmd.append(plug.version)
+    # updates plugin directly from its repository
+    print("server: [%s]" % plug.server)
+    # if plug.server == "src":
+    if plug.src != "":
+        if plug.src is None:
+            msg = "src must be set when 'version' is set to \"src\" for package %s" % plug.name
+            log.error(msg)
+            raise RuntimeError(msg)
+        log.debug("Updating from source %s", plug.src)
+        cmd.append(plug.src)
+    # update the plugin from luarocks
+    else:
+        cmd.append(plug.name)
+        if plug.version and plug.version != "src":
+
+            cmd.append(plug.version)
+
+    #
+    if plug.server != "src" and plug.server:
+        cmd.append(f"--only-server={plug.server}")
+
 
     if plug.luaversion:
         with CleanEnvironment():
@@ -170,7 +197,7 @@ def generate_pkg_nix(plug: LuaPlugin):
             lua_drv_path=subprocess.check_output(cmd2, text=True).strip()
             cmd.append(f"--lua-dir={lua_drv_path}/bin")
 
-    log.debug("running %s", cmd)
+    log.debug("running %s", ' '.join(cmd))
     output = subprocess.check_output(cmd, text=True)
     return (plug, output)
 
@@ -192,3 +219,4 @@ if __name__ == "__main__":
 
     main()
 
+#  vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 :
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 02c92cc51170..8c9204c0b288 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -74,7 +74,7 @@ version
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
 
 let
-  generatedRockspecFilename = "${pname}-${version}.rockspec";
+  generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec";
 
 
   # TODO fix warnings "Couldn't load rockspec for ..." during manifest
@@ -169,16 +169,17 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
   inherit rocksSubdir;
 
   # enabled only for src.rock
-  setSourceRoot= let
-    # name_only= lib.getName name;
-    name_only= pname;
-  in
-    lib.optionalString (knownRockspec == null) ''
-    # format is rockspec_basename/source_basename
-    # rockspec can set it via spec.source.dir
-    folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1)
-    sourceRoot="$folder"
-  '';
+  # setSourceRoot= let
+  #   # name_only= lib.getName name;
+  #   name_only= pname;
+  # in
+  #   # if this is a rockFile
+  #   lib.optionalString (knownRockspec == null  ) ''
+  #   # format is rockspec_basename/source_basename
+  #   # rockspec can set it via spec.source.dir
+  #   folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1)
+  #   sourceRoot="$folder"
+  # '';
 
   configurePhase = ''
     runHook preConfigure
@@ -187,6 +188,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
     ${luarocks_content}
     EOF
     export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
+    echo "pwd: $PWD"
 
   ''
   + lib.optionalString (rockspecFilename == null) ''
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 775d31cffb49..a29f037d8da2 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -21,10 +21,10 @@ alt-getopt = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cheusov/lua-alt-getopt";
     description = "Process application arguments the same way as getopt_long";
-    maintainers = with maintainers; [ arobyn ];
+    maintainers = with lib.maintainers; [ arobyn ];
     license.fullName = "MIT/X11";
   };
 };
@@ -34,13 +34,14 @@ ansicolors = buildLuarocksPackage {
   version = "1.0.2-3";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ansicolors-1.0.2-3.src.rock";
-    sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz";
+    url    = "https://github.com/kikito/ansicolors.lua/archive/v1.0.2.tar.gz";
+    sha256 = "0r4xi57njldmar9pn77l0vr5701rpmilrm51spv45lz0q9js8xps";
   };
+
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kikito/ansicolors.lua";
     description = "Library for color Manipulation.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -49,16 +50,24 @@ ansicolors = buildLuarocksPackage {
 
 argparse = buildLuarocksPackage {
   pname = "argparse";
-  version = "0.7.1-1";
+  version = "scm-2";
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/luarocks/argparse.git",
+  "rev": "27967d7b52295ea7885671af734332038c132837",
+  "date": "2020-07-08T11:17:50+10:00",
+  "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse",
+  "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1",
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path"]) ;
 
-  src = fetchurl {
-    url    = "https://luarocks.org/argparse-0.7.1-1.src.rock";
-    sha256 = "0ybqh5jcb9v8f5xpq05av4hzrbk3vfvqrjj9cgmhm8l66mjd0c7a";
-  };
   disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/luarocks/argparse";
     description = "A feature-rich command-line argument parser";
     license.fullName = "MIT";
@@ -67,23 +76,18 @@ argparse = buildLuarocksPackage {
 
 basexx = buildLuarocksPackage {
   pname = "basexx";
-  version = "0.4.1-1";
-
-  # knownRockspec = (fetchurl {
-  #   url    = "https://luarocks.org/basexx-0.4.1-1.rockspec";
-  #   sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f";
-  # }).outPath;
+  version = "scm-0";
   rockspecDir = "dist";
 
   src = fetchurl {
-    url    = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz";
-    sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz";
+    url    = "https://github.com/aiq/basexx/archive/master.tar.gz";
+    sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1";
   };
 
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/aiq/basexx";
     description = "A base2, base16, base32, base64 and base85 library for Lua";
     license.fullName = "MIT";
@@ -95,16 +99,17 @@ binaryheap = buildLuarocksPackage {
   version = "0.4-1";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/binaryheap-0.4-1.src.rock";
-    sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc";
+    url    = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz";
+    sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h";
   };
+
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Tieske/binaryheap.lua";
     description = "Binary heap implementation in pure Lua";
-    maintainers = with maintainers; [ vcunat ];
+    maintainers = with lib.maintainers; [ vcunat ];
     license.fullName = "MIT/X11";
   };
 };
@@ -113,8 +118,6 @@ bit32 = buildLuarocksPackage {
   pname = "bit32";
   version = "5.3.0-1";
 
-  NIX_DEBUG=3;
-
   src = fetchurl {
     url    = "https://luarocks.org/bit32-5.3.0-1.src.rock";
     sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy";
@@ -122,10 +125,10 @@ bit32 = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
     description = "Lua 5.2 bit manipulation library";
-    maintainers = with maintainers; [ lblasc ];
+    maintainers = with lib.maintainers; [ lblasc ];
     license.fullName = "MIT/X11";
   };
 };
@@ -134,11 +137,6 @@ busted = buildLuarocksPackage {
   pname = "busted";
   version = "2.0.0-1";
 
-  knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/busted-2.0.0-1.rockspec";
-    sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw";
-  }).outPath;
-
   src = fetchurl {
     url    = "https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz";
     sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx";
@@ -147,7 +145,7 @@ busted = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://olivinelabs.com/busted/";
     description = "Elegant Lua unit testing.";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -165,10 +163,10 @@ cassowary = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua penlight ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sile-typesetter/cassowary.lua";
     description = "The cassowary constraint solver";
-    maintainers = with maintainers; [ marsam alerque ];
+    maintainers = with lib.maintainers; [ marsam alerque ];
     license.fullName = "Apache 2";
   };
 };
@@ -178,16 +176,16 @@ compat53 = buildLuarocksPackage {
   version = "0.7-1";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/compat53-0.7-1.src.rock";
+    url    = "https://luarocks.org/compat53-0.7-1.src.rock";
     sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb";
   };
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     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 ];
+    maintainers = with lib.maintainers; [ vcunat ];
     license.fullName = "MIT";
   };
 };
@@ -202,10 +200,10 @@ cosmo = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lpeg ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://cosmo.luaforge.net";
     description = "Safe templates for Lua";
-    maintainers = with maintainers; [ marsam ];
+    maintainers = with lib.maintainers; [ marsam ];
     license.fullName = "MIT/X11";
   };
 };
@@ -215,11 +213,11 @@ coxpcall = buildLuarocksPackage {
   version = "1.17.0-1";
 
   src = fetchurl {
-    url    = "https://luarocks.org/coxpcall-1.17.0-1.src.rock";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/coxpcall-1.17.0-1.src.rock";
     sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "http://keplerproject.github.io/coxpcall";
     description = "Coroutine safe xpcall and pcall";
     license.fullName = "MIT/X11";
@@ -237,10 +235,10 @@ cqueues = buildLuarocksPackage {
   disabled = (lua.luaversion != "5.2");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     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 ];
+    maintainers = with lib.maintainers; [ vcunat ];
     license.fullName = "MIT/X11";
   };
 };
@@ -249,13 +247,8 @@ 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",
+  "url": "https://github.com/JorjBauer/lua-cyrussasl",
   "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d",
   "date": "2015-08-21T18:24:54-04:00",
   "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl",
@@ -269,7 +262,7 @@ cyrussasl = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://github.com/JorjBauer/lua-cyrussasl";
     description = "Cyrus SASL library for Lua 5.1+";
     license.fullName = "BSD";
@@ -278,16 +271,24 @@ cyrussasl = buildLuarocksPackage {
 
 digestif = buildLuarocksPackage {
   pname = "digestif";
-  version = "0.2-1";
+  version = "dev-1";
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/astoff/digestif",
+  "rev": "3a9076f76d8121526adcdbb9303d04dd3c721a34",
+  "date": "2021-06-24T16:18:41+02:00",
+  "path": "/nix/store/alzrvcxdmdfqqmm0diaxfljyr3jz1zk3-digestif",
+  "sha256": "110vsqyyp2pvn6nk492a9r56iyzymy0w1f2hvx26pv5x01mxm20x",
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path"]) ;
 
-  src = fetchurl {
-    url    = "https://luarocks.org/digestif-0.2-1.src.rock";
-    sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd";
-  };
   disabled = (luaOlder "5.3");
-  propagatedBuildInputs = [ lua lpeg dkjson ];
+  propagatedBuildInputs = [ lua lpeg ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/astoff/digestif/";
     description = "A code analyzer for TeX";
     license.fullName = "MIT";
@@ -296,16 +297,16 @@ digestif = buildLuarocksPackage {
 
 dkjson = buildLuarocksPackage {
   pname = "dkjson";
-  version = "2.5-2";
+  version = "2.5-3";
 
   src = fetchurl {
-    url    = "https://luarocks.org/dkjson-2.5-2.src.rock";
-    sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483";
+    url    = "https://luarocks.org/dkjson-2.5-3.src.rock";
+    sha256 = "0v5sihm85r0f458n1wvfjlmz59hjqlg5ndpp6dhd68fvrjikaw80";
   };
-  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://dkolf.de/src/dkjson-lua.fsl/";
     description = "David Kolf's JSON module for Lua";
     license.fullName = "MIT/X11";
@@ -322,7 +323,7 @@ fifo = buildLuarocksPackage {
   };
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/daurnimator/fifo.lua";
     description = "A lua library/'class' that implements a FIFO";
     license.fullName = "MIT/X11";
@@ -333,17 +334,12 @@ gitsigns-nvim = buildLuarocksPackage {
   pname = "gitsigns.nvim";
   version = "scm-1";
 
-  knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/gitsigns.nvim-scm-1.rockspec";
-    sha256 = "12cl4dpx18jrdjfzfk8mckqgb52fh9ayikqny5rfn2s4mbn9i5lj";
-  }).outPath;
-
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
-  "url": "git://github.com/lewis6991/gitsigns.nvim",
-  "rev": "083dc2f485571546144e287c38a96368ea2e79a1",
-  "date": "2021-08-09T21:58:59+01:00",
-  "path": "/nix/store/1kwvlcshbbk31i4pa3s9gx8znsh9nwk2-gitsigns.nvim",
-  "sha256": "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w",
+  "url": "https://github.com/lewis6991/gitsigns.nvim",
+  "rev": "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3",
+  "date": "2021-08-29T23:08:52+01:00",
+  "path": "/nix/store/4685c871dzh0kqf3fs5iqmaysag4m9nx-gitsigns.nvim",
+  "sha256": "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p",
   "fetchSubmodules": true,
   "deepClone": false,
   "leaveDotGit": false
@@ -353,7 +349,7 @@ gitsigns-nvim = buildLuarocksPackage {
   disabled = (lua.luaversion != "5.1");
   propagatedBuildInputs = [ lua plenary-nvim ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://github.com/lewis6991/gitsigns.nvim";
     description = "Git signs written in pure lua";
     license.fullName = "MIT/X11";
@@ -365,16 +361,16 @@ http = buildLuarocksPackage {
   version = "0.3-0";
 
   src = fetchurl {
-    url    = "https://luarocks.org/http-0.3-0.src.rock";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/http-0.3-0.src.rock";
     sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/daurnimator/lua-http";
     description = "HTTP library for Lua";
-    maintainers = with maintainers; [ vcunat ];
+    maintainers = with lib.maintainers; [ vcunat ];
     license.fullName = "MIT";
   };
 };
@@ -384,13 +380,13 @@ inspect = buildLuarocksPackage {
   version = "3.1.1-0";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.src.rock";
+    url    = "https://luarocks.org/inspect-3.1.1-0.src.rock";
     sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kikito/inspect.lua";
     description = "Lua table visualizer, ideal for debugging";
     license.fullName = "MIT <http://opensource.org/licenses/MIT>";
@@ -401,13 +397,8 @@ ldbus = buildLuarocksPackage {
   pname = "ldbus";
   version = "scm-0";
 
-  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/ldbus-scm-0.rockspec";
-    sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx";
-  }).outPath;
-
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
-  "url": "git://github.com/daurnimator/ldbus.git",
+  "url": "https://github.com/daurnimator/ldbus.git",
   "rev": "9e176fe851006037a643610e6d8f3a8e597d4073",
   "date": "2019-08-16T14:26:05+10:00",
   "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus",
@@ -421,7 +412,7 @@ ldbus = buildLuarocksPackage {
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/daurnimator/ldbus";
     description = "A Lua library to access dbus.";
     license.fullName = "MIT/X11";
@@ -430,54 +421,33 @@ ldbus = buildLuarocksPackage {
 
 ldoc = buildLuarocksPackage {
   pname = "ldoc";
-  version = "1.4.6-2";
+  version = "scm-3";
 
-  knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/ldoc-1.4.6-2.rockspec";
-    sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm";
-  }).outPath;
-
-  src = fetchurl {
-    url    = "http://stevedonovan.github.io/files/ldoc-1.4.6.zip";
-    sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la";
-  };
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "https://github.com/stevedonovan/LDoc.git",
+  "rev": "bbd498ab39fa49318b36378430d3cdab571f8ba0",
+  "date": "2021-06-24T13:07:51+02:00",
+  "path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc",
+  "sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw",
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path"]) ;
 
   propagatedBuildInputs = [ penlight markdown ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://stevedonovan.github.com/ldoc";
     description = "A Lua Documentation Tool";
     license.fullName = "MIT/X11";
   };
 };
 
-lgi = buildLuarocksPackage {
-  pname = "lgi";
-  version = "0.9.2-1";
-
-  src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.src.rock";
-    sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa";
-  };
-  disabled = (luaOlder "5.1");
-  propagatedBuildInputs = [ lua ];
-
-  meta = with lib; {
-    homepage = "http://github.com/pavouk/lgi";
-    description = "Lua bindings to GObject libraries";
-    license.fullName = "MIT/X11";
-  };
-};
-
 linenoise = buildLuarocksPackage {
   pname = "linenoise";
   version = "0.9-1";
 
-  knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/linenoise-0.9-1.rockspec";
-    sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4";
-  }).outPath;
-
   src = fetchurl {
     url    = "https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz";
     sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c";
@@ -486,7 +456,7 @@ linenoise = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/hoelzro/lua-linenoise";
     description = "A binding for the linenoise command line library";
     license.fullName = "MIT/X11";
@@ -504,10 +474,10 @@ ljsyscall = buildLuarocksPackage {
   disabled = (lua.luaversion != "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.myriabit.com/ljsyscall/";
     description = "LuaJIT Linux syscall FFI";
-    maintainers = with maintainers; [ lblasc ];
+    maintainers = with lib.maintainers; [ lblasc ];
     license.fullName = "MIT";
   };
 };
@@ -517,16 +487,16 @@ lpeg = buildLuarocksPackage {
   version = "1.0.2-1";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.src.rock";
+    url    = "https://luarocks.org/lpeg-1.0.2-1.src.rock";
     sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html";
     description = "Parsing Expression Grammars For Lua";
-    maintainers = with maintainers; [ vyp ];
+    maintainers = with lib.maintainers; [ vyp ];
     license.fullName = "MIT/X11";
   };
 };
@@ -536,12 +506,12 @@ lpeg_patterns = buildLuarocksPackage {
   version = "0.5-0";
 
   src = fetchurl {
-    url    = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg_patterns-0.5-0.src.rock";
     sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f";
   };
   propagatedBuildInputs = [ lua lpeg ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
     description = "a collection of LPEG patterns";
     license.fullName = "MIT";
@@ -559,7 +529,7 @@ lpeglabel = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sqmedeiros/lpeglabel/";
     description = "Parsing Expression Grammars For Lua with Labeled Failures";
     license.fullName = "MIT/X11";
@@ -571,13 +541,13 @@ lpty = buildLuarocksPackage {
   version = "1.2.2-1";
 
   src = fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock";
+    url    = "https://luarocks.org/lpty-1.2.2-1.src.rock";
     sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.tset.de/lpty/";
     description = "A simple facility for lua to control other programs via PTYs.";
     license.fullName = "MIT";
@@ -595,7 +565,7 @@ lrexlib-gnu = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (GNU flavour).";
     license.fullName = "MIT/X11";
@@ -607,16 +577,16 @@ lrexlib-pcre = buildLuarocksPackage {
   version = "2.9.1-1";
 
   src = fetchurl {
-    url    = "https://luarocks.org/lrexlib-pcre-2.9.1-1.src.rock";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.1-1.src.rock";
     sha256 = "0rsar13nax5r8f96pqjr0hf3civ1f1ijg4k7y69y5gi4wqd376lz";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (PCRE flavour).";
-    maintainers = with maintainers; [ vyp ];
+    maintainers = with lib.maintainers; [ vyp ];
     license.fullName = "MIT/X11";
   };
 };
@@ -632,7 +602,7 @@ lrexlib-posix = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (POSIX flavour).";
     license.fullName = "MIT/X11";
@@ -650,7 +620,7 @@ ltermbox = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://code.google.com/p/termbox";
     description = "A termbox library package";
     license.fullName = "New BSD License";
@@ -668,7 +638,7 @@ lua-cjson = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
     description = "A fast JSON encoding/parsing module";
     license.fullName = "MIT";
@@ -679,13 +649,8 @@ lua-cmsgpack = buildLuarocksPackage {
   pname = "lua-cmsgpack";
   version = "0.4.0-0";
 
-  knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec";
-    sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin";
-  }).outPath;
-
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
-  "url": "git://github.com/antirez/lua-cmsgpack.git",
+  "url": "https://github.com/antirez/lua-cmsgpack.git",
   "rev": "57b1f90cf6cec46450e87289ed5a676165d31071",
   "date": "2018-06-14T11:56:56+02:00",
   "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack",
@@ -699,7 +664,7 @@ lua-cmsgpack = buildLuarocksPackage {
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];