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

haproxy: added fuzzy-id to the list of maintainers

Browse Source
This commit is contained in:
Thomas Bach 2017-03-29 12:27:50 +02:00
parent 45788aeebe
commit ea80cd1f11
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -181,6 +181,7 @@
ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>"; ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>"; funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>";
fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>"; fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>";
gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>"; gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
garbas = "Rok Garbas <rok@garbas.si>"; garbas = "Rok Garbas <rok@garbas.si>";

16
pkgs/tools/networking/haproxy/default.nix
View File

@ -1,10 +1,10 @@
{ useLua ? false { useLua ? !stdenv.isDarwin
, usePcre ? false , usePcre ? true
, stdenv, fetchurl , stdenv, fetchurl
, openssl, zlib, lua ? null, pcre ? null , openssl, zlib, lua5_3 ? null, pcre ? null
}: }:
assert useLua -> lua != null; assert useLua -> lua5_3 != null;
assert usePcre -> pcre != null; assert usePcre -> pcre != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ openssl zlib ] buildInputs = [ openssl zlib ]
++ stdenv.lib.optional useLua lua ++ stdenv.lib.optional useLua lua5_3
++ stdenv.lib.optional usePcre pcre; ++ stdenv.lib.optional usePcre pcre;
# TODO: make it work on bsd as well # TODO: make it work on bsd as well
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
"USE_PCRE_JIT=yes" "USE_PCRE_JIT=yes"
] ++ stdenv.lib.optionals useLua [ ] ++ stdenv.lib.optionals useLua [
"USE_LUA=yes" "USE_LUA=yes"
"LUA_LIB=${lua}/lib" "LUA_LIB=${lua5_3}/lib"
"LUA_INC=${lua}/include" "LUA_INC=${lua5_3}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc";
meta = { meta = {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
hardware. hardware.
''; '';
homepage = http://haproxy.1wt.eu; homepage = http://haproxy.1wt.eu;
maintainers = [ stdenv.lib.maintainers.garbas ]; maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with stdenv.lib.platforms; linux ++ darwin;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
}; };