summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-12-07 13:13:12 -0500
committerGitHub <noreply@github.com>2019-12-07 13:13:12 -0500
commit83b7156f35d8f3e4eca8a5d2cd79559d31777f48 (patch)
treeb87234958766f82b4dbd7d8532147b5d192efcb1
parent0850a90fd549098e12e9827dbba2d97272390f35 (diff)
parent3fe43f44590c9501d8941bf2a4980981659b6f17 (diff)
downloadnixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar.gz
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar.bz2
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar.lz
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar.xz
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.tar.zst
nixpkgs-83b7156f35d8f3e4eca8a5d2cd79559d31777f48.zip
Merge pull request #75161 from aanderse/zabbix
zabbix: various package reference fixes
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fac520b68c..bede4e0ab7a 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 { };