Browse Source

Revert "Merge branch 'staging-next'"

This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
openssl
Vladimír Čunát 3 years ago
parent
commit
f8a8fc6c7c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 12
      doc/languages-frameworks/gnome.xml
  2. 5
      nixos/modules/services/networking/networkmanager.nix
  3. 8
      pkgs/applications/gis/grass/default.nix
  4. 2
      pkgs/applications/graphics/gnome-photos/default.nix
  5. 4
      pkgs/applications/misc/mysql-workbench/default.nix
  6. 4
      pkgs/applications/office/kexi/default.nix
  7. 4
      pkgs/applications/office/libreoffice/default.nix
  8. 4
      pkgs/applications/office/libreoffice/still.nix
  9. 2
      pkgs/applications/science/electronics/kicad/default.nix
  10. 4
      pkgs/applications/science/math/glsurf/default.nix
  11. 4
      pkgs/applications/video/kodi/default.nix
  12. 26
      pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
  13. 2
      pkgs/desktops/deepin/dde-daemon/default.nix
  14. 2
      pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
  15. 4
      pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
  16. 8
      pkgs/development/compilers/gerbil/build.nix
  17. 4
      pkgs/development/compilers/hhvm/default.nix
  18. 4
      pkgs/development/compilers/neko/default.nix
  19. 8
      pkgs/development/compilers/urweb/default.nix
  20. 2
      pkgs/development/haskell-modules/configuration-nix.nix
  21. 2
      pkgs/development/interpreters/perl/sw_vers.patch
  22. 8
      pkgs/development/interpreters/php/default.nix
  23. 6
      pkgs/development/libraries/cppdb/default.nix
  24. 6
      pkgs/development/libraries/expat/default.nix
  25. 4
      pkgs/development/libraries/gdal/2.4.0.nix
  26. 4
      pkgs/development/libraries/gdal/default.nix
  27. 16
      pkgs/development/libraries/giflib/5.1.nix
  28. 4
      pkgs/development/libraries/kdb/default.nix
  29. 6
      pkgs/development/libraries/libagar/default.nix
  30. 10
      pkgs/development/libraries/libdbi-drivers/default.nix
  31. 6
      pkgs/development/libraries/libgda/default.nix
  32. 24
      pkgs/development/libraries/libgdiplus/default.nix
  33. 4
      pkgs/development/libraries/librdf/redland.nix
  34. 8
      pkgs/development/libraries/opendbx/default.nix
  35. 8
      pkgs/development/libraries/openssl/default.nix
  36. 6
      pkgs/development/libraries/poco/default.nix
  37. 6
      pkgs/development/libraries/qt-3/default.nix
  38. 6
      pkgs/development/libraries/qt-4.x/4.8/default.nix
  39. 12
      pkgs/development/libraries/qt-5/modules/qtbase.nix
  40. 4
      pkgs/development/libraries/tntdb/default.nix
  41. 17
      pkgs/development/libraries/unixODBCDrivers/default.nix
  42. 6
      pkgs/development/libraries/wt/default.nix
  43. 8
      pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
  44. 4
      pkgs/development/lisp-modules/shell.nix
  45. 6
      pkgs/development/lua-modules/overrides.nix
  46. 4
      pkgs/development/ocaml-modules/mysql/default.nix
  47. 4
      pkgs/development/perl-modules/DBD-mysql/default.nix
  48. 6
      pkgs/development/pure-modules/glpk/default.nix
  49. 11
      pkgs/development/python-modules/cryptography/default.nix
  50. 6
      pkgs/development/python-modules/mysqlclient/default.nix
  51. 3
      pkgs/development/python-modules/pyopenssl/default.nix
  52. 4
      pkgs/development/r-modules/default.nix
  53. 6
      pkgs/development/ruby-modules/gem-config/default.nix
  54. 19
      pkgs/development/tools/misc/patchelf/default.nix
  55. 26
      pkgs/development/tools/misc/patchelf/unstable.nix
  56. 4
      pkgs/development/tools/misc/sysbench/default.nix
  57. 6
      pkgs/development/tools/tora/default.nix
  58. 6
      pkgs/games/zod/default.nix
  59. 6
      pkgs/os-specific/linux/firmware/fwupd/default.nix
  60. 2
      pkgs/os-specific/linux/kexectools/default.nix
  61. 4
      pkgs/servers/clickhouse/default.nix
  62. 4
      pkgs/servers/computing/slurm/default.nix
  63. 6
      pkgs/servers/freeradius/default.nix
  64. 6
      pkgs/servers/http/lighttpd/default.nix
  65. 4
      pkgs/servers/mail/dovecot/default.nix
  66. 12
      pkgs/servers/mail/exim/default.nix
  67. 6
      pkgs/servers/mail/opensmtpd/extras.nix
  68. 6
      pkgs/servers/mail/postfix/default.nix
  69. 4
      pkgs/servers/monitoring/plugins/default.nix
  70. 4
      pkgs/servers/monitoring/zabbix/proxy.nix
  71. 4
      pkgs/servers/monitoring/zabbix/server.nix
  72. 6
      pkgs/servers/sql/mariadb/connector-c/3_1.nix
  73. 54
      pkgs/servers/sql/mariadb/connector-c/default.nix
  74. 98
      pkgs/servers/sql/mariadb/default.nix
  75. 6
      pkgs/servers/sql/mariadb/galera/25.nix
  76. 63
      pkgs/servers/sql/mariadb/galera/default.nix
  77. 4
      pkgs/servers/uwsgi/default.nix
  78. 8
      pkgs/tools/backup/bareos/default.nix
  79. 4
      pkgs/tools/backup/mydumper/default.nix
  80. 4
      pkgs/tools/graphics/zbar/default.nix
  81. 6
      pkgs/tools/networking/kea/default.nix
  82. 8
      pkgs/tools/networking/mailutils/default.nix
  83. 6
      pkgs/tools/networking/maxscale/default.nix
  84. 7
      pkgs/tools/networking/modem-manager/default.nix
  85. 5
      pkgs/tools/networking/network-manager/default.nix
  86. 4
      pkgs/tools/security/thc-hydra/default.nix
  87. 4
      pkgs/tools/system/collectd/default.nix
  88. 6
      pkgs/tools/system/rsyslog/default.nix
  89. 1
      pkgs/top-level/aliases.nix
  90. 24
      pkgs/top-level/all-packages.nix

12
doc/languages-frameworks/gnome.xml

@ -210,7 +210,7 @@ mkDerivation {
dontWrapGApps = true;
# Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
qtWrapperArgs = [
qtWrapperArgs [
"\${gappsWrapperArgs[@]}"
];
}
@ -258,16 +258,6 @@ mkDerivation {
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="ssec-gnome-common-issues-weird-location">
<term>
I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
</term>
<listitem>
<para>
You can manually trigger the wrapping with <function>wrapGApp</function> in <literal>preFixup</literal> phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to <function xlink:href="#fun-wrapProgram">wrapProgram</function> function.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
</section>

5
nixos/modules/services/networking/networkmanager.nix

@ -468,16 +468,12 @@ in {
mkdir -m 700 -p /etc/ipsec.d
mkdir -m 755 -p ${stateDirs}
'';
aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
};
systemd.services.NetworkManager-wait-online = {
wantedBy = [ "network-online.target" ];
};
systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
@ -499,7 +495,6 @@ in {
# useful binaries for user-specified hooks
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
};
# Turn off NixOS' network management when networking is managed entirely by NetworkManager

8
pkgs/applications/gis/grass/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
libLAS proj-datumgrid ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
"--with-postgres-libs=${postgresql.lib}/lib/"
# it complains about missing libmysqld but doesn't really seem to need it
"--with-mysql"
"--with-mysql-includes=${libmysqlclient}/include/mysql"
"--with-mysql-libs=${libmysqlclient}/lib/mysql"
"--with-mysql-includes=${mysql.connector-c}/include/mysql"
"--with-mysql-libs=${mysql.connector-c}/lib/mysql"
"--with-blas"
"--with-liblas=${libLAS}/bin/liblas-config"
];

2
pkgs/applications/graphics/gnome-photos/default.nix

@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
'';
passthru = {

4
pkgs/applications/misc/mysql-workbench/default.nix

@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
find -L "$out/bin" -type f -executable -print0 \
| while IFS= read -r -d ''' file; do
if [[ "''${file}" != *-bin ]]; then
echo "Wrapping program $file"
wrapGApp "$file"
echo "Wrapping program ''${file}"
wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
fi
done
'';

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

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

4
pkgs/applications/office/libreoffice/default.nix

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
gst_all_1.gst-plugins-base glib mysql.connector-c
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf

4
pkgs/applications/office/libreoffice/still.nix

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
gst_all_1.gst-plugins-base glib mysql.connector-c
neon nspr nss openldap openssl ORBit2 pam perl poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf

2
pkgs/applications/science/electronics/kicad/default.nix

@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
wrapGApp "$out/bin/kicad"
wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
'';
meta = {

4
pkgs/applications/science/math/glsurf/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
}:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl

4
pkgs/applications/video/kodi/default.nix

@ -13,7 +13,7 @@
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
, lzo, libcdio, libmodplug, libass, libbluray
, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
, sqlite, mysql, nasm, gnutls, libva, libdrm
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid, libmicrohttpd
@ -161,7 +161,7 @@ in stdenv.mkDerivation {
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
sqlite libmysqlclient avahi lame
sqlite mysql.connector-c avahi lame
curl bzip2 zip unzip glxinfo xdpyinfo
libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring

26
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh

@ -1,19 +1,12 @@
# shellcheck shell=bash
gappsWrapperArgs=()
find_gio_modules() {
if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
fi
}
addEnvHooks "${targetOffset:?}" find_gio_modules
wrapGApp() {
local program="$1"
shift 1
wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
}
addEnvHooks "$targetOffset" find_gio_modules
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
wrapGAppsHook() {
@ -33,19 +26,20 @@ wrapGAppsHook() {
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
fi
if [ -d "${prefix:?}/share" ]; then
if [ -d "$prefix/share" ]; then
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
fi
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
fi
for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
gappsWrapperArgs+=(--prefix "$v" : "${!v}")
for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
eval local dummy="\$$v"
gappsWrapperArgs+=(--prefix $v : "$dummy")
done
if [[ -z "${dontWrapGApps:-}" ]]; then
if [[ -z "$dontWrapGApps" ]]; then
targetDirsThatExist=()
targetDirsRealPath=()
@ -58,7 +52,7 @@ wrapGAppsHook() {
find "${targetDir}" -type f -executable -print0 \
| while IFS= read -r -d '' file; do
echo "Wrapping program '${file}'"
wrapGApp "${file}"
wrapProgram "${file}" "${gappsWrapperArgs[@]}"
done
fi
done
@ -77,7 +71,7 @@ wrapGAppsHook() {
fi
done
echo "Wrapping link: '$linkPath'"
wrapGApp "${linkPath}"
wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
done
fi
fi

2
pkgs/desktops/deepin/dde-daemon/default.nix

@ -115,7 +115,7 @@ buildGoPackage rec {
postFixup = ''
# wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
for binary in $out/lib/deepin-daemon/*; do
wrapGApp "$binary"
wrapProgram $binary "''${gappsWrapperArgs[@]}"
done
searchHardCodedPaths $out # debugging

2
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
-i $file
wrapGApp "$file"
wrapProgram $file "''${gappsWrapperArgs[@]}"
done
'';

4
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix

@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
postFixup = ''
# Let’s wrap the daemons
for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
echo "Wrapping program $file"
wrapGApp "$file"
echo "Wrapping program ''${file}"
wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
done
'';

8
pkgs/development/compilers/gerbil/build.nix

@ -1,6 +1,6 @@
{ stdenv, makeStaticLibraries,
coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
version, git-version, gambit, src }:
# TODO: distinct packages for gerbil-release and gerbil-devel
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
postPatch = ''
echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
EOF

4
pkgs/development/compilers/hhvm/default.nix

@ -2,7 +2,7 @@
, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
[ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5

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

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

8
pkgs/development/compilers/urweb/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, file, openssl, mlton
, libmysqlclient, postgresql, sqlite, gcc, icu
, mysql, postgresql, sqlite, gcc, icu
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
};
buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
preConfigure = ''
export PGHEADER="${postgresql}/include/libpq-fe.h";
export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
export SQHEADER="${sqlite.dev}/include/sqlite3.h";
export CC="${gcc}/bin/gcc";
export CCARGS="-I$out/include \
-L${openssl.out}/lib \
-L${libmysqlclient}/lib \
-L${mysql.connector-c}/lib \
-L${postgresql.lib}/lib \
-L${sqlite.out}/lib";
'';

2
pkgs/development/haskell-modules/configuration-nix.nix

@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
# Use the default version of mysql to build this package (which is actually mariadb).
# test phase requires networking
mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
# CUDA needs help finding the SDK headers and libraries.
cuda = overrideCabal super.cuda (drv: {

2
pkgs/development/interpreters/perl/sw_vers.patch

@ -7,7 +7,7 @@ index afadf53..80b7533 100644
# "ProductVersion: 10.10.5" "10.10"
# "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+ prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
+ prodvers="10.10"
case "$prodvers" in
10.*)
add_macosx_version_min ccflags $prodvers

8
pkgs/development/interpreters/php/default.nix

@ -1,6 +1,6 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@ -64,7 +64,7 @@ let
}:
let
mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
in stdenv.mkDerivation {
@ -149,9 +149,9 @@ let
++ optional postgresqlSupport "--with-pgsql=${postgresql}"
++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
++ optionals mysqliSupport [
"--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
"--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
]
++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"

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

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

6
pkgs/development/libraries/expat/default.nix

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "expat-2.2.8";
name = "expat-2.2.7";
src = fetchurl {
url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
url = "mirror://sourceforge/expat/${name}.tar.bz2";
sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
};
outputs = [ "out" "dev" ]; # TODO: fix referrers

4
pkgs/development/libraries/gdal/2.4.0.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2
, netcdfSupport ? true, netcdf, hdf5, curl
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
"--with-poppler=${poppler.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${libmysqlclient}/bin/mysql_config"
"--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
"--with-geotiff=${libgeotiff.dev}"
"--with-sqlite3=${sqlite.dev}"
"--with-spatialite=${libspatialite}"

4
pkgs/development/libraries/gdal/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2, autoreconfHook
, netcdfSupport ? true, netcdf, hdf5, curl
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"--with-poppler=${poppler.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${libmysqlclient}/bin/mysql_config"
"--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
"--with-sqlite3=${sqlite.dev}"
"--with-spatialite=${libspatialite}"

16
pkgs/development/libraries/giflib/default.nix → pkgs/development/libraries/giflib/5.1.nix

@ -1,24 +1,18 @@
{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
stdenv.mkDerivation rec {
name = "giflib-5.2.1";
stdenv.mkDerivation {
name = "giflib-5.1.4";
src = fetchurl {
url = "mirror://sourceforge/giflib/${name}.tar.gz";
sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
};
postPatch = ''
substituteInPlace Makefile \
--replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
'';
buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
meta = {
description = "A library for reading and writing gif images";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
branch = "5.2";
branch = "5.1";
};
}

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

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

6
pkgs/development/libraries/libagar/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
, libsndfile, portaudio, libmysqlclient, fontconfig
, libsndfile, portaudio, mysql, fontconfig
}:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
@ -20,7 +20,7 @@ stdenv.mkDerivation {
"--with-gettext=${gettext}"
"--with-jpeg=${libjpeg.dev}"
"--with-gl=${libGLU_combined}"
"--with-mysql=${libmysqlclient}"
"--with-mysql=${mysql.connector-c}"
"--with-manpages=yes"
];
@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig libtool gettext ];
buildInputs = [
bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
];

10
pkgs/development/libraries/libdbi-drivers/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libdbi
, libmysqlclient ? null
, mysql ? null
, sqlite ? null
, postgresql ? null
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
};
buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
"--enable-libdbi"
"--with-dbi-incdir=${libdbi}/include"
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (libmysqlclient != null) [
] ++ optionals (mysql != null) [
"--with-mysql"
"--with-mysql-incdir=${libmysqlclient}/include/mysql"
"--with-mysql-libdir=${libmysqlclient}/lib/mysql"
"--with-mysql-incdir=${mysql.connector-c}/include/mysql"
"--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
] ++ optionals (sqlite != null) [
"--with-sqlite3"
"--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"

6
pkgs/development/libraries/libgda/default.nix

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
, overrideCC, gcc6
, mysqlSupport ? false, libmysqlclient ? null
, mysqlSupport ? false, mysql ? null
, postgresSupport ? false, postgresql ? null
}:
assert mysqlSupport -> libmysqlclient != null;
assert mysqlSupport -> mysql != null;
assert postgresSupport -> postgresql != null;
(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
++ optional (mysqlSupport) libmysqlclient
++ optional (mysqlSupport) mysql.connector-c
++ optional (postgresSupport) postgresql;
passthru = {

24
pkgs/development/libraries/libgdiplus/default.nix

@ -2,19 +2,33 @@
, libtiff, giflib, libjpeg, libpng
, libXrender, libexif, autoreconfHook, fetchpatch }:
stdenv.mkDerivation rec {
pname = "libgdiplus";
version = "6.0.2";
stdenv.mkDerivation {
name = "libgdiplus-5.6.1";
src = fetchFromGitHub {
owner = "mono";
repo = "libgdiplus";
rev = version;
sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
rev = "5.6.1";
sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
};
NIX_LDFLAGS = "-lgif";
patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
(fetchpatch {
url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
})
(fetchpatch {
url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
})
(fetchpatch {
url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
})
];
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/libraries/librdf/redland.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
, curl, pcre, libxml2, librdf_rasqal, gmp
, libmysqlclient, withMysql ? false
, mysql, withMysql ? false
, postgresql, withPostgresql ? false
, sqlite, withSqlite ? true
, db, withBdb ? false
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
++ stdenv.lib.optional withMysql libmysqlclient
++ stdenv.lib.optional withMysql mysql.connector-c
++ stdenv.lib.optional withSqlite sqlite
++ stdenv.lib.optional withPostgresql postgresql
++ stdenv.lib.optional withBdb db;

8
pkgs/development/libraries/opendbx/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
stdenv.mkDerivation rec {
name = "opendbx-1.4.6";
@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
export CPPFLAGS="-I${libmysqlclient}/include/mysql"
export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
'';
buildInputs = [ readline libmysqlclient postgresql sqlite ];
buildInputs = [ readline mysql.connector-c postgresql sqlite ];
meta = with stdenv.lib; {
description = "Extremely lightweight but extensible database access library written in C";

8
pkgs/development/libraries/openssl/default.nix

@ -127,8 +127,8 @@ let
in {
openssl_1_0_2 = common {
version = "1.0.2t";
sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
version = "1.0.2s";
sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
patches = [
./1.0.2/nix-ssl-cert-file.patch
@ -139,8 +139,8 @@ in {
};
openssl_1_1 = common {
version = "1.1.1d";
sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
version = "1.1.1c";
sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
patches = [
./1.1/nix-ssl-cert-file.patch

6
pkgs/development/libraries/poco/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
stdenv.mkDerivation rec {
pname = "poco";
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
MYSQL_DIR = libmysqlclient;
MYSQL_DIR = mysql.connector-c;
MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
cmakeFlags = [

6
pkgs/development/libraries/qt-3/default.nix

@ -5,7 +5,7 @@
, xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
, mysqlSupport ? false, libmysqlclient ? null
, mysqlSupport ? false, mysql ? null
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU_combined ? null, libXmu ? null
@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null;
assert cursorSupport -> libXcursor != null;
assert mysqlSupport -> libmysqlclient != null;
assert mysqlSupport -> mysql != null;
assert openglSupport -> libGLU_combined != null && libXmu != null;
stdenv.mkDerivation {
@ -62,7 +62,7 @@ stdenv.mkDerivation {
] ++ stdenv.lib.optionals cursorSupport [
"-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
] ++ stdenv.lib.optionals mysqlSupport [
"-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
"-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
] ++ stdenv.lib.optionals xftSupport [
"-L${libXft.out}/lib" "-I${libXft.dev}/include"
"-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"

6
pkgs/development/libraries/qt-4.x/4.8/default.nix

@ -2,7 +2,7 @@
, libXrender, libXinerama, libXcursor, libXv, libXext
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
(mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
"-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
"-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
"-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
"-exceptions" "-xmlpatterns"
@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ cups # Qt dlopen's libcups instead of linking to it
postgresql sqlite libjpeg libmng libtiff icu ]
++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
++ lib.optionals (mysql != null) [ mysql.connector-c ]
++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];

12
pkgs/development/libraries/qt-5/modules/qtbase.nix

@ -14,7 +14,7 @@
zlib,
# optional dependencies
cups ? null, libmysqlclient ? null, postgresql ? null,
cups ? null, mysql ? null, postgresql ? null,
withGtk3 ? false, dconf ? null, gtk3 ? null,
# options
@ -80,7 +80,7 @@ stdenv.mkDerivation {
)
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (libmysqlclient != null) libmysqlclient
++ lib.optional (mysql != null) mysql.connector-c
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs =
@ -285,7 +285,7 @@ stdenv.mkDerivation {
"-L" "${openssl.out}/lib"
"-I" "${openssl.dev}/include"
"-system-sqlite"
''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
''-${if mysql != null then "plugin" else "no"}-sql-mysql''
''-${if postgresql != null then "plugin" else "no"}-sql-psql''
"-make libs"
@ -349,9 +349,9 @@ stdenv.mkDerivation {
"-L" "${cups.lib}/lib"
"-I" "${cups.dev}/include"
]
++ lib.optionals (libmysqlclient != null) [
"-L" "${libmysqlclient}/lib"
"-I" "${libmysqlclient}/include"
++ lib.optionals (mysql != null) [
"-L" "${mysql.out}/lib"
"-I" "${mysql.out}/include"
]
);

4
pkgs/development/libraries/tntdb/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
stdenv.mkDerivation rec {
pname = "tntdb";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
};
buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
enableParallelBuilding = true;

17
pkgs/development/libraries/unixODBCDrivers/default.nix

@ -1,4 +1,4 @@
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
# I haven't done any parameter tweaking.. So the defaults provided here might be bad
@ -29,23 +29,18 @@
mariadb = stdenv.mkDerivation rec {
pname = "mariadb-connector-odbc";
version = "3.1.2";
version = "2.0.10";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
};