JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luaPackages.mpack: removed duplicate manual package

Browse Source
This commit is contained in:
Matthieu Coudron 2019-06-06 14:04:22 +09:00
parent 8b3d0b00d5
commit 6fe580e30b
3 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/scripts/luarocks-packages.csv
View File

@ -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,,,,,

1 # nix name luarocks name server version luaversion maintainers
40 luv
41 luasystem
42 mediator_lua http://luarocks.org/manifests/teto
43 mpack http://luarocks.org/manifests/teto
44 nvim-client
45 busted http://luarocks.org/manifests/teto
46 luassert

10
pkgs/development/lua-modules/generated-packages.nix
View File

@ -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";

38
pkgs/top-level/lua-packages.nix
View File

@ -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";