diff options
| author | R. RyanTM <ryantm-bot@ryantm.com> | 2022-03-07 04:39:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 13:39:08 +0100 |
| commit | 81482dc674336bfa4cf1596c1a5b01cb5ea65a11 (patch) | |
| tree | 48c40c3f385818e8d448f7d0eb4974c68be3b049 /pkgs/tools/networking/haproxy | |
| parent | 03523688024b4a794c558a5f1237689471e52ad7 (diff) | |
haproxy: 2.5.3 -> 2.5.4
* haproxy: 2.5.3 -> 2.5.4 (#162666) * haproxy: update meta attributes add meta.changelog URL update meta.license using non-legacy identifiers (GPL-2.0-or-later with some files being LGPL-2.1-only) Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
Diffstat (limited to 'pkgs/tools/networking/haproxy')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index afc57cb723fa5..47b7a601d438c 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.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-1vo8ZvcH/5O1vSfOaecKiWTXtweFSLUYaNR9ffOUP+Q="; + sha256 = "sha256-3EAV2Fx/74EbRZgDt2MAHYCbB6klHcGGT+25oHtErvs="; }; buildInputs = [ openssl zlib ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # TODO: make it work on bsd as well makeFlags = [ - "PREFIX=\${out}" + "PREFIX=${placeholder "out"}" ("TARGET=" + (if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux-glibc" else if stdenv.isDarwin then "osx" @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { hardware. ''; homepage = "https://haproxy.org"; - license = licenses.gpl2; + changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG"; + license = with licenses; [ gpl2Plus lgpl21Only ]; maintainers = with maintainers; [ fuzzy-id ]; platforms = with platforms; linux ++ darwin; }; |