treewide: remove redundant rec

This commit is contained in:
volth
2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
@@ -94,7 +94,7 @@ let
# rockspec = "lua-cjson-2.1devel-1.rockspec";
# };
lua-cjson = stdenv.mkDerivation rec {
lua-cjson = stdenv.mkDerivation {
name = "lua-cjson";
src = "${distro_src}/extra/lua-cjson";
@@ -179,7 +179,7 @@ let
rockspec = "rocks/${name}-scm-1.rockspec";
};
sys = buildLuaRocks rec {
sys = buildLuaRocks {
name = "sys";
luadeps = [torch];
buildInputs = [readline cmake];
@@ -190,14 +190,14 @@ let
'';
};
xlua = buildLuaRocks rec {
xlua = buildLuaRocks {
name = "xlua";
luadeps = [torch sys];
src = "${distro_src}/pkg/xlua";
rockspec = "xlua-1.0-0.rockspec";
};
nn = buildLuaRocks rec {
nn = buildLuaRocks {
name = "nn";
luadeps = [torch luaffifb];
buildInputs = [cmake];
@@ -208,7 +208,7 @@ let
'';
};
graph = buildLuaRocks rec {
graph = buildLuaRocks {
name = "graph";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -219,7 +219,7 @@ let
'';
};
nngraph = buildLuaRocks rec {
nngraph = buildLuaRocks {
name = "nngraph";
luadeps = [ torch nn graph ];
buildInputs = [cmake];
@@ -229,7 +229,7 @@ let
'';
};
image = buildLuaRocks rec {
image = buildLuaRocks {
name = "image";
luadeps = [ torch dok sys xlua ];
buildInputs = [cmake libjpeg libpng];
@@ -240,7 +240,7 @@ let
'';
};
optim = buildLuaRocks rec {
optim = buildLuaRocks {
name = "optim";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -251,7 +251,7 @@ let
'';
};
gnuplot = buildLuaRocks rec {
gnuplot = buildLuaRocks {
name = "gnuplot";
luadeps = [ torch paths ];
runtimeDeps = [ pkgs_gnuplot less ];
@@ -259,7 +259,7 @@ let
rockspec = "rocks/gnuplot-scm-1.rockspec";
};
unsup = buildLuaRocks rec {
unsup = buildLuaRocks {
name = "unsup";
luadeps = [ torch xlua optim ];
buildInputs = [ cmake ];
@@ -275,7 +275,7 @@ let
meta.broken = true;
};
trepl = buildLuaRocks rec {
trepl = buildLuaRocks {
name = "trepl";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup];
runtimeDeps = [ ncurses readline ];
@@ -285,7 +285,7 @@ let
};
};
lbase64 = buildLuaRocks rec {
lbase64 = buildLuaRocks {
name = "lbase64";
src = fetchgit {
url = "https://github.com/LuaDist2/lbase64";
@@ -295,7 +295,7 @@ let
meta.broken = true; # 2018-04-11
};
luuid = stdenv.mkDerivation rec {
luuid = stdenv.mkDerivation {
name = "luuid";
src = fetchgit {
url = "https://github.com/LuaDist/luuid";
@@ -314,7 +314,7 @@ let
};
# Doesn't work due to missing deps (according to luarocs).
itorch = buildLuaRocks rec {
itorch = buildLuaRocks {
name = "itorch";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot
optim sys dok lbase64 lua-cjson luuid];