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

treewide: libmysql -> mysql.connector-c

Browse Source
This commit is contained in:
Robin Gloster 2017-12-27 16:15:33 +01:00
parent 445e3d7390
commit 6903ea6050
18 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/kexi/default.nix
View File

@ -4,7 +4,7 @@
breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
kwidgetsaddons, kxmlgui, kwidgetsaddons, kxmlgui,
kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
}: }:
mkDerivation rec { mkDerivation rec {
@ -24,7 +24,7 @@ mkDerivation rec {
breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
kwidgetsaddons kxmlgui kwidgetsaddons kxmlgui
kdb kproperty kreport lcms2 libmysql marble postgresql kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
]; ];
propagatedUserEnvPkgs = [ kproperty ]; propagatedUserEnvPkgs = [ kproperty ];

6
pkgs/development/compilers/gerbil/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, gambit, { stdenv, fetchurl, fetchgit, gambit,
coreutils, rsync, bash, coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }:
# TODO: distinct packages for gerbil-release and gerbil-devel # TODO: distinct packages for gerbil-release and gerbil-devel
@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gambit gambit
coreutils rsync bash coreutils rsync bash
openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb
]; ];
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
postPatch = '' postPatch = ''
echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm

4
pkgs/development/compilers/neko/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2, libpthreadstubs , git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig git ]; nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
mariadb.client mbedtls openssl libpthreadstubs ] mysql.connector-c mbedtls openssl libpthreadstubs ]
++ stdenv.lib.optional stdenv.isLinux gtk2 ++ stdenv.lib.optional stdenv.isLinux gtk2
++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk.frameworks.Carbon]; pkgs.darwin.apple_sdk.frameworks.Carbon];

6
pkgs/development/libraries/cppdb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, sqlite, libmysql, postgresql, unixODBC }: { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cppdb"; name = "cppdb";
@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake sqlite libmysql postgresql unixODBC ]; buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
cmakeFlags = [ "--no-warn-unused-cli" ]; cmakeFlags = [ "--no-warn-unused-cli" ];
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://cppcms.com/sql/cppdb/; homepage = http://cppcms.com/sql/cppdb/;
@ -23,4 +24,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.juliendehos ]; maintainers = [ maintainers.juliendehos ];
}; };
} }

4
pkgs/development/libraries/kdb/default.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, fetchurl, mkDerivation, lib, fetchurl,
extra-cmake-modules, extra-cmake-modules,
qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
}: }:
mkDerivation rec { mkDerivation rec {
@ -16,7 +16,7 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
propagatedBuildInputs = [ qtbase ]; propagatedBuildInputs = [ qtbase ];

8
pkgs/development/libraries/unixODBCDrivers/default.nix
View File

@ -43,13 +43,6 @@
"-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
]; ];
preConfigure = ''
sed -i \
-e 's,mariadb_config,mysql_config,g' \
-e 's,libmariadbclient,libmysqlclient,g' \
cmake/FindMariaDB.cmake
'';
passthru = { passthru = {
fancyName = "MariaDB"; fancyName = "MariaDB";
driver = "lib/libmyodbc3-3.51.12.so"; driver = "lib/libmyodbc3-3.51.12.so";
@ -60,7 +53,6 @@
homepage = https://downloads.mariadb.org/connector-odbc/; homepage = https://downloads.mariadb.org/connector-odbc/;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
}; };

6
pkgs/development/libraries/wt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
, pcre , pcre
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cmake boost doxygen qt48Full libharu cmake boost doxygen qt48Full libharu
pango fcgi firebird libmysql postgresql graphicsmagick glew pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
openssl pcre openssl pcre
]; ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11" "-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}" "-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${libmysql}" "-DMYSQL_PREFIX=${mysql.connector-c}"
"--no-warn-unused-cli" "--no-warn-unused-cli"
]; ];

6
pkgs/development/tools/misc/sysbench/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
libaio }: , libaio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sysbench-1.0.6"; name = "sysbench-1.0.6";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ vim libmysql libaio ]; buildInputs = [ vim mysql.connector-c libaio ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akopytov"; owner = "akopytov";

6
pkgs/games/zod/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
, libmysql, makeWrapper }: , mysql, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zod-engine-2011-03-18"; name = "zod-engine-2011-03-18";
@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
sourceRoot=`pwd`/src sourceRoot=`pwd`/src
''; '';
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/zod mkdir -p $out/bin $out/share/zod

9
pkgs/servers/clickhouse/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }: { stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools
, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC
, zookeeper_mt, zstd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clickhouse-${version}"; name = "clickhouse-${version}";
@ -16,7 +18,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libtool ]; nativeBuildInputs = [ cmake libtool ];
buildInputs = [ boost double-conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ]; buildInputs = [
boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco
re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd
];
cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];

6
pkgs/servers/freeradius/default.nix
View File

@ -13,7 +13,7 @@
, withMemcached ? false , withMemcached ? false
, hiredis , hiredis
, withRedis ? false , withRedis ? false
, libmysql , mysql
, withMysql ? false , withMysql ? false
, json_c , json_c
, withJson ? false , withJson ? false
@ -29,7 +29,7 @@ assert withPcap -> libpcap != null;
assert withCap -> libcap != null; assert withCap -> libcap != null;
assert withMemcached -> libmemcached != null; assert withMemcached -> libmemcached != null;
assert withRedis -> hiredis != null; assert withRedis -> hiredis != null;
assert withMysql -> libmysql != null; assert withMysql -> mysql != null;
assert withYubikey -> libyubikey != null; assert withYubikey -> libyubikey != null;
assert withCollectd -> collectd != null; assert withCollectd -> collectd != null;
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ optional withCap libcap ++ optional withCap libcap
++ optional withMemcached libmemcached ++ optional withMemcached libmemcached
++ optional withRedis hiredis ++ optional withRedis hiredis
++ optional withMysql libmysql ++ optional withMysql mysql.connector-c
++ optional withJson json_c ++ optional withJson json_c
++ optional withYubikey libyubikey ++ optional withYubikey libyubikey
++ optional withCollectd collectd; ++ optional withCollectd collectd;

4
pkgs/servers/mail/dovecot/default.nix
View File

@ -2,7 +2,7 @@
, bzip2, zlib, inotify-tools, pam, libcap , bzip2, zlib, inotify-tools, pam, libcap
, clucene_core_2, icu, openldap , clucene_core_2, icu, openldap
# Auth modules # Auth modules
, withMySQL ? false, libmysql , withMySQL ? false, mysql
, withPgSQL ? false, postgresql , withPgSQL ? false, postgresql
, withSQLite ? true, sqlite , withSQLite ? true, sqlite
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
++ lib.optional withMySQL libmysql ++ lib.optional withMySQL mysql.connector-c
++ lib.optional withPgSQL postgresql ++ lib.optional withPgSQL postgresql
++ lib.optional withSQLite sqlite; ++ lib.optional withSQLite sqlite;

10
pkgs/servers/mail/opensmtpd/extras.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, openssl, libevent, libasr, { stdenv, fetchurl, openssl, libevent, libasr,
python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }: python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opensmtpd-extras-${version}"; name = "opensmtpd-extras-${version}";
version = "5.7.1"; version = "5.7.1";
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libevent buildInputs = [ openssl libevent
libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ]; libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
"--with-perl=${perl}" "--with-perl=${perl}"
"--with-filter-perl" "--with-filter-perl"
] ++ stdenv.lib.optional (mariadb != null) [ ] ++ stdenv.lib.optional (mysql != null) [
"--with-table-mysql" "--with-table-mysql"
] ++ stdenv.lib.optional (postgresql != null) [ ] ++ stdenv.lib.optional (postgresql != null) [
@ -67,7 +68,8 @@ stdenv.mkDerivation rec {
"--with-table-redis" "--with-table-redis"
]; ];
NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++
stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/; homepage = https://www.opensmtpd.org/;

6
pkgs/tools/backup/bareos/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
}: }:
assert sqlite != null || postgresql != null || libmysql != null; assert sqlite != null || postgresql != null || mysql != null;
with stdenv.lib; with stdenv.lib;
let let
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}" ++ optional (jansson != null) "--with-jansson=${jansson}"

4
pkgs/tools/security/thc-hydra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql { stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
, withGUI ? false, makeWrapper, pkgconfig, gtk2 }: , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
let let
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ] buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
++ lib.optional withGUI gtk2; ++ lib.optional withGUI gtk2;
postInstall = lib.optionalString withGUI '' postInstall = lib.optionalString withGUI ''

7
pkgs/tools/system/collectd/default.nix
View File

@ -20,7 +20,7 @@
, libtool ? null , libtool ? null
, lm_sensors ? null , lm_sensors ? null
, lvm2 ? null , lvm2 ? null
, libmysql ? null , mysql ? null
, postgresql ? null , postgresql ? null
, protobufc ? null , protobufc ? null
, python ? null , python ? null
@ -50,9 +50,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl libdbi libgcrypt libmemcached curl libdbi libgcrypt libmemcached
cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
libxml2 libmysql postgresql protobufc rrdtool libxml2 postgresql protobufc rrdtool
varnish yajl jdk libtool python hiredis libmicrohttpd varnish yajl jdk libtool python hiredis libmicrohttpd
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
++ stdenv.lib.optionals stdenv.isLinux [
iptables libatasmart libcredis libmodbus libsigrok iptables libatasmart libcredis libmodbus libsigrok
lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [

9
pkgs/tools/system/rsyslog/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@ -22,11 +22,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis rabbitmq-c hiredis
] ++ stdenv.lib.optional stdenv.isLinux systemd; ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
++ stdenv.lib.optional stdenv.isLinux systemd;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
(mkFlag false "valgrind") (mkFlag false "valgrind")
(mkFlag false "diagtools") (mkFlag false "diagtools")
(mkFlag true "usertools") (mkFlag true "usertools")
(mkFlag (libmysql != null) "mysql") (mkFlag (mysql != null) "mysql")
(mkFlag (postgresql != null) "pgsql") (mkFlag (postgresql != null) "pgsql")
(mkFlag (libdbi != null) "libdbi") (mkFlag (libdbi != null) "libdbi")
(mkFlag (net_snmp != null) "snmp") (mkFlag (net_snmp != null) "snmp")

3
pkgs/top-level/all-packages.nix
View File

@ -1254,7 +1254,7 @@ with pkgs;
libkrb5 = null; libkrb5 = null;
systemd = null; systemd = null;
jemalloc = null; jemalloc = null;
libmysql = null; mysql = null;
postgresql = null; postgresql = null;
libdbi = null; libdbi = null;
net_snmp = null; net_snmp = null;
@ -1508,7 +1508,6 @@ with pkgs;
convertlit = callPackage ../tools/text/convertlit { }; convertlit = callPackage ../tools/text/convertlit { };
collectd = callPackage ../tools/system/collectd { collectd = callPackage ../tools/system/collectd {
libmysql = mysql.connector-c;
libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
}; };