public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/zabbix/proxy.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, snmpSupport ? true, net_snmp
, sshSupport ? true, libssh2
, sqliteSupport ? false, sqlite
, mysqlSupport ? false, mysql
, mysqlSupport ? false, libmysqlclient
, postgresqlSupport ? false, postgresql
}:
@@ -37,7 +37,7 @@ in
++ optional snmpSupport net_snmp
++ optional sqliteSupport sqlite
++ optional sshSupport libssh2
++ optional mysqlSupport mysql.connector-c
++ optional mysqlSupport libmysqlclient
++ optional postgresqlSupport postgresql;
configureFlags = [
pkgs/servers/monitoring/zabbix/server.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, odbcSupport ? true, unixODBC
, snmpSupport ? true, net_snmp
, sshSupport ? true, libssh2
, mysqlSupport ? false, mysql
, mysqlSupport ? false, libmysqlclient
, postgresqlSupport ? false, postgresql
}:
@@ -40,7 +40,7 @@ in
++ optional ldapSupport openldap
++ optional snmpSupport net_snmp
++ optional sshSupport libssh2
++ optional mysqlSupport mysql.connector-c
++ optional mysqlSupport libmysqlclient
++ optional postgresqlSupport postgresql;
configureFlags = [