Loading pkgs/development/tools/misc/luarocks/3.7.nix 0 → 100644 +82 −0 Original line number Diff line number Diff line {lib, stdenv, fetchFromGitHub , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' , zip # some packages need to be compiled with cmake , cmake , installShellFiles }: stdenv.mkDerivation rec { pname = "luarocks"; version = "3.7.0"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; }; patches = [ ./darwin-3.7.0.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' ''; preConfigure = '' lua -e "" || { luajit -e "" && { export LUA_SUFFIX=jit configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" } } lua_inc="$(echo "${lua}/include"/*/)" if test -n "$lua_inc"; then configureFlags="$configureFlags --with-lua-include=$lua_inc" fi ''; nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ lua curl which ]; postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; propagatedBuildInputs = [ zip unzip cmake ]; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; # cmake is just to compile packages with "cmake" buildType, not luarocks itself dontUseCmakeConfigure = true; shellHook = '' export PATH="src/bin:''${PATH:-}" export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; meta = with lib; { description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; updateWalker = true; }; } pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index c5af5a2..1949fdc 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -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" - local version = util.popen_read("sw_vers -productVersion") + local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 @@ -434,8 +434,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 pkgs/development/tools/misc/luarocks/default.nix +3 −3 Original line number Diff line number Diff line Loading @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "luarocks"; version = "3.7.0"; version = "3.2.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; }; patches = [ ./darwin-3.7.0.patch ]; patches = [ ./darwin-3.1.3.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' Loading pkgs/top-level/lua-packages.nix +4 −0 Original line number Diff line number Diff line Loading @@ -67,6 +67,10 @@ in inherit lua lib; }; luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { inherit lua lib; }; # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; Loading Loading
pkgs/development/tools/misc/luarocks/3.7.nix 0 → 100644 +82 −0 Original line number Diff line number Diff line {lib, stdenv, fetchFromGitHub , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' , zip # some packages need to be compiled with cmake , cmake , installShellFiles }: stdenv.mkDerivation rec { pname = "luarocks"; version = "3.7.0"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; }; patches = [ ./darwin-3.7.0.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' ''; preConfigure = '' lua -e "" || { luajit -e "" && { export LUA_SUFFIX=jit configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" } } lua_inc="$(echo "${lua}/include"/*/)" if test -n "$lua_inc"; then configureFlags="$configureFlags --with-lua-include=$lua_inc" fi ''; nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ lua curl which ]; postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; propagatedBuildInputs = [ zip unzip cmake ]; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; # cmake is just to compile packages with "cmake" buildType, not luarocks itself dontUseCmakeConfigure = true; shellHook = '' export PATH="src/bin:''${PATH:-}" export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; meta = with lib; { description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; updateWalker = true; }; }
pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index c5af5a2..1949fdc 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -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" - local version = util.popen_read("sw_vers -productVersion") + local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 @@ -434,8 +434,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
pkgs/development/tools/misc/luarocks/default.nix +3 −3 Original line number Diff line number Diff line Loading @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "luarocks"; version = "3.7.0"; version = "3.2.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; }; patches = [ ./darwin-3.7.0.patch ]; patches = [ ./darwin-3.1.3.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' Loading
pkgs/top-level/lua-packages.nix +4 −0 Original line number Diff line number Diff line Loading @@ -67,6 +67,10 @@ in inherit lua lib; }; luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { inherit lua lib; }; # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; Loading