Merge pull request #157393 from LeSuisse/haproxy-2.5.1
haproxy: 2.3.14 -> 2.5.1
This commit is contained in:
commit
6dfcf377a4
|
@ -16,7 +16,6 @@ import ./make-test-python.nix ({ pkgs, ...}: {
|
||||||
frontend http
|
frontend http
|
||||||
bind *:80
|
bind *:80
|
||||||
mode http
|
mode http
|
||||||
option http-use-htx
|
|
||||||
http-request use-service prometheus-exporter if { path /metrics }
|
http-request use-service prometheus-exporter if { path /metrics }
|
||||||
use_backend http_server
|
use_backend http_server
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "haproxy";
|
pname = "haproxy";
|
||||||
version = "2.3.14";
|
version = "2.5.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4";
|
sha256 = "sha256-PpB5DfyDKvpspP30Uo3izi508+H3S+0NcK1UvVkg6VQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl zlib ]
|
buildInputs = [ openssl zlib ]
|
||||||
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
"USE_SYSTEMD=yes"
|
"USE_SYSTEMD=yes"
|
||||||
"USE_GETADDRINFO=1"
|
"USE_GETADDRINFO=1"
|
||||||
] ++ lib.optionals withPrometheusExporter [
|
] ++ lib.optionals withPrometheusExporter [
|
||||||
"EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
|
"USE_PROMEX=yes"
|
||||||
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
Loading…
Reference in a new issue