diff options
author | Sergey Mironov <grrwlf@gmail.com> | 2016-03-19 12:35:40 +0300 |
---|---|---|
committer | Sergey Mironov <grrwlf@gmail.com> | 2016-03-19 12:37:06 +0300 |
commit | a56b9ab5bebf9534404cd46f6b61f82e17164a0b (patch) | |
tree | 5a81890cbdca90245b990f2edd9a638fb791ca0a /pkgs/applications/science/machine-learning | |
parent | da66fd2b115c564d87ffb904e764bbb0cbd92f9b (diff) | |
download | nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar.gz nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar.bz2 nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar.lz nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar.xz nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.tar.zst nixpkgs-a56b9ab5bebf9534404cd46f6b61f82e17164a0b.zip |
torch: use default luajit
Diffstat (limited to 'pkgs/applications/science/machine-learning')
-rw-r--r-- | pkgs/applications/science/machine-learning/torch/torch-distro.nix | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 2204af0597e..1de2b51a19d 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,7 +1,6 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, - src + gnuplot, fetchurl, luajit, src } : let @@ -21,47 +20,6 @@ let luapkgs = rec { - - luajit = - stdenv.mkDerivation rec { - name = "luajit-${version}"; - version = "2.1.0-beta1"; - luaversion = "5.1"; - - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; - }; - - enableParallelBuilding = true; - - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local $out - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig - ''; - - configurePhase = false; - buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = '' - make install INSTALL_INC=$out/include PREFIX=$out - ln -s $out/bin/luajit* $out/bin/luajit - ''; - - meta = with stdenv.lib; { - description = "high-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.thoughtpolice ]; - }; - }; - luarocks = default_luarocks.override { lua = luajit; }; |