diff options
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 38 |
3 files changed, 9 insertions, 41 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 02966703f44..1b85b37468e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -40,7 +40,7 @@ std_normalize,std.normalize,,,, luv,,,,, luasystem,,,,, mediator_lua,,http://luarocks.org/manifests/teto,,, -mpack,,http://luarocks.org/manifests/teto,,, +mpack,,,,, nvim-client,,,,, busted,,http://luarocks.org/manifests/teto,,, luassert,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1cf47fe2222..691ce1ef36c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -857,11 +857,17 @@ mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.7-0"; + knownRockspec = (fetchurl { + url = https://luarocks.org/mpack-1.0.7-0.rockspec; + sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; + }).outPath; + src = fetchurl { - url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; - sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz; + sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; }; + meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; description = "Lua binding to libmpack"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bc8d6313579..c4f9d1429ad 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -620,44 +620,6 @@ with self; { }; }; - mpack = buildLuaPackage rec { - name = "mpack-${version}"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "libmpack"; - repo = "libmpack-lua"; - rev = version; - sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; - dontBuild = true; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' - ''; - - installFlags = [ - "USE_SYSTEM_LUA=yes" - "USE_SYSTEM_MPACK=yes" - "MPACK_LUA_VERSION=${lua.version}" - "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}" - ]; - - hardeningDisable = [ "fortify" ]; - - meta = with stdenv.lib; { - description = "Lua bindings for libmpack"; - homepage = "https://github.com/libmpack/libmpack-lua"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = with platforms; linux ++ darwin; - }; - }; - vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; version = "2.3.1"; |