diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 19 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 16 | ||||
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 28 |
3 files changed, 44 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c93ec6139f3b..752e2ae67b30 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1628,6 +1628,10 @@ email = "fpletz@fnordicwalking.de"; github = "fpletz"; name = "Franz Pletz"; + keys = [{ + longkeyid = "rsa4096/0x846FDED7792617B4"; + fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; + }]; }; fps = { email = "mista.tapas@gmx.net"; @@ -2294,6 +2298,11 @@ joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; + keys = [{ + # compare with https://keybase.io/joko + longkeyid = "rsa2048/0x85EAE7D9DF56C5CA"; + fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; + }]; name = "Ioannis Koutras"; }; jonafato = { @@ -2449,6 +2458,11 @@ github = "kisonecat"; name = "Jim Fowler"; }; + kjuvi = { + email = "quentin.vaucher@pm.me"; + github = "kjuvi"; + name = "Quentin Vaucher"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -5282,4 +5296,9 @@ github = "shmish111"; name = "David Smith"; }; + minijackson = { + email = "minijackson@riseup.net"; + github = "minijackson"; + name = "Rémi Nicole"; + }; } diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0f3db834fc29..035a0d891cca 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,7 +1,7 @@ +# nix name, luarocks name, server, version/additionnal args ansicolors, argparse, basexx, -cqueues dkjson fifo inspect @@ -18,15 +18,15 @@ lua-term, luabitop, luaevent, luacheck -luaffi,http://luarocks.org/dev, +luaffi,,http://luarocks.org/dev, luuid, penlight, say, luv, luasystem, -mediator_lua,http://luarocks.org/manifests/teto -mpack,http://luarocks.org/manifests/teto -nvim-client,http://luarocks.org/manifests/teto -busted,http://luarocks.org/manifests/teto -luassert,http://luarocks.org/manifests/teto -coxpcall,https://luarocks.org/manifests/hisham,1.17.0-1 +mediator_lua,,http://luarocks.org/manifests/teto +mpack,,http://luarocks.org/manifests/teto +nvim-client,,http://luarocks.org/manifests/teto +busted,,http://luarocks.org/manifests/teto +luassert,,http://luarocks.org/manifests/teto +coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1 diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index aa922c19860f..4b94343233e4 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -61,7 +61,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE} These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { @@ -74,17 +74,18 @@ FOOTER=" function convert_pkg () { - pkg="$1" + nix_pkg_name="$1" + lua_pkg_name="$2" server="" - if [ ! -z "$2" ]; then - server=" --server=$2" + if [ ! -z "$3" ]; then + server=" --server=$3" fi version="${3:-}" - echo "looking at $pkg (version $version) from server [$server]" >&2 - cmd="luarocks nix $server $pkg $version" - drv="$($cmd)" + echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2 + cmd="luarocks nix $server $lua_pkg_name $version" + drv="$nix_pkg_name = $($cmd)" if [ $? -ne 0 ]; then echo "Failed to convert $pkg" >&2 echo "$drv" >&2 @@ -98,12 +99,17 @@ echo "$HEADER" | tee "$TMP_FILE" # list of packages with format # name,server,version -while IFS=, read -r pkg_name server version +while IFS=, read -r nix_pkg_name lua_pkg_name server version do - if [ -z "$pkg_name" ]; then - echo "Skipping empty package name" >&2 + if [ "${nix_pkg_name:0:1}" == "#" ]; then + echo "Skipping comment ${nix_pkg_name}" >&2 + continue fi - convert_pkg "$pkg_name" "$server" "$version" + if [ -z "$lua_pkg_name" ]; then + echo "Using nix_name as lua_pkg_name" >&2 + lua_pkg_name="$nix_pkg_name" + fi + convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" done < "$CSV_FILE" # close the set |