pyrox.dev
Merge pull request #141718 from avrma-forks/luarocksbump
luarocks: 3.2.1 -> 3.7.0
authored by
Michael Raskin
and committed by
GitHub
10977a60
329f38c5
-24
pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
-24
pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
···
1
-
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
2
-
index c5af5a2..1949fdc 100644
3
-
--- a/src/luarocks/core/cfg.lua
4
-
+++ b/src/luarocks/core/cfg.lua
5
-
@@ -425,7 +425,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
6
-
defaults.external_lib_extension = "dylib"
7
-
defaults.arch = "macosx-"..target_cpu
8
-
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
9
-
- local version = util.popen_read("sw_vers -productVersion")
10
-
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@"
11
-
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
12
-
if version >= 10 then
13
-
version = 8
14
-
@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
15
-
else
16
-
defaults.gcc_rpath = false
17
-
end
18
-
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
19
-
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
20
-
+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
21
-
+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
22
-
defaults.web_browser = "open"
23
-
end
24
-
+24
pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch
+24
pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch
···
1
+
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
2
+
index 535bd69..b017161 100644
3
+
--- a/src/luarocks/core/cfg.lua
4
+
+++ b/src/luarocks/core/cfg.lua
5
+
@@ -436,7 +436,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
6
+
defaults.external_lib_extension = "dylib"
7
+
defaults.arch = "macosx-"..target_cpu
8
+
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
9
+
- local version = util.popen_read("sw_vers -productVersion")
10
+
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@"
11
+
if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then
12
+
version = "10.3"
13
+
end
14
+
@@ -448,8 +448,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
15
+
else
16
+
defaults.gcc_rpath = false
17
+
end
18
+
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
19
+
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
20
+
+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang"
21
+
+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang"
22
+
defaults.web_browser = "open"
23
+
end
24
+
+3
-3
pkgs/development/tools/misc/luarocks/default.nix
+3
-3
pkgs/development/tools/misc/luarocks/default.nix
···
10
10
11
11
stdenv.mkDerivation rec {
12
12
pname = "luarocks";
13
-
version = "3.2.1";
13
+
version = "3.7.0";
14
14
15
15
src = fetchFromGitHub {
16
16
owner = "luarocks";
17
17
repo = "luarocks";
18
18
rev = "v${version}";
19
-
sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
19
+
sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d";
20
20
};
21
21
22
-
patches = [ ./darwin-3.1.3.patch ];
22
+
patches = [ ./darwin-3.7.0.patch ];
23
23
24
24
postPatch = lib.optionalString stdenv.targetPlatform.isDarwin ''
25
25
substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}'