diff options
| author | Alexei Robyn <shados@shados.net> | 2019-06-13 20:52:34 +1000 |
|---|---|---|
| committer | Alexei Robyn <shados@shados.net> | 2019-06-13 20:52:34 +1000 |
| commit | f8efece8e75aa5a901f9005c6aded96e41e50110 (patch) | |
| tree | b134dce9c53e67465e860e3f8184707bb112fde8 /pkgs/development/tools/misc/luarocks | |
| parent | 2792dc8a0a052d431b43d645d89c2a6580cc473d (diff) | |
| download | nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar.gz nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar.bz2 nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar.lz nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar.xz nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.tar.zst nixlib-f8efece8e75aa5a901f9005c6aded96e41e50110.zip | |
luarocks: 3.0.4 -> 3.1.3
The newer version silences some superfluous warnings we were previously getting in Nix builds using luarocks.
Diffstat (limited to 'pkgs/development/tools/misc/luarocks')
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch (renamed from pkgs/development/tools/misc/luarocks/darwin.patch) | 9 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/default.nix | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/luarocks/darwin.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index a5e4ac461b48..7ef1c7a319ca 100644 --- a/pkgs/development/tools/misc/luarocks/darwin.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -1,20 +1,17 @@ diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua -index f93e67a..2eb2db9 100644 +index c5af5a2..1949fdc 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) +@@ -425,7 +425,7 @@ 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 = "10.10" 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) +@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) else defaults.gcc_rpath = false end diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 7edcb79388ab..2e0eec5ae57d 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.0.4"; + version = "3.1.3"; src = fetchurl { url="http://luarocks.org/releases/luarocks-${version}.tar.gz"; - sha256="1pqfzwvjy8dzqg4fqjq2cgqcr00fgrdd7nwzxm7nqmawr83s6dhj"; + sha256="04q5k6drypsnbp1wspr9ns72k8kjf62a787a6jg1bb2s95gl6wy5"; }; - patches = [ ./darwin.patch ]; + patches = [ ./darwin-3.1.3.patch ]; preConfigure = '' lua -e "" || { luajit -e "" && { |