summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2022-06-02 00:00:14 +0200
committerMatthieu Coudron <mcoudron@hotmail.com>2022-06-13 11:17:36 +0200
commitfb6f9ee28ff6c57f4ab697a1db782e89a744f547 (patch)
tree1c03a20566b5dcc091e01c70718d16bce95d57e8
parent77a0e5f36e758ec62354919bd4dcc28b9eeebe3c (diff)
downloadnixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar.gz
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar.bz2
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar.lz
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar.xz
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.tar.zst
nixpkgs-fb6f9ee28ff6c57f4ab697a1db782e89a744f547.zip
update-luarocks-package: fix mirrors
-rw-r--r--maintainers/scripts/luarocks-config.lua6
-rwxr-xr-xmaintainers/scripts/update-luarocks-packages4
-rw-r--r--pkgs/build-support/fetchurl/mirrors.nix1
3 files changed, 6 insertions, 5 deletions
diff --git a/maintainers/scripts/luarocks-config.lua b/maintainers/scripts/luarocks-config.lua
index 89e74c00ea8..f7ac9f9e4ba 100644
--- a/maintainers/scripts/luarocks-config.lua
+++ b/maintainers/scripts/luarocks-config.lua
@@ -1,4 +1,8 @@
+
+-- default of luarocks listed at src/luarocks/core/cfg.lua
+-- keep this list synced with pkgs/build-support/fetchurl/mirrors.nix
 rocks_servers = {
-	"https://luarocks.org"
+	"https://luarocks.org",
+	"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
 }
 version_check_on_fail = false
diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index 048068a32e1..631bc897c35 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -31,7 +31,7 @@ from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
 PKG_LIST="maintainers/scripts/luarocks-packages.csv"
 TMP_FILE="$(mktemp)"
 GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"
-LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
+LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua"
 
 HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
 Regenerate it with:
@@ -167,8 +167,6 @@ def generate_pkg_nix(plug: LuaPlugin):
     if plug.maintainers:
         cmd.append(f"--maintainers={plug.maintainers}")
 
-    # updates plugin directly from its repository
-    print("server: [%s]" % plug.server)
     # if plug.server == "src":
     if plug.src != "":
         if plug.src is None:
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index d6946895827..3a765089bd2 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -323,7 +323,6 @@
     "https://luarocks.org/"
     "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
     "https://luafr.org/moonrocks/"
-    "http://luarocks.logiceditor.com/rocks/"
   ];
 
   # Python PyPI