diff options
author | Sergey Mironov <grrwlf@gmail.com> | 2016-03-21 12:51:20 +0300 |
---|---|---|
committer | Sergey Mironov <grrwlf@gmail.com> | 2016-03-21 12:53:34 +0300 |
commit | 4a36a0c5047e64e7e5227e1b77cc87b177e47f75 (patch) | |
tree | 9e411f932e67e4048a3846ed97b43caf5f6020f1 /pkgs | |
parent | a56b9ab5bebf9534404cd46f6b61f82e17164a0b (diff) | |
download | nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar.gz nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar.bz2 nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar.lz nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar.xz nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.tar.zst nixlib-4a36a0c5047e64e7e5227e1b77cc87b177e47f75.zip |
torch: unhardcode references to luajit
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/machine-learning/torch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/machine-learning/torch/torch-distro.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/pkgs/applications/science/machine-learning/torch/default.nix index 0444e6645025..bdeeaad189a7 100644 --- a/pkgs/applications/science/machine-learning/torch/default.nix +++ b/pkgs/applications/science/machine-learning/torch/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchgit } : +{ callPackage, fetchgit, lua } : let src = fetchgit { url = "https://github.com/grwlf/torch-distro"; @@ -7,4 +7,4 @@ let }; in - callPackage (import ./torch-distro.nix) { inherit src; } + callPackage (import ./torch-distro.nix) { inherit lua src; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 1de2b51a19d9..617ba53e516a 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,6 +1,6 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, luajit, src + gnuplot, fetchurl, lua, src } : let @@ -21,7 +21,7 @@ let luapkgs = rec { luarocks = default_luarocks.override { - lua = luajit; + inherit lua; }; buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? [] @@ -36,7 +36,7 @@ let runtimeDeps_ = runtimeDeps ++ (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++ - [ luajit coreutils ]; + [ lua coreutils ]; mkcfg = '' export LUAROCKS_CONFIG=config.lua @@ -49,7 +49,7 @@ let variables = { LUA_BINDIR = "$out/bin"; LUA_INCDIR = "$out/include"; - LUA_LIBDIR = "$out/lib/lua/${luajit.luaversion}"; + LUA_LIBDIR = "$out/lib/lua/${lua.luaversion}"; }; EOF ''; @@ -63,7 +63,7 @@ let phases = [ "unpackPhase" "patchPhase" "buildPhase"]; - buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper luajit ]; + buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper lua ]; buildPhase = '' eval "$preBuild" @@ -76,9 +76,9 @@ let --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \ --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \ --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 ';' "\"$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 eval "$postInstall" @@ -100,7 +100,7 @@ let makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua" ''; - buildInputs = [luajit]; + buildInputs = [lua]; installPhase = '' make install-extra $makeFlags @@ -260,7 +260,7 @@ let runtimeDeps = [ ncurses readline ]; src = "${distro_src}/exe/trepl"; 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 = '' - 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 = { # FIXME: set the exact revision for src broken = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d5a683c3db..f540404b5051 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5159,6 +5159,7 @@ let lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luaPackages = lua52Packages; @@ -13427,7 +13428,9 @@ let 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 { wrapPython = pythonPackages.wrapPython; |