diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/pkgs/applications/science/machine-learning/torch/default.nix deleted file mode 100644 index bdeeaad189a7..000000000000 --- a/pkgs/applications/science/machine-learning/torch/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchgit, lua } : -let - src = fetchgit { - url = "https://github.com/grwlf/torch-distro"; - rev = "f972c4253b14b95b53aefe7b24efa496223e73f2"; - sha256 = "1lhjhivhyypaic33vj1nsghshsajf7vi6gwsclaf3nqdl27d1h1s"; - }; - -in - 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 deleted file mode 100644 index 73272df99221..000000000000 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ /dev/null @@ -1,336 +0,0 @@ -{ luarocks, lib , stdenv, readline, makeWrapper, - less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, lua, src, libjpeg, libpng -} : - -let - - common_meta = { - homepage = http://torch.ch; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ smironov ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - }; - - distro_src = src; - - default_luarocks = luarocks; - - pkgs_gnuplot = gnuplot; - - luapkgs = rec { - - luarocks = default_luarocks.override { - inherit lua; - }; - - buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? [] - , preBuild ? "" , postInstall ? "" - , runtimeDeps ? [] , ... }@args : - let - - luadeps_ = - luadeps ++ - (lib.concatMap (d : if d ? luadeps then d.luadeps else []) luadeps); - - runtimeDeps_ = - runtimeDeps ++ - (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++ - [ lua coreutils ]; - - mkcfg = '' - export LUAROCKS_CONFIG=config.lua - cat >config.lua <= 1.0"' ' ' - export LUA_PATH="$src/?.lua;$LUA_PATH" - ''; - meta = common_meta // { - description = "Torch is a machine-learning library"; - longDescription = '' - Torch is the main package in [Torch7](http://torch.ch) where data - structures for multi-dimensional tensors and mathematical operations - over these are defined. Additionally, it provides many utilities for - accessing files, serializing objects of arbitrary types and other - useful utilities. - ''; - }; - }; - - dok = buildLuaRocks rec { - name = "dok"; - src = "${distro_src}/pkg/dok"; - luadeps = [sundown]; - rockspec = "rocks/${name}-scm-1.rockspec"; - }; - - sys = buildLuaRocks { - name = "sys"; - luadeps = [torch]; - buildInputs = [readline cmake]; - src = "${distro_src}/pkg/sys"; - rockspec = "sys-1.1-0.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - xlua = buildLuaRocks { - name = "xlua"; - luadeps = [torch sys]; - src = "${distro_src}/pkg/xlua"; - rockspec = "xlua-1.0-0.rockspec"; - }; - - nn = buildLuaRocks { - name = "nn"; - luadeps = [torch luaffifb]; - buildInputs = [cmake]; - src = "${distro_src}/extra/nn"; - rockspec = "rocks/nn-scm-1.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - graph = buildLuaRocks { - name = "graph"; - luadeps = [ torch ]; - buildInputs = [cmake]; - src = "${distro_src}/extra/graph"; - rockspec = "rocks/graph-scm-1.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - nngraph = buildLuaRocks { - name = "nngraph"; - luadeps = [ torch nn graph ]; - buildInputs = [cmake]; - src = "${distro_src}/extra/nngraph"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - image = buildLuaRocks { - name = "image"; - luadeps = [ torch dok sys xlua ]; - buildInputs = [cmake libjpeg libpng]; - src = "${distro_src}/pkg/image"; - rockspec = "image-1.1.alpha-0.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - optim = buildLuaRocks { - name = "optim"; - luadeps = [ torch ]; - buildInputs = [cmake]; - src = "${distro_src}/pkg/optim"; - rockspec = "optim-1.0.5-0.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - }; - - gnuplot = buildLuaRocks { - name = "gnuplot"; - luadeps = [ torch paths ]; - runtimeDeps = [ pkgs_gnuplot less ]; - src = "${distro_src}/pkg/gnuplot"; - rockspec = "rocks/gnuplot-scm-1.rockspec"; - }; - - unsup = buildLuaRocks { - name = "unsup"; - luadeps = [ torch xlua optim ]; - buildInputs = [ cmake ]; - src = fetchgit { - url = "https://github.com/koraykv/unsup"; - rev = "1d4632e716dc3c82feecc7dd4b22549df442859f"; - sha256 = "0npjq3y1cfmk026sdijcw3f766innrmb3qggnxsz62grczhfvgls"; - }; - rockspec = "unsup-0.1-0.rockspec"; - preBuild = '' - export Torch_DIR=${torch}/share/cmake/torch - ''; - meta.broken = true; - }; - - trepl = buildLuaRocks { - name = "trepl"; - luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup]; - runtimeDeps = [ ncurses readline ]; - src = "${distro_src}/exe/trepl"; - meta = common_meta // { - description = "A pure Lua REPL for Lua(JIT), with heavy support for Torch types."; - }; - }; - - lbase64 = buildLuaRocks { - name = "lbase64"; - src = fetchgit { - url = "https://github.com/LuaDist2/lbase64"; - rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; - sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; - }; - meta.broken = true; # 2018-04-11 - }; - - luuid = stdenv.mkDerivation { - name = "luuid"; - src = fetchgit { - url = "https://github.com/LuaDist/luuid"; - sha256 = "062gdf1rild11jg46vry93hcbb36b4527pf1dy7q9fv89f7m2nav"; - }; - - preConfigure = '' - 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 lua]; - meta = { - # FIXME: set the exact revision for src - broken = true; - }; - }; - - # Doesn't work due to missing deps (according to luarocs). - itorch = buildLuaRocks { - name = "itorch"; - luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot - optim sys dok lbase64 lua-cjson luuid]; - buildInputs = [czmq openssl]; - src = "${distro_src}/extra/iTorch"; - meta = { - # FIXME: figure out whats wrong with deps - broken = true; - }; - }; - - - }; - -in - -luapkgs - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99633c168f2f..02dcca5065df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21901,12 +21901,6 @@ in topydo = callPackage ../applications/misc/topydo {}; - torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { - lua = luajit ; - } ); - - torch-repl = lib.setName "torch-repl" torchPackages.trepl; - torchat = callPackage ../applications/networking/instant-messengers/torchat { inherit (pythonPackages) wrapPython wxPython; };