diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-11-08 12:25:03 +0800 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2019-11-09 10:11:57 -0800 |
commit | 4a589e5ea7b82de0d697502e0eb3e7edaab9e0ab (patch) | |
tree | 17045008e0efe9376a0ad3d914a66e56aa255f12 | |
parent | 7cdd581572e31af58a9ad0074d83a9d7cb63d9a6 (diff) |
haproxy: 1.9.8 -> 2.0.8
-rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index d8711d516dc5..2b5f52b51aa8 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,7 +1,9 @@ { useLua ? !stdenv.isDarwin , usePcre ? true -, stdenv, fetchurl -, openssl, zlib, lua5_3 ? null, pcre ? null +, withPrometheusExporter ? true +, stdenv, lib, fetchurl +, openssl, zlib +, lua5_3 ? null, pcre ? null, systemd ? null }: assert useLua -> lua5_3 != null; @@ -9,39 +11,47 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.9.8"; + version = "2.0.8"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id"; + sha256 = "02i87hr1dfhrk6nvvcig4m9bpww7hyl6qcxcl20rfvxd2n2iwzn3"; }; buildInputs = [ openssl zlib ] - ++ stdenv.lib.optional useLua lua5_3 - ++ stdenv.lib.optional usePcre pcre; + ++ lib.optional useLua lua5_3 + ++ lib.optional usePcre pcre + ++ lib.optional stdenv.isLinux systemd; # TODO: make it work on bsd as well makeFlags = [ "PREFIX=\${out}" ("TARGET=" + (if stdenv.isSunOS then "solaris" - else if stdenv.isLinux then "linux2628" + else if stdenv.isLinux then "linux-glibc" else if stdenv.isDarwin then "osx" else "generic")) ]; + buildFlags = [ "USE_OPENSSL=yes" "USE_ZLIB=yes" - ] ++ stdenv.lib.optionals usePcre [ + ] ++ lib.optionals usePcre [ "USE_PCRE=yes" "USE_PCRE_JIT=yes" - ] ++ stdenv.lib.optionals useLua [ + ] ++ lib.optionals useLua [ "USE_LUA=yes" "LUA_LIB=${lua5_3}/lib" "LUA_INC=${lua5_3}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc" - ++ stdenv.lib.optional stdenv.isLinux "USE_GETADDRINFO=1"; + ] ++ lib.optionals stdenv.isLinux [ + "USE_SYSTEMD=yes" + "USE_GETADDRINFO=1" + ] ++ lib.optionals withPrometheusExporter [ + "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" + ] ++ lib.optional stdenv.isDarwin "CC=cc"; + + enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Reliable, high performance TCP/HTTP load balancer"; longDescription = '' HAProxy is a free, very fast and reliable solution offering high @@ -51,9 +61,9 @@ stdenv.mkDerivation rec { tens of thousands of connections is clearly realistic with todays hardware. ''; - homepage = http://haproxy.1wt.eu; - maintainers = with stdenv.lib.maintainers; [ fuzzy-id ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - license = stdenv.lib.licenses.gpl2; + homepage = "https://haproxy.org"; + license = licenses.gpl2; + maintainers = with maintainers; [ fuzzy-id ]; + platforms = with platforms; linux ++ darwin; }; } |