From 8dd82f3f41928d7663b3a61ddeba87c44852adc5 Mon Sep 17 00:00:00 2001 From: Andreas Wolf Date: Mon, 7 Nov 2022 09:36:02 +0100 Subject: [PATCH 1/7] 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 +++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/packages-config.nix | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index b4463bf05e5e..b82ddd3206be 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 5bc4930621fb..b2c4f0442f86 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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b5555d7733..8bef39c0d7c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24627,6 +24627,7 @@ with pkgs; server = server-pgsql; }; + zabbix60 = recurseIntoAttrs (zabbixFor "v60"); zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index ae26275e10cf..223e31b3b72f 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -27,6 +27,7 @@ ut2004Packages zabbix40 zabbix50 + zabbix60 zeroadPackages ; From a4fc9696dafc7f3b67b34979195c561d7ab6b9f2 Mon Sep 17 00:00:00 2001 From: schnusch Date: Thu, 11 Nov 2021 21:29:43 +0100 Subject: [PATCH 2/7] zabbix: move vendorSha256 to versions.nix --- pkgs/servers/monitoring/zabbix/agent.nix | 2 +- pkgs/servers/monitoring/zabbix/agent2.nix | 7 ++----- pkgs/servers/monitoring/zabbix/proxy.nix | 2 +- pkgs/servers/monitoring/zabbix/server.nix | 2 +- pkgs/servers/monitoring/zabbix/web.nix | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index f11af1809981..4aaeb9f103d6 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-agent"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index b82ddd3206be..0687e0eaf129 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, vendorSha256 ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { pname = "zabbix-agent2"; inherit version; @@ -12,10 +12,7 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - 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"; + inherit vendorSha256; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index b52015e1c3df..6ecc0b4f338f 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -15,7 +15,7 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256 }: + import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-proxy"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9249e3852e9c..3cffedd5aeb0 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -16,7 +16,7 @@ assert postgresqlSupport -> !mysqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256 }: + import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-server"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index e19646e71000..cbd095e234cc 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, writeText }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation rec { pname = "zabbix-web"; inherit version; From aa7e8209348c4d7a79fb105288205a8c9fba0407 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 3/7] zabbix60: 6.0.9 -> 6.0.14 --- pkgs/servers/monitoring/zabbix/versions.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index b2c4f0442f86..2676076281ca 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,8 +1,8 @@ generic: { v60 = generic { - version = "6.0.9"; - sha256 = "0rzdlmfvyqys166zi94q1c6pbf57b0g1dygb23ixsx083gq1hh01"; - vendorSha256 = "sha256-W95Z9pIhd5MQJAGn94kiVbQVFkmvjGPWfMx4JyJ2/EU="; + version = "6.0.14"; + sha256 = "sha256-YxrVl12OBxkB/cEvlGR+mV7bTBe6nRi71wLCtZPCzlg="; + vendorSha256 = null; }; v50 = generic { From 85f74d19ef2cd9bbfa5484fae49777c445665f86 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 4/7] zabbix50: 5.0.19 -> 5.0.33 --- pkgs/servers/monitoring/zabbix/versions.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2676076281ca..0d68a20b8253 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -6,9 +6,9 @@ generic: { }; v50 = generic { - version = "5.0.19"; - sha256 = "sha256-esa7DczdaWiG8Ru9py8HlOhvhkjV8IQjMwuiJ6F5c6E="; - vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn"; + version = "5.0.33"; + sha256 = "sha256-VimTMcnYaFXeBW3zkDRGMxmtOFgPBU2ANKXLjgtr0GE="; + vendorSha256 = "sha256-RG6tSQk3dGaoTG/LHsZkayYCHbguSNOOuAFCmpSwElQ="; }; v40 = generic { From 34eb88e5c23454eb8b707e63a2c77277b8764c55 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 5/7] zabbix40: 4.0.37 -> 4.0.44 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 0d68a20b8253..c36cd1487e70 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -12,7 +12,7 @@ generic: { }; v40 = generic { - version = "4.0.37"; - sha256 = "sha256-Wuexl8I2zA63jyTRDe8bMSP++imwSOxc4LEdUnH8jps="; + version = "4.0.44"; + sha256 = "sha256-qB3hSHnPffenBC6gv/QQXJuVpj4/oN4/jt/O6QmiX+c="; }; } From ed513f71d7d54de71ecf58f95eacc5eb1963256f Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 6/7] zabbix: agent2 is not supported for v4 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bef39c0d7c1..a7e32c4f9781 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24615,7 +24615,6 @@ with pkgs; zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version}; - agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version}; proxy-pgsql = (callPackages ../servers/monitoring/zabbix/proxy.nix { postgresqlSupport = true; }).${version}; proxy-sqlite = (callPackages ../servers/monitoring/zabbix/proxy.nix { sqliteSupport = true; }).${version}; @@ -24625,6 +24624,8 @@ with pkgs; # backwards compatibility server = server-pgsql; + } // lib.optionalAttrs ( version != "v40" ) { # agent2 is not supported in v4 + agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; }; zabbix60 = recurseIntoAttrs (zabbixFor "v60"); From 9d4439bb63060a32a1c035419af2997c95133c97 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 28 Mar 2023 21:00:00 +0200 Subject: [PATCH 7/7] zabbix: set default zabbix version to v6 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7e32c4f9781..ebf59e35aae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24632,7 +24632,7 @@ with pkgs; zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); - zabbix = zabbix50; + zabbix = zabbix60; zipkin = callPackage ../servers/monitoring/zipkin { };