Merge remote-tracking branch 'upstream/staging' into deps-reorg

This commit is contained in:
John Ericson
2017-09-28 12:32:57 -04:00
789 changed files with 15725 additions and 8096 deletions
+28 -1
View File
@@ -8,7 +8,7 @@
{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
, fetchFromGitHub, libmpack
, fetchFromGitHub, libmpack, which
}:
let
@@ -270,6 +270,33 @@ let
};
};
luxio = buildLuaPackage rec {
name = "luxio-${version}";
version = "13";
src = fetchurl {
url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
};
nativeBuildInputs = [ which pkgconfig ];
postPatch = ''
patchShebangs .
'';
meta = {
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.mit;
description = "Lightweight UNIX I/O and POSIX binding for Lua";
maintainers = [ maintainers.richardipsum ];
};
preBuild = ''
makeFlagsArray=(
INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
INST_LUADIR="$out/share/lua/${lua.luaversion}"
LUA_BINDIR="$out/bin"
INSTALL=install
);
'';
};
luazip = buildLuaPackage rec {
name = "zip-${version}";
version = "1.2.3";