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>
This commit is contained in:
R. RyanTM 2022-03-07 04:39:08 -08:00 committed by GitHub
parent 0352368802
commit 81482dc674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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;
};