diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-03-07 10:52:56 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-04-02 19:06:36 +0200 |
| commit | 4fff94f4b398cec154896d0e4b90dcb950444aca (patch) | |
| tree | 8c4a3ffd2e8892ebe113be16ce93b617db9d9361 /maintainers | |
| parent | 689b4269c32062c6bbd2496d7d556556d81d4075 (diff) | |
Merge #57010: Luarocks update
(cherry picked from commit bd616c0cd3201bf53bf465a2b04b0275d6ea86a9) This fixes the build of luarocks-nix. I checked that torchPackages.torch was broken even before this batch of luarocks changes.
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 15 | ||||
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 26 |
2 files changed, 24 insertions, 17 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index f5998f010d853..035a0d891ccaf 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,3 +1,4 @@ +# nix name, luarocks name, server, version/additionnal args ansicolors, argparse, basexx, @@ -17,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 aa922c19860f1..e74841dfd589e 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -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 |