diff options
author | Izorkin <izorkin@elven.pw> | 2019-08-17 21:24:29 +0300 |
---|---|---|
committer | Izorkin <izorkin@elven.pw> | 2019-09-09 15:55:34 +0300 |
commit | 329a88efa78126ae7413807ce58000eab49e82d9 (patch) | |
tree | 432995643b4784e5eefdd253ace54a2566eebd7c /pkgs/servers | |
parent | cfb909229dd4c82441ddbf6d904def2057b62678 (diff) | |
download | nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.gz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.bz2 nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.lz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.xz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.zst nixlib-329a88efa78126ae7413807ce58000eab49e82d9.zip |
treewide: replace mysql.connector-c to libmysqlclient
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/clickhouse/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/freeradius/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/exim/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/mail/opensmtpd/extras.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/plugins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/proxy.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/server.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/uwsgi/default.nix | 4 |
12 files changed, 32 insertions, 32 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index e48dec7d20c8..ab2d44577c0d 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu -, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka +, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu - libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka + libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c448e4936f64..93e1a31abb17 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib -, ncurses, mysql, gtk2, lua, hwloc, numactl +, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 , enableX11 ? true @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl zlib - mysql.connector-c ncurses gtk2 lz4 + libmysqlclient ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 6c6eb2b0c091..eeea3298ecdc 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -13,7 +13,7 @@ , withMemcached ? false , hiredis , withRedis ? false -, mysql +, libmysqlclient , withMysql ? false , json_c , withJson ? false @@ -31,7 +31,7 @@ assert withPcap -> libpcap != null; assert withCap -> libcap != null; assert withMemcached -> libmemcached != null; assert withRedis -> hiredis != null; -assert withMysql -> mysql != null; +assert withMysql -> libmysqlclient != null; assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; assert withRest -> curl != null && withJson; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ optional withCap libcap ++ optional withMemcached libmemcached ++ optional withRedis hiredis - ++ optional withMysql mysql.connector-c + ++ optional withMysql libmysqlclient ++ optional withJson json_c ++ optional withYubikey libyubikey ++ optional withCollectd collectd diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7dacb997d470..f67bc5b00452 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null -, enableMysql ? false, mysql ? null +, enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null , enableExtendedAttrs ? false, attr ? null @@ -8,7 +8,7 @@ }: assert enableMagnet -> lua5_1 != null; -assert enableMysql -> mysql != null; +assert enableMysql -> libmysqlclient != null; assert enableLdap -> openldap != null; assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql mysql.connector-c + ++ stdenv.lib.optional enableMysql libmysqlclient ++ stdenv.lib.optional enableLdap openldap ++ stdenv.lib.optional enableWebDAV sqlite ++ stdenv.lib.optional enableWebDAV libuuid; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e3afd1f98798..4104b0443ff0 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -3,7 +3,7 @@ , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests # Auth modules -, withMySQL ? false, mysql +, withMySQL ? false, libmysqlclient , withPgSQL ? false, postgresql , withSQLite ? true, sqlite }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] - ++ lib.optional withMySQL mysql.connector-c + ++ lib.optional withMySQL libmysqlclient ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index fcafd5817d4e..96c8ad4a383e 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,6 +1,6 @@ { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv , enableLDAP ? false, openldap -, enableMySQL ? false, mysql, zlib +, enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] + ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam ++ stdenv.lib.optional enableSPF libspf2; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: + s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 71b27facbab6..f7ed6382a7be 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis, + python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libevent - libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ]; + libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; configureFlags = [ "--sysconfdir=/etc" @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional enableRedis "-I${hiredis}/include/hiredis -lhiredis" ++ stdenv.lib.optional enableMysql - "-L${mysql.connector-c}/lib/mysql"; + "-L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 39845f12f03c..b299d212a185 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -3,7 +3,7 @@ , buildPackages , withLDAP ? true, openldap , withPgSQL ? false, postgresql -, withMySQL ? false, mysql +, withMySQL ? false, libmysqlclient , withSQLite ? false, sqlite }: @@ -12,7 +12,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); auxlibs = lib.concatStringsSep " " ([ @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper m4 ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL mysql.connector-c + ++ lib.optional withMySQL libmysqlclient ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 9f23cc3e54c3..62f40b59d374 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, libdbi, mysql, zlib, openldap, procps +, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 48b72dc0590d..53932af6a18f 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, 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 = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 51ca38e8cfc8..ac5dcca901d5 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -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 = [ diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 85fa6cd80063..556c44b61a75 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,7 +4,7 @@ , pam, withPAM ? stdenv.isLinux , systemd, withSystemd ? stdenv.isLinux , python2, python3, ncurses -, ruby, php-embed, mysql +, ruby, php-embed, libmysqlclient }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { @@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else " # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; inputs = [ php-embed ] ++ php-embed.buildInputs; - NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ]; + NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ]; }) ]; |