about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-09-07 21:00:35 +0900
committerMatthieu Coudron <mattator@gmail.com>2019-09-08 01:14:16 +0900
commit4a3189085a161dfc0a589bd8ae5cd0cc655843d0 (patch)
treebf9f6cf39ae263b2ef08df2d56dda10616edda8a /pkgs
parent4d526d6fc63c0316c135435c7f4d6074c9bce09a (diff)
downloadnixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar.gz
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar.bz2
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar.lz
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar.xz
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.tar.zst
nixlib-4a3189085a161dfc0a589bd8ae5cd0cc655843d0.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch27
-rw-r--r--pkgs/development/tools/misc/luarocks/luarocks-nix.nix9
2 files changed, 5 insertions, 31 deletions
diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
deleted file mode 100644
index 013ac5180afa..000000000000
--- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
+++ /dev/null
@@ -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
- 
diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 8da224f0ef8c..21611f05579b 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -1,13 +1,14 @@
 { 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
   ];
 })