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: 7408e589698c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45b54c4db42c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 13, 2020

  1. haproxy: 2.2.4 -> 2.3.0

    r-ryantm committed Nov 13, 2020
    Copy the full SHA
    4fb71e2 View commit details

Commits on Nov 14, 2020

  1. haproxy: add passthru.tests

    marsam committed Nov 14, 2020
    Copy the full SHA
    7225ae3 View commit details
  2. Merge pull request #103713 from r-ryantm/auto-update/haproxy

    haproxy: 2.2.4 -> 2.3.0
    marsam authored Nov 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    45b54c4 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/tools/networking/haproxy/default.nix
8 changes: 5 additions & 3 deletions pkgs/tools/networking/haproxy/default.nix
Original file line number Diff line number Diff line change
@@ -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
}:
@@ -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 ]
@@ -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 = ''