diff options
author | Matthieu Coudron <mattator@gmail.com> | 2019-03-20 17:38:04 +0900 |
---|---|---|
committer | Matthieu Coudron <mattator@gmail.com> | 2019-04-14 16:38:23 +0900 |
commit | e195a37fd95de38ef452ffaf57ca227d96509af6 (patch) | |
tree | d2d3be87a8e971c7a133e34f17f06e1d971e6955 /pkgs/top-level/lua-packages.nix | |
parent | f84594c7d741b7bc32476e6203b124baca7e13ab (diff) | |
download | nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar.gz nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar.bz2 nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar.lz nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar.xz nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.tar.zst nixpkgs-e195a37fd95de38ef452ffaf57ca227d96509af6.zip |
luaPackages: rename std._debug to std__debug
Similarly rename std.normalize to std_normalize. Having a dot in the name prevents some changes to the lua infrastructure, for instance passing attribute names { std._debug }: to a function would fail with `syntax error, unexpected ',', expecting '.' or '=',`
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 9d0a607dfc0..99b1113834b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -383,7 +383,7 @@ with self; { sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z"; }; - propagatedBuildInputs = [ std.normalize bit32 ]; + propagatedBuildInputs = [ std_normalize bit32 ]; buildPhase = '' ${lua}/bin/lua build-aux/luke \ @@ -779,64 +779,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"; |