Merge pull request #118761 from aanderse/zabbix

zabbix: drop 3.0.32, 4.0.29 -> 4.0.30, 5.0.9 -> 5.0.10
This commit is contained in:
Sandro 2021-04-07 23:20:51 +02:00 committed by GitHub
commit a6b2b17ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 11 deletions

View File

@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }:
modRoot = "src/go";
vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc";
vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd";
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libiconv openssl pcre zlib ];

View File

@ -1,16 +1,11 @@
generic: {
v50 = generic {
version = "5.0.9";
sha256 = "16vwh01hlxmh9qg3d7q1vsmz3bwydk7v7da58d3764ldmh8ag199";
version = "5.0.10";
sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb";
};
v40 = generic {
version = "4.0.29";
sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y";
};
v30 = generic {
version = "3.0.32";
sha256 = "1n9l0llmifmg5zzh2jzqax8y23ch7250v36bcfkpizvr8wji7xi7";
version = "4.0.30";
sha256 = "17h831a1rw245kz37pw5haxq09k9m76bf0bz0jgg9s0q1j7hvywh";
};
}

View File

@ -836,6 +836,7 @@ mapAliases ({
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
yuzu = yuzu-mainline; # added 2021-01-25
zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07
zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28
zdfmediathk = mediathekview; # added 2019-01-19

View File

@ -19227,7 +19227,6 @@ in
zabbix50 = recurseIntoAttrs (zabbixFor "v50");
zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40");
zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30");
zabbix = zabbix50;