public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luarocks: 3.0.4 -> 3.1.3

Browse Source 
The newer version silences some superfluous warnings we were previously
getting in Nix builds using luarocks.
This commit is contained in:
Alexei Robyn 2019-06-13 20:52:34 +10:00
parent 2792dc8a0a
commit f8efece8e7
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/misc/luarocks/darwin.patch → pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
View File

@ -1,20 +1,17 @@
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua 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 --- a/src/luarocks/core/cfg.lua
+++ b/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.external_lib_extension = "dylib"
defaults.arch = "macosx-"..target_cpu defaults.arch = "macosx-"..target_cpu
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" 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 = util.popen_read("sw_vers -productVersion")
+ local version = "10.10" + local version = "10.10"
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
if version >= 10 then if version >= 10 then
version = 8 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 else
defaults.gcc_rpath = false defaults.gcc_rpath = false
end end

6
pkgs/development/tools/misc/luarocks/default.nix
View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "luarocks"; pname = "luarocks";
version = "3.0.4"; version = "3.1.3";
src = fetchurl { src = fetchurl {
url="http://luarocks.org/releases/luarocks-${version}.tar.gz"; url="http://luarocks.org/releases/luarocks-${version}.tar.gz";
sha256="1pqfzwvjy8dzqg4fqjq2cgqcr00fgrdd7nwzxm7nqmawr83s6dhj"; sha256="04q5k6drypsnbp1wspr9ns72k8kjf62a787a6jg1bb2s95gl6wy5";
}; };
patches = [ ./darwin.patch ]; patches = [ ./darwin-3.1.3.patch ];
preConfigure = '' preConfigure = ''
lua -e "" || { lua -e "" || {
luajit -e "" && { luajit -e "" && {