From 4fb71e299d94f3813df6f24a448cf9f2fa16b046 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 15:19:20 +0000 Subject: [PATCH 1/2] haproxy: 2.2.4 -> 2.3.0 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 16670ea175f..41dd747315b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947"; + sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8"; }; buildInputs = [ openssl zlib ] From 7225ae36c3b02056449d0b6d567d02d1ab6dab3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Nov 2020 04:20:00 +0000 Subject: [PATCH 2/2] haproxy: add passthru.tests --- pkgs/tools/networking/haproxy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 41dd747315b..80b135e524b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,7 +1,7 @@ { useLua ? !stdenv.isDarwin , usePcre ? true , withPrometheusExporter ? true -, stdenv, lib, fetchurl +, stdenv, lib, fetchurl, nixosTests , openssl, zlib , lua5_3 ? null, pcre ? null, systemd ? null }: @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.haproxy = nixosTests.haproxy; + meta = with lib; { description = "Reliable, high performance TCP/HTTP load balancer"; longDescription = ''