luarocks-nix: bump to 2019-09-07
added version and transferred the repostiory to nix-community. With this bump, luarocks-nix generates mirro://luarocks urls.
This commit is contained in:
parent
4d526d6fc6
commit
4a3189085a
|
@ -1,3 +1,4 @@
|
||||||
rocks_servers = {
|
rocks_servers = {
|
||||||
"https://luarocks.org"
|
"https://luarocks.org"
|
||||||
}
|
}
|
||||||
|
version_check_on_fail = false
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
{ luarocks, fetchFromGitHub }:
|
{ luarocks, fetchFromGitHub }:
|
||||||
luarocks.overrideAttrs(old: {
|
luarocks.overrideAttrs(old: {
|
||||||
pname = "luarocks-nix";
|
pname = "luarocks-nix";
|
||||||
|
version = "2019-09-07";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "teto";
|
owner = "nix-community";
|
||||||
repo = "luarocks";
|
repo = "luarocks";
|
||||||
rev = "38ed82ba3e5682d7d55ef9a870dfb464ca180df9";
|
rev = "fa7c367bcdad36768db5f19fd4fcdd9681a14429";
|
||||||
sha256 = "0vlzywiv3sxkpjg1fzzxicmfr6kh04fxw5q9n8vsd2075xjxg6bs";
|
sha256 = "0kziwfw5gqq5xsckl7qf9wasaiy8rp42h5qrcnjx07qp47a9ldx7";
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
./darwin-3.0.x.patch
|
./darwin-3.1.3.patch
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue