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

torch: unhardcode references to luajit

Browse Source
This commit is contained in:
Sergey Mironov 2016-03-21 12:51:20 +03:00
parent a56b9ab5be
commit 4a36a0c504
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/machine-learning/torch/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchgit } : { callPackage, fetchgit, lua } :
let let
src = fetchgit { src = fetchgit {
url = "https://github.com/grwlf/torch-distro"; url = "https://github.com/grwlf/torch-distro";
@ -7,4 +7,4 @@ let
}; };
in in
callPackage (import ./torch-distro.nix) { inherit src; } callPackage (import ./torch-distro.nix) { inherit lua src; }

22
pkgs/applications/science/machine-learning/torch/torch-distro.nix
View File

@ -1,6 +1,6 @@
{ luarocks, lib , stdenv, writeText , readline, makeWrapper, { luarocks, lib , stdenv, writeText , readline, makeWrapper,
less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl,
gnuplot, fetchurl, luajit, src gnuplot, fetchurl, lua, src
} : } :
let let
@ -21,7 +21,7 @@ let
luapkgs = rec { luapkgs = rec {
luarocks = default_luarocks.override { luarocks = default_luarocks.override {
lua = luajit; inherit lua;
}; };
buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? [] buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? []
@ -36,7 +36,7 @@ let
runtimeDeps_ = runtimeDeps_ =
runtimeDeps ++ runtimeDeps ++
(lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++ (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++
[ luajit coreutils ]; [ lua coreutils ];
mkcfg = '' mkcfg = ''
export LUAROCKS_CONFIG=config.lua export LUAROCKS_CONFIG=config.lua
@ -49,7 +49,7 @@ let
variables = { variables = {
LUA_BINDIR = "$out/bin"; LUA_BINDIR = "$out/bin";
LUA_INCDIR = "$out/include"; LUA_INCDIR = "$out/include";
LUA_LIBDIR = "$out/lib/lua/${luajit.luaversion}"; LUA_LIBDIR = "$out/lib/lua/${lua.luaversion}";
}; };
EOF EOF
''; '';
@ -63,7 +63,7 @@ let
phases = [ "unpackPhase" "patchPhase" "buildPhase"]; phases = [ "unpackPhase" "patchPhase" "buildPhase"];
buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper luajit ]; buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper lua ];
buildPhase = '' buildPhase = ''
eval "$preBuild" eval "$preBuild"
@ -76,9 +76,9 @@ let
--set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \ --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \
--set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \ --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \
--suffix LUA_PATH ';' "\"$LUA_PATH\"" \ --suffix LUA_PATH ';' "\"$LUA_PATH\"" \
--suffix LUA_PATH ';' "\"$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua\"" \ --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \
--suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \ --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \
--suffix LUA_CPATH ';' "\"$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so\"" --suffix LUA_CPATH ';' "\"$out/lib/lua/${lua.luaversion}/?.so;$out/lib/lua/${lua.luaversion}/?/init.so\""
done done
eval "$postInstall" eval "$postInstall"
@ -100,7 +100,7 @@ let
makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua" makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua"
''; '';
buildInputs = [luajit]; buildInputs = [lua];
installPhase = '' installPhase = ''
make install-extra $makeFlags make install-extra $makeFlags
@ -260,7 +260,7 @@ let
runtimeDeps = [ ncurses readline ]; runtimeDeps = [ ncurses readline ];
src = "${distro_src}/exe/trepl"; src = "${distro_src}/exe/trepl";
meta = common_meta // { meta = common_meta // {
description = "A pure Lua REPL for LuaJIT, with heavy support for Torch types."; description = "A pure Lua REPL for Lua(JIT), with heavy support for Torch types.";
}; };
}; };
@ -281,10 +281,10 @@ let
}; };
preConfigure = '' preConfigure = ''
cmakeFlags="-DLUA_LIBRARY=${luajit}/lib/lua/${luajit.luaversion} -DINSTALL_CMOD=$out/lib/lua/${luajit.luaversion} -DINSTALL_MOD=$out/lib/lua/${luajit.luaversion}" cmakeFlags="-DLUA_LIBRARY=${lua}/lib/lua/${lua.luaversion} -DINSTALL_CMOD=$out/lib/lua/${lua.luaversion} -DINSTALL_MOD=$out/lib/lua/${lua.luaversion}"
''; '';
buildInputs = [cmake libuuid luajit]; buildInputs = [cmake libuuid lua];
meta = { meta = {
# FIXME: set the exact revision for src # FIXME: set the exact revision for src
broken = true; broken = true;

5
pkgs/top-level/all-packages.nix
View File

@ -5159,6 +5159,7 @@ let
lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; });
lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; });
luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; });
luaPackages = lua52Packages; luaPackages = lua52Packages;
@ -13427,7 +13428,9 @@ let
quazip = qt5.quazip.override { qt = qt4; }; quazip = qt5.quazip.override { qt = qt4; };
}; };
torch-packages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { } ); torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {
lua = luajit ;
} );
torchat = callPackage ../applications/networking/instant-messengers/torchat { torchat = callPackage ../applications/networking/instant-messengers/torchat {
wrapPython = pythonPackages.wrapPython; wrapPython = pythonPackages.wrapPython;