diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-04-27 06:30:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-27 06:30:48 +0000 |
commit | eda2463c4d9698188851529a4056d1b2bcc7ed8e (patch) | |
tree | 88d8473a96bf5f81bfcf40bfd31ecdca8ae5e077 /pkgs/top-level/lua-packages.nix | |
parent | f96bf5bb2e80fe371b30374ca4aaa9ffc371a048 (diff) | |
parent | 612c8165965b9c916a8f820a6f30c80abff95a96 (diff) |
Merge pull request #57945 from teto/lua/std_rename
lua: std._debug / std.normalize rename + move to automated.
Diffstat (limited to 'pkgs/top-level/lua-packages.nix')
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 60 |
1 files changed, 1 insertions, 59 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 20773fb66d32..b51af519f938 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -386,7 +386,7 @@ with self; { sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z"; }; - propagatedBuildInputs = [ std.normalize bit32 ]; + propagatedBuildInputs = [ std_normalize bit32 ]; buildPhase = '' ${lua}/bin/lua build-aux/luke \ @@ -782,64 +782,6 @@ with self; { }; }; - std._debug = buildLuaPackage rec { - name = "std._debug-${version}"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "lua-stdlib"; - repo = "_debug"; - rev = "v${version}"; - sha256 = "01kfs6k9j9zy4bvk13jx18ssfsmhlciyrni1x32qmxxf4wxyi65n"; - }; - - # No Makefile. - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/lua/${lua.luaversion}/std - cp -r lib/std/_debug $out/share/lua/${lua.luaversion}/std/ - ''; - - meta = with stdenv.lib; { - description = "Manage an overall debug state, and associated hint substates."; - homepage = https://lua-stdlib.github.io/_debug; - license = licenses.mit; - maintainers = with maintainers; [ lblasc ]; - platforms = platforms.unix; - }; - }; - - std.normalize = buildLuaPackage rec { - name = "std.normalize-${version}"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "lua-stdlib"; - repo = "normalize"; - rev = "v${version}"; - sha256 = "1yz96r28d2wcgky6by92a21755bf4wzpn65rdv2ps0fxywgw5rda"; - }; - - propagatedBuildInputs = [ std._debug ]; - - # No Makefile. - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/lua/${lua.luaversion}/std - cp -r lib/std/normalize $out/share/lua/${lua.luaversion}/std/ - ''; - - meta = with stdenv.lib; { - description = "Normalized Lua Functions"; - homepage = https://lua-stdlib.github.io/normalize; - license = licenses.mit; - maintainers = with maintainers; [ lblasc ]; - platforms = platforms.unix; - }; - }; - vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; version = "2.3.1"; |