Merge pull request #68258 from teto/luarocks-nix_bump

Moved luarocks-nix to community and leverage luarocks mirrors when possible.

Changed files
+17 -31
maintainers
pkgs
build-support
fetchurl
development
tools
+4
maintainers/scripts/luarocks-config.lua
···
+
rocks_servers = {
+
"https://luarocks.org"
+
}
+
version_check_on_fail = false
+1
maintainers/scripts/update-luarocks-packages
···
TMP_FILE="$(mktemp)"
# Set in the update-luarocks-shell.nix
NIXPKGS_PATH="$LUAROCKS_NIXPKGS_PATH"
+
export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
# 10 is a pretty arbitrary number of simultaneous jobs, but it is generally
# impolite to hit a webserver with *too* many simultaneous connections :)
+7
pkgs/build-support/fetchurl/mirrors.nix
···
# Mirrors for mirror://site/filename URIs, where "site" is
# "sourceforge", "gnu", etc.
+
luarocks = [
+
https://luarocks.org
+
https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/
+
http://luafr.org/moonrocks
+
http://luarocks.logiceditor.com/rocks
+
];
+
# SourceForge.
sourceforge = [
https://downloads.sourceforge.net/
-27
pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
···
-
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
-
index f93e67a..2eb2db9 100644
-
--- a/src/luarocks/core/cfg.lua
-
+++ b/src/luarocks/core/cfg.lua
-
@@ -425,9 +425,9 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
-
defaults.external_lib_extension = "dylib"
-
defaults.arch = "macosx-"..target_cpu
-
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
-
- defaults.variables.STAT = "/usr/bin/stat"
-
+ defaults.variables.STAT = "stat"
-
defaults.variables.STATFLAG = "-f '%A'"
-
- local version = util.popen_read("sw_vers -productVersion")
-
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
-
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
-
if version >= 10 then
-
version = 8
-
@@ -436,8 +436,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
-
else
-
defaults.gcc_rpath = false
-
end
-
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
-
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
-
+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
-
+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
-
defaults.web_browser = "open"
-
end
-
+5 -4
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
···
{ luarocks, fetchFromGitHub }:
luarocks.overrideAttrs(old: {
pname = "luarocks-nix";
+
version = "2019-09-07";
src = fetchFromGitHub {
-
owner = "teto";
+
owner = "nix-community";
repo = "luarocks";
-
rev = "38ed82ba3e5682d7d55ef9a870dfb464ca180df9";
-
sha256 = "0vlzywiv3sxkpjg1fzzxicmfr6kh04fxw5q9n8vsd2075xjxg6bs";
+
rev = "fa7c367bcdad36768db5f19fd4fcdd9681a14429";
+
sha256 = "0kziwfw5gqq5xsckl7qf9wasaiy8rp42h5qrcnjx07qp47a9ldx7";
};
patches = [
-
./darwin-3.0.x.patch
+
./darwin-3.1.3.patch
];
})