git.iko.soy/typeable/nixpkgs
on master help sign in
luaPackages.mpack: removed duplicate manual package
commit6fe580e30bc6408cf7e67c29b3d8478e0e618ff5 authorMatthieu Coudron <mattator@gmail.com> dateThu 6 Jun 2019, 14:04 (7 years ago) parent8b3d0b0
3 files changed+9−41
maintainers/scripts/luarocks-packages.csv+1−1 pkgs/development/lua-modules/generated-packages.nix+8−2 pkgs/top-level/lua-packages.nix−38
maintainers/scripts/luarocks-packages.csv+1−1
@@ -40,7 +40,7 @@ std_normalize,std.normalize,,,,
4040luv,,,,,
4141luasystem,,,,,
4242mediator_lua,,http://luarocks.org/manifests/teto,,,
43−mpack,,http://luarocks.org/manifests/teto,,,
43+mpack,,,,,
4444nvim-client,,,,,
4545busted,,http://luarocks.org/manifests/teto,,,
4646luassert,,,,,
pkgs/development/lua-modules/generated-packages.nix+8−2
@@ -857,11 +857,17 @@ mpack = buildLuarocksPackage {
857857 pname = "mpack";
858858 version = "1.0.7-0";
859859
860+ knownRockspec = (fetchurl {
861+ url = https://luarocks.org/mpack-1.0.7-0.rockspec;
862+ sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz";
863+ }).outPath;
864+
860865 src = fetchurl {
861− url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock;
862− sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7";
866+ url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz;
867+ sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8";
863868 };
864869
870+
865871 meta = {
866872 homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz";
867873 description = "Lua binding to libmpack";
pkgs/top-level/lua-packages.nix−38
@@ -620,44 +620,6 @@ with self; {
620620 };
621621 };
622622
623− mpack = buildLuaPackage rec {
624− name = "mpack-${version}";
625− version = "1.0.7";
626−
627− src = fetchFromGitHub {
628− owner = "libmpack";
629− repo = "libmpack-lua";
630− rev = version;
631− sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8";
632− };
633−
634− nativeBuildInputs = [ pkgconfig ];
635− buildInputs = [ libmpack ];
636− dontBuild = true;
637−
638− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
639− substituteInPlace Makefile \
640− --replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
641− '';
642−
643− installFlags = [
644− "USE_SYSTEM_LUA=yes"
645− "USE_SYSTEM_MPACK=yes"
646− "MPACK_LUA_VERSION=${lua.version}"
647− "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}"
648− ];
649−
650− hardeningDisable = [ "fortify" ];
651−
652− meta = with stdenv.lib; {
653− description = "Lua bindings for libmpack";
654− homepage = "https://github.com/libmpack/libmpack-lua";
655− license = licenses.mit;
656− maintainers = with maintainers; [ vyp ];
657− platforms = with platforms; linux ++ darwin;
658− };
659− };
660−
661623 vicious = toLuaModule(stdenv.mkDerivation rec {
662624 name = "vicious-${version}";
663625 version = "2.3.1";