zabbix64, zabbix50: remove due to EOL (#392468)

This commit is contained in:
Leona Maroni
2025-04-22 10:01:42 +02:00
committed by GitHub
6 changed files with 4 additions and 23 deletions
+1 -2
View File
@@ -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
@@ -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' {} +
'';
@@ -2,27 +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;
};
v64 = generic {
version = "6.4.20";
hash = "sha256-tFsg2Jq8Uaa5YULGUu1kXLkxyJuA3YGeSfJ4DPfOHkk=";
vendorHash = null;
};
v60 = generic {
version = "6.0.36";
hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
vendorHash = null;
};
v50 = generic {
version = "5.0.46";
hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4=";
vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0=";
};
}
+1 -1
View File
@@ -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
'';
+2
View File
@@ -1928,6 +1928,8 @@ 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
-2
View File
@@ -12577,8 +12577,6 @@ with pkgs;
zabbix72 = recurseIntoAttrs (zabbixFor "v72");
zabbix70 = recurseIntoAttrs (zabbixFor "v70");
zabbix60 = recurseIntoAttrs (zabbixFor "v60");
zabbix64 = recurseIntoAttrs (zabbixFor "v64");
zabbix50 = recurseIntoAttrs (zabbixFor "v50");
zabbix = zabbix60;