From 8fac07fbe54f60ea1735fd3f15b8eaeb8970b137 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 Mar 2025 18:58:25 +0100 Subject: [PATCH 1/3] zabbix50: remove due to EOL The EOL will be reached at the end of the current release cycle. https://www.zabbix.com/life_cycle_and_release_policy --- pkgs/servers/monitoring/zabbix/server.nix | 4 ---- pkgs/servers/monitoring/zabbix/versions.nix | 6 ------ pkgs/servers/monitoring/zabbix/web.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 03cfae182aa4..54968b0bd4ff 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -91,10 +91,6 @@ import ./versions.nix ( ++ optional postgresqlSupport "--with-postgresql" ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}"; - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - lib.versions.major version <= "5" - ) "-Wno-error=incompatible-pointer-types"; - prePatch = '' find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 64359e034b37..8b6a6bdc7c03 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -19,10 +19,4 @@ generic: { hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk="; vendorHash = null; }; - - v50 = generic { - version = "5.0.46"; - hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4="; - vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0="; - }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index 7cbefe782637..a447c6e6b74f 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -24,7 +24,7 @@ import ./versions.nix ( installPhase = '' mkdir -p $out/share/zabbix/ - cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ + cp -a ui/. $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4e22c6ac92e1..8fbe6fcfda83 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1928,6 +1928,7 @@ mapAliases { ### Z ### + zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; zeroadPackages = recurseIntoAttrs { zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22 zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15866dc68366..516952a47bb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12578,7 +12578,6 @@ with pkgs; zabbix70 = recurseIntoAttrs (zabbixFor "v70"); zabbix60 = recurseIntoAttrs (zabbixFor "v60"); zabbix64 = recurseIntoAttrs (zabbixFor "v64"); - zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix = zabbix60; From e67f7f1d003bed53a365060fa3328fd3c1b0f071 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 Mar 2025 19:01:59 +0100 Subject: [PATCH 2/3] zabbix64: remove due to EOL zabbix64 is EOL. https://www.zabbix.com/life_cycle_and_release_policy --- pkgs/servers/monitoring/zabbix/versions.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 8b6a6bdc7c03..2b00d8939412 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -9,11 +9,6 @@ generic: { hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU="; vendorHash = null; }; - v64 = generic { - version = "6.4.20"; - hash = "sha256-tFsg2Jq8Uaa5YULGUu1kXLkxyJuA3YGeSfJ4DPfOHkk="; - vendorHash = null; - }; v60 = generic { version = "6.0.36"; hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8fbe6fcfda83..57291469d208 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1929,6 +1929,7 @@ mapAliases { ### Z ### zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; + zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; zeroadPackages = recurseIntoAttrs { zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22 zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 516952a47bb4..df0d13442b07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12577,7 +12577,6 @@ with pkgs; zabbix72 = recurseIntoAttrs (zabbixFor "v72"); zabbix70 = recurseIntoAttrs (zabbixFor "v70"); zabbix60 = recurseIntoAttrs (zabbixFor "v60"); - zabbix64 = recurseIntoAttrs (zabbixFor "v64"); zabbix = zabbix60; From 14e8d4c920e8d2635c2660bdf155ae42e5261a29 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 Mar 2025 19:08:51 +0100 Subject: [PATCH 3/3] zabbix: remove not needed vendorHash in versions file --- pkgs/servers/monitoring/zabbix/agent2.nix | 3 +-- pkgs/servers/monitoring/zabbix/versions.nix | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index b1bf7cd6f22f..e4e009cc64a7 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -14,7 +14,6 @@ import ./versions.nix ( { version, hash, - vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { @@ -28,7 +27,7 @@ import ./versions.nix ( modRoot = "src/go"; - inherit vendorHash; + vendorHash = null; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2b00d8939412..c477c85ec87f 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -2,16 +2,13 @@ generic: { v72 = generic { version = "7.2.5"; hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54="; - vendorHash = null; }; v70 = generic { version = "7.0.11"; hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU="; - vendorHash = null; }; v60 = generic { version = "6.0.36"; hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk="; - vendorHash = null; }; }