From 8dd82f3f41928d7663b3a61ddeba87c44852adc5 Mon Sep 17 00:00:00 2001 From: Andreas Wolf Date: Mon, 7 Nov 2022 09:36:02 +0100 Subject: zabbix: Support for 6.0 See https://github.com/NixOS/nixpkgs/pull/145502#issuecomment-967241003 Co-Authored-By: mc-fugger --- pkgs/servers/monitoring/zabbix/agent2.nix | 5 ++++- pkgs/servers/monitoring/zabbix/versions.nix | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index b4463bf05e5..b82ddd3206b 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -12,7 +12,10 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn"; + vendorSha256 = + if "${lib.versions.majorMinor version}" == "5.0" then "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn" + else if "${lib.versions.majorMinor version}" == "6.0" then "sha256-W95Z9pIhd5MQJAGn94kiVbQVFkmvjGPWfMx4JyJ2/EU=" + else throw "unsupported version ${version} for zabbix-agent2"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 5bc4930621f..b2c4f0442f8 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,14 @@ generic: { + v60 = generic { + version = "6.0.9"; + sha256 = "0rzdlmfvyqys166zi94q1c6pbf57b0g1dygb23ixsx083gq1hh01"; + vendorSha256 = "sha256-W95Z9pIhd5MQJAGn94kiVbQVFkmvjGPWfMx4JyJ2/EU="; + }; + v50 = generic { version = "5.0.19"; sha256 = "sha256-esa7DczdaWiG8Ru9py8HlOhvhkjV8IQjMwuiJ6F5c6E="; + vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn"; }; v40 = generic { -- cgit 1.4.1