1 files changed, 17 insertions, 17 deletions
diff --git a/nixpkgs/maintainers/scripts/update-luarocks-packages b/nixpkgs/maintainers/scripts/update-luarocks-packages
index e7ab61b1a9c7..e2f2cc6bbd2e 100755
--- a/nixpkgs/maintainers/scripts/update-luarocks-packages
+++ b/nixpkgs/maintainers/scripts/update-luarocks-packages
@@ -12,11 +12,6 @@
 # stop the script upon C-C
 set -eu -o pipefail
 
-if [ $# -lt 1 ]; then
-	print_help
-    exit 1
-fi
-
 CSV_FILE="maintainers/scripts/luarocks-packages.csv"
 TMP_FILE="$(mktemp)"
 
@@ -25,16 +20,21 @@ exit_trap()
   local lc="$BASH_COMMAND" rc=$?
   test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2
 }
-trap exit_trap EXIT
 
 print_help() {
     echo "Usage: $0 <GENERATED_FILE>"
     echo "(most likely pkgs/development/lua-modules/generated-packages.nix)"
-	echo ""
-	echo " -c <CSV_FILE> to set the list of luarocks package to generate"
-	exit 1
+    echo ""
+    echo " -c <CSV_FILE> to set the list of luarocks package to generate"
+    exit 1
 }
 
+if [ $# -lt 1 ]; then
+    print_help
+    exit 1
+fi
+
+trap exit_trap EXIT
 
 while getopts ":hc:" opt; do
   case $opt in
@@ -76,15 +76,16 @@ FOOTER="
 function convert_pkg () {
     nix_pkg_name="$1"
     lua_pkg_name="$2"
-    server="${3:+--server=$3}"
-    version="${4:-}"
+    server="${3:+--only-server=$3}"
+    pkg_version="${4:-}"
+    lua_version="${5:+--lua-dir=$(nix path-info nixpkgs.$5)/bin}"
 
-    echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2
-    cmd="luarocks nix $server $lua_pkg_name $version"
+    echo "looking at $lua_pkg_name (version $pkg_version) from server [$server]" >&2
+    cmd="luarocks nix $server $lua_version $lua_pkg_name $pkg_version"
+    echo "Running $cmd" >&2
     drv="$nix_pkg_name = $($cmd)"
     if [ $? -ne 0 ]; then
         echo "Failed to convert $pkg" >&2
-        echo "$drv" >&2
     else
         echo "$drv" | tee -a "$TMP_FILE"
     fi
@@ -94,8 +95,7 @@ function convert_pkg () {
 echo "$HEADER" | tee "$TMP_FILE"
 
 # list of packages with format
-# name,server,version
-while IFS=, read -r nix_pkg_name lua_pkg_name server version
+while IFS=, read -r nix_pkg_name lua_pkg_name server pkg_version luaversion
 do
     if [ "${nix_pkg_name:0:1}" == "#" ]; then
         echo "Skipping comment ${nix_pkg_name}" >&2
@@ -105,7 +105,7 @@ do
         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"
+    convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$pkg_version" "$luaversion"
 done < "$CSV_FILE"
 
 # close the set