From 3fe43f44590c9501d8941bf2a4980981659b6f17 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 7 Dec 2019 12:11:40 -0500 Subject: [PATCH] zabbix: various package reference fixes --- pkgs/top-level/all-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fac520b68cc..bede4e0ab7a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15766,12 +15766,11 @@ in server = server-pgsql; }; - zabbix44 = zabbixFor "v44"; - zabbix42 = zabbixFor "v42"; - zabbix40 = zabbixFor "v40"; - zabbix30 = zabbixFor "v30"; + zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); + zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix42; + zabbix = zabbix44; zipkin = callPackage ../servers/monitoring/zipkin { };