Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e613677a21d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96d3ff6759d8
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Sep 24, 2017

  1. luxio: init at 13

    @richardipsum
    richardipsum committed Sep 24, 2017
    Copy the full SHA
    d42c062 View commit details

  2. luxio: fix package build

    @Mic92
    Mic92 committed Sep 24, 2017
    Copy the full SHA
    dd6691a View commit details

  3. luxio: Add maintainer

    @richardipsum
    richardipsum committed Sep 24, 2017
    Copy the full SHA
    3d278be View commit details

  4. Merge pull request #29742 from richardipsum/init-luxio 

    luxio: init at 13
    @Mic92
    Mic92 authored Sep 24, 2017
    Copy the full SHA
    96d3ff6 View commit details
Showing with 29 additions and 1 deletion.
  1. +1 −0 lib/maintainers.nix
  2. +28 −1 pkgs/top-level/lua-packages.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -497,6 +497,7 @@
renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
retrry = "Tadas Barzdžius <retrry@gmail.com>";
rht = "rht <rhtbot@protonmail.com>";
richardipsum = "Richard Ipsum <richardipsum@fastmail.co.uk>";
rick68 = "Wei-Ming Yang <rick68@gmail.com>";
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
ris = "Robert Scott <code@humanleg.org.uk>";
29 changes: 28 additions & 1 deletion pkgs/top-level/lua-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";