diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-08-21 17:11:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 17:11:55 -0400 |
| commit | 91db1c8aec50fbb018e103140c85fdd6678faa03 (patch) | |
| tree | b6902e82d54187e3ba00dc437f93f414dd445a0b /pkgs/top-level | |
| parent | 0447711c07e5a55400aaacc03b39e7a1eeaf8dd7 (diff) | |
| parent | f6a3403055e20774a9338f1a3c0b8cc5f27ee88d (diff) | |
| download | nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.gz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.bz2 nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.lz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.xz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.zst nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.zip | |
Merge pull request #87712 from aanderse/zabbix
zabbix: 4.4.8 -> 5.0.2
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9f959c8d16e..c884b40ef2a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -687,6 +687,9 @@ mapAliases ({ mumble_git = pkgs.mumble; murmur_git = pkgs.murmur; + # added 2020-08-17 + zabbix44 = throw "Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b81ee80fdc2..3000f7dd438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16958,11 +16958,11 @@ in server = server-pgsql; }; - zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix44; + zabbix = zabbix50; zipkin = callPackage ../servers/monitoring/zipkin { }; |