From fb6f9ee28ff6c57f4ab697a1db782e89a744f547 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 2 Jun 2022 00:00:14 +0200 Subject: [PATCH] update-luarocks-package: fix mirrors --- maintainers/scripts/luarocks-config.lua | 6 +++++- maintainers/scripts/update-luarocks-packages | 4 +--- pkgs/build-support/fetchurl/mirrors.nix | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/luarocks-config.lua b/maintainers/scripts/luarocks-config.lua index 89e74c00ea8e..f7ac9f9e4ba6 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 048068a32e12..631bc897c352 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 d69468958276..3a765089bd2e 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