summary refs log tree commit diff
path: root/pkgs/servers/monitoring/zabbix/proxy.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
commitf8a8fc6c7c079de430fa528f688ddac781bcef16 (patch)
tree08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/servers/monitoring/zabbix/proxy.nix
parent6be720b3a756662bb31adfdc1948553a02057c16 (diff)
downloadnixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing
changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1.

Let's delay this.  We have some serious regressions.
Diffstat (limited to 'pkgs/servers/monitoring/zabbix/proxy.nix')
-rw-r--r--pkgs/servers/monitoring/zabbix/proxy.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 53932af6a18..48b72dc0590 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -3,7 +3,7 @@
 , snmpSupport ? true, net_snmp
 , sshSupport ? true, libssh2
 , sqliteSupport ? false, sqlite
-, mysqlSupport ? false, libmysqlclient
+, mysqlSupport ? false, mysql
 , postgresqlSupport ? false, postgresql
 }:
 
@@ -37,7 +37,7 @@ in
       ++ optional snmpSupport net_snmp
       ++ optional sqliteSupport sqlite
       ++ optional sshSupport libssh2
-      ++ optional mysqlSupport libmysqlclient
+      ++ optional mysqlSupport mysql.connector-c
       ++ optional postgresqlSupport postgresql;
 
       configureFlags = [