From 2d77d620cea90c166edac625e9548ba140462b15 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Jun 2019 14:23:49 +0900 Subject: [PATCH] luaPackages.luaposix: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 +++++++++++ pkgs/top-level/lua-packages.nix | 34 ------------------- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1b85b37468e9..e80e3f08f7d2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -29,6 +29,7 @@ luabitop,,,,, luaevent,,,,, luacheck,,,,, luaffi,,http://luarocks.org/dev,,, +luaposix,,,,,vyp lblasc luazip,,,,, luuid,,,,, markdown,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 691ce1ef36cd..c2a1e36cd7bd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -633,6 +633,25 @@ luaffi = buildLuarocksPackage { }; }; }; +luaposix = buildLuarocksPackage { + pname = "luaposix"; + version = "34.0.4-1"; + + src = fetchurl { + url = https://luarocks.org/luaposix-34.0.4-1.src.rock; + sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua std_normalize ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + license = { + fullName = "MIT/X11"; + }; + }; +}; luazip = buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c4f9d1429adf..83ec4cdb4e69 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -345,40 +345,6 @@ with self; { }; }; - luaposix = buildLuaPackage rec { - name = "posix-${version}"; - version = "34.0.4"; - - src = fetchFromGitHub { - owner = "luaposix"; - repo = "luaposix"; - rev = "release-v${version}"; - sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z"; - }; - - propagatedBuildInputs = [ std_normalize bit32 ]; - - buildPhase = '' - ${lua}/bin/lua build-aux/luke \ - package="luaposix" \ - version="${version}" - ''; - - installPhase = '' - ${lua}/bin/lua build-aux/luke install --quiet \ - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" \ - INST_LUADIR="$out/share/lua/${lua.luaversion}" - ''; - - meta = with stdenv.lib; { - description = "Lua bindings for POSIX API"; - homepage = "https://github.com/luaposix/luaposix"; - license = licenses.mit; - maintainers = with maintainers; [ vyp lblasc ]; - platforms = platforms.unix; - }; - }; - luasec = buildLuaPackage rec { name = "sec-0.8";