From d42c06282120ac9378717a331493b4ecc5517055 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 24 Sep 2017 15:02:02 +0100 Subject: [PATCH 1/3] luxio: init at 13 --- pkgs/top-level/lua-packages.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 91efa306ce4..929949ab72d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -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,28 @@ 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"; + }; + buildInputs = [ which pkgconfig ]; + meta = { + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + }; + preBuild = '' + makeFlagsArray=( + INST_LIBDIR="$out/lib/lua/${lua.luaversion}" + INST_LUADIR="$out/share/lua/${lua.luaversion}" + LUA_BINDIR="$out/bin" + ); + ''; + }; + luazip = buildLuaPackage rec { name = "zip-${version}"; version = "1.2.3"; From dd6691aa0583bcdece6462335d442b4ac185eaf4 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 24 Sep 2017 15:44:43 +0100 Subject: [PATCH 2/3] luxio: fix package build --- pkgs/top-level/lua-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 929949ab72d..1db7c783900 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -277,7 +277,10 @@ let url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; - buildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkgconfig ]; + postPatch = '' + patchShebangs . + ''; meta = { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; @@ -288,6 +291,7 @@ let INST_LIBDIR="$out/lib/lua/${lua.luaversion}" INST_LUADIR="$out/share/lua/${lua.luaversion}" LUA_BINDIR="$out/bin" + INSTALL=install ); ''; }; From 3d278be9ae2be8dd9cbc5c2b208b8121ae758113 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 24 Sep 2017 15:59:05 +0100 Subject: [PATCH 3/3] luxio: Add maintainer --- lib/maintainers.nix | 1 + pkgs/top-level/lua-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ec0d49dd35d..32ec8be0a68 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -497,6 +497,7 @@ renzo = "Renzo Carbonara "; retrry = "Tadas BarzdÅžius "; rht = "rht "; + richardipsum = "Richard Ipsum "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; ris = "Robert Scott "; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 1db7c783900..98192d2c3d7 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -285,6 +285,7 @@ let 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=(