torch: unhardcode references to luajit

pkgs/applications/science/machine-learning/torch/default.nix

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

pkgs/applications/science/machine-learning/torch/torch-distro.nix

···
 { luarocks, lib , stdenv,  writeText , readline,  makeWrapper,
   less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl,
-  gnuplot, fetchurl, luajit, src
+  gnuplot, fetchurl, lua, src
 } :
 
 let
···
   luapkgs = rec {
 
     luarocks = default_luarocks.override {
-      lua = luajit;
+      inherit lua;
     };
 
     buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? []
···
         runtimeDeps_ =
           runtimeDeps ++
           (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++
-          [ luajit coreutils ];
+          [ lua coreutils ];
 
         mkcfg = ''
           export LUAROCKS_CONFIG=config.lua
···
             variables = {
               LUA_BINDIR = "$out/bin";
               LUA_INCDIR = "$out/include";
-              LUA_LIBDIR = "$out/lib/lua/${luajit.luaversion}";
+              LUA_LIBDIR = "$out/lib/lua/${lua.luaversion}";
             };
           EOF
         '';
···
 
         phases = [ "unpackPhase" "patchPhase" "buildPhase"];
 
-        buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper luajit ];
+        buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper lua ];
 
         buildPhase = ''
           eval "$preBuild"
···
               --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"
···
         makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua"
       '';
 
-      buildInputs = [luajit];
+      buildInputs = [lua];
 
       installPhase = ''
         make install-extra $makeFlags
···
       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.";
       };
     };
 
···
       };
 
       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;

pkgs/top-level/all-packages.nix

···
 
   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;
 
···
     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;