git.iko.soy/typeable/nixpkgs
on master help sign in
Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.

commit22a216849bf82ec65e3de86b7ea30e9c6b11efa4 authorVladimír Čunát <v@cunat.cz> dateSun 22 Sep 2019, 09:38 (7 years ago) parent415b299
90 files changed+428−367
doc/languages-frameworks/gnome.xml+11−1 nixos/modules/services/networking/networkmanager.nix+5 pkgs/applications/gis/grass/default.nix+4−4 pkgs/applications/graphics/gnome-photos/default.nix+1−1 pkgs/applications/misc/mysql-workbench/default.nix+2−2 pkgs/applications/office/kexi/default.nix+2−2 pkgs/applications/office/libreoffice/default.nix+2−2 pkgs/applications/office/libreoffice/still.nix+2−2 pkgs/applications/science/electronics/kicad/default.nix+1−1 pkgs/applications/science/math/glsurf/default.nix+2−2 pkgs/applications/video/kodi/default.nix+2−2 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+16−10 pkgs/desktops/deepin/dde-daemon/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+1−1 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2 pkgs/development/compilers/gerbil/build.nix+4−4 pkgs/development/compilers/hhvm/default.nix+2−2 pkgs/development/compilers/neko/default.nix+2−2 pkgs/development/compilers/urweb/default.nix+4−4 pkgs/development/haskell-modules/configuration-nix.nix+1−1 pkgs/development/interpreters/perl/sw_vers.patch+1−1 pkgs/development/interpreters/php/default.nix+4−4 pkgs/development/libraries/cppdb/default.nix+3−3 pkgs/development/libraries/expat/default.nix+3−3 pkgs/development/libraries/gdal/2.4.0.nix+2−2 pkgs/development/libraries/gdal/default.nix+2−2 pkgs/development/libraries/giflib/5.1.nix → pkgs/development/libraries/giflib/default.nix+11−5 pkgs/development/libraries/kdb/default.nix+2−2 pkgs/development/libraries/libagar/default.nix+3−3 pkgs/development/libraries/libdbi-drivers/default.nix+5−5 pkgs/development/libraries/libgda/default.nix+3−3 pkgs/development/libraries/libgdiplus/default.nix+5−19 pkgs/development/libraries/librdf/redland.nix+2−2 pkgs/development/libraries/opendbx/default.nix+4−4 pkgs/development/libraries/openssl/default.nix+4−4 pkgs/development/libraries/poco/default.nix+3−3 pkgs/development/libraries/qt-3/default.nix+3−3 pkgs/development/libraries/qt-4.x/4.8/default.nix+3−3 pkgs/development/libraries/qt-5/modules/qtbase.nix+6−6 pkgs/development/libraries/tntdb/default.nix+2−2 pkgs/development/libraries/unixODBCDrivers/default.nix+11−6 pkgs/development/libraries/wt/default.nix+3−3 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix+4−4 pkgs/development/lisp-modules/shell.nix+2−2 pkgs/development/lua-modules/overrides.nix+3−3 pkgs/development/ocaml-modules/mysql/default.nix+2−2 pkgs/development/perl-modules/DBD-mysql/default.nix+2−2 pkgs/development/pure-modules/glpk/default.nix+3−3 pkgs/development/python-modules/cryptography/default.nix+10−1 pkgs/development/python-modules/mysqlclient/default.nix+3−3 pkgs/development/python-modules/pyopenssl/default.nix+2−1 pkgs/development/r-modules/default.nix+2−2 pkgs/development/ruby-modules/gem-config/default.nix+3−3 pkgs/development/tools/misc/patchelf/default.nix+15−4 pkgs/development/tools/misc/patchelf/unstable.nix+10−16 pkgs/development/tools/misc/sysbench/default.nix+2−2 pkgs/development/tools/tora/default.nix+3−3 pkgs/games/zod/default.nix+3−3 pkgs/os-specific/linux/firmware/fwupd/default.nix+3−3 pkgs/os-specific/linux/kexectools/default.nix+1−1 pkgs/servers/clickhouse/default.nix+2−2 pkgs/servers/computing/slurm/default.nix+2−2 pkgs/servers/freeradius/default.nix+3−3 pkgs/servers/http/lighttpd/default.nix+3−3 pkgs/servers/mail/dovecot/default.nix+2−2 pkgs/servers/mail/exim/default.nix+6−6 pkgs/servers/mail/opensmtpd/extras.nix+3−3 pkgs/servers/mail/postfix/default.nix+3−3 pkgs/servers/monitoring/plugins/default.nix+2−2 pkgs/servers/monitoring/zabbix/proxy.nix+2−2 pkgs/servers/monitoring/zabbix/server.nix+2−2 pkgs/servers/sql/mariadb/connector-c/3_1.nix+6 pkgs/servers/sql/mariadb/connector-c/default.nix+54 pkgs/servers/sql/mariadb/default.nix−98 pkgs/servers/sql/mariadb/galera/25.nix+6 pkgs/servers/sql/mariadb/galera/default.nix+63 pkgs/servers/uwsgi/default.nix+2−2 pkgs/tools/backup/bareos/default.nix+4−4 pkgs/tools/backup/mydumper/default.nix+2−2 pkgs/tools/graphics/zbar/default.nix+3−1 pkgs/tools/networking/kea/default.nix+3−3 pkgs/tools/networking/mailutils/default.nix+4−4 pkgs/tools/networking/maxscale/default.nix+3−3 pkgs/tools/networking/modem-manager/default.nix−7 pkgs/tools/networking/network-manager/default.nix−5 pkgs/tools/security/thc-hydra/default.nix+2−2 pkgs/tools/system/collectd/default.nix+2−2 pkgs/tools/system/rsyslog/default.nix+3−3 pkgs/top-level/aliases.nix−1 pkgs/top-level/all-packages.nix+16−8
doc/languages-frameworks/gnome.xml+11−1
@@ -210,7 +210,7 @@ mkDerivation {
210210 dontWrapGApps = true;
211211
212212 # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
213− qtWrapperArgs [
213+ qtWrapperArgs = [
214214 "\${gappsWrapperArgs[@]}"
215215 ];
216216}
@@ -258,6 +258,16 @@ mkDerivation {
258258 </para>
259259 </listitem>
260260 </varlistentry>
261+ <varlistentry xml:id="ssec-gnome-common-issues-weird-location">
262+ <term>
263+ I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
264+ </term>
265+ <listitem>
266+ <para>
267+ 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.
268+ </para>
269+ </listitem>
270+ </varlistentry>
261271 </variablelist>
262272 </section>
263273</section>
nixos/modules/services/networking/networkmanager.nix+5
@@ -468,12 +468,16 @@ in {
468468 mkdir -m 700 -p /etc/ipsec.d
469469 mkdir -m 755 -p ${stateDirs}
470470 '';
471+
472+ aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
471473 };
472474
473475 systemd.services.NetworkManager-wait-online = {
474476 wantedBy = [ "network-online.target" ];
475477 };
476478
479+ systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
480+
477481 systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
478482 wantedBy = [ "NetworkManager.service" ];
479483 before = [ "NetworkManager.service" ];
@@ -495,6 +499,7 @@ in {
495499
496500 # useful binaries for user-specified hooks
497501 path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
502+ aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
498503 };
499504
500505 # Turn off NixOS' network management when networking is managed entirely by NetworkManager
pkgs/applications/gis/grass/default.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
22, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
3−, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
3+, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
44}:
55
66stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
19− readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
19+ readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
2020 libLAS proj-datumgrid ]
2121 ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
2222
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
3737 "--with-postgres-libs=${postgresql.lib}/lib/"
3838 # it complains about missing libmysqld but doesn't really seem to need it
3939 "--with-mysql"
40− "--with-mysql-includes=${mysql.connector-c}/include/mysql"
41− "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
40+ "--with-mysql-includes=${libmysqlclient}/include/mysql"
41+ "--with-mysql-libs=${libmysqlclient}/lib/mysql"
4242 "--with-blas"
4343 "--with-liblas=${libLAS}/bin/liblas-config"
4444 ];
pkgs/applications/graphics/gnome-photos/default.nix+1−1
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
102102 '';
103103
104104 postFixup = ''
105− wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
105+ wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
106106 '';
107107
108108 passthru = {
pkgs/applications/misc/mysql-workbench/default.nix+2−2
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
8585 find -L "$out/bin" -type f -executable -print0 \
8686 | while IFS= read -r -d ''' file; do
8787 if [[ "''${file}" != *-bin ]]; then
88− echo "Wrapping program ''${file}"
89− wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
88+ echo "Wrapping program $file"
89+ wrapGApp "$file"
9090 fi
9191 done
9292 '';
pkgs/applications/office/kexi/default.nix+2−2
@@ -4,7 +4,7 @@
44 breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
55 kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
66 kwidgetsaddons, kxmlgui,
7− kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
7+ kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql
88}:
99
1010mkDerivation rec {
@@ -23,7 +23,7 @@ mkDerivation rec {
2323 breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
2424 kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
2525 kwidgetsaddons kxmlgui
26− kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
26+ kdb kproperty kreport lcms2 libmysqlclient marble postgresql
2727 ];
2828
2929 propagatedUserEnvPkgs = [ kproperty ];
pkgs/applications/office/libreoffice/default.nix+2−2
@@ -4,7 +4,7 @@
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
55, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
66, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
7−, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
7+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
88, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
99, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
1010, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
361361 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
362362 libXaw libXext libXi libXinerama libxml2 libxslt libXtst
363363 libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
364− gst_all_1.gst-plugins-base glib mysql.connector-c
364+ gst_all_1.gst-plugins-base glib libmysqlclient
365365 neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
366366 python3 sablotron sane-backends unzip vigra which zip zlib
367367 mdds bluez5 libcmis libwps libabw libzmf
pkgs/applications/office/libreoffice/still.nix+2−2
@@ -4,7 +4,7 @@
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
55, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
66, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
7−, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
7+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
88, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
99, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
1010, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
358358 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
359359 libXaw libXext libXi libXinerama libxml2 libxslt libXtst
360360 libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
361− gst_all_1.gst-plugins-base glib mysql.connector-c
361+ gst_all_1.gst-plugins-base glib libmysqlclient
362362 neon nspr nss openldap openssl ORBit2 pam perl poppler
363363 python3 sablotron sane-backends unzip vigra which zip zlib
364364 mdds bluez5 libcmis libwps libabw libzmf
pkgs/applications/science/electronics/kicad/default.nix+1−1
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
107107 buildPythonPath "$out $pythonPath"
108108 gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
109109
110− wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
110+ wrapGApp "$out/bin/kicad"
111111 '';
112112
113113 meta = {
pkgs/applications/science/math/glsurf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
2−, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
2+, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
33}:
44
55stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
1111 };
1212
13− buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
13+ buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
1414 libtiff libjpeg libpng giflib ]
1515 ++ (with ocamlPackages; [
1616 ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
pkgs/applications/video/kodi/default.nix+2−2
@@ -13,7 +13,7 @@
1313, libmpeg2, libsamplerate, libmad
1414, libogg, libvorbis, flac, libxslt
1515, lzo, libcdio, libmodplug, libass, libbluray
16−, sqlite, mysql, nasm, gnutls, libva, libdrm
16+, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
1717, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
1818, libcec, libcec_platform, dcadec, libuuid
1919, libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
161161 libmpeg2 libsamplerate libmad
162162 libogg libvorbis flac libxslt systemd
163163 lzo libcdio libmodplug libass libbluray
164− sqlite mysql.connector-c avahi lame
164+ sqlite libmysqlclient avahi lame
165165 curl bzip2 zip unzip glxinfo xdpyinfo
166166 libcec libcec_platform dcadec libuuid
167167 libgcrypt libgpgerror libunistring
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+16−10
@@ -1,12 +1,19 @@
1+# shellcheck shell=bash
12gappsWrapperArgs=()
23
34find_gio_modules() {
4− if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
5+ if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
56 gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
67 fi
78}
89
9−addEnvHooks "$targetOffset" find_gio_modules
10+addEnvHooks "${targetOffset:?}" find_gio_modules
11+
12+wrapGApp() {
13+ local program="$1"
14+ shift 1
15+ wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
16+}
1017
1118# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
1219wrapGAppsHook() {
@@ -26,20 +33,19 @@ wrapGAppsHook() {
2633 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
2734 fi
2835
29− if [ -d "$prefix/share" ]; then
36+ if [ -d "${prefix:?}/share" ]; then
3037 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
3138 fi
3239
33− if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
40+ if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
3441 gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
3542 fi
3643
37− for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
38− eval local dummy="\$$v"
39− gappsWrapperArgs+=(--prefix $v : "$dummy")
44+ for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
45+ gappsWrapperArgs+=(--prefix "$v" : "${!v}")
4046 done
4147
42− if [[ -z "$dontWrapGApps" ]]; then
48+ if [[ -z "${dontWrapGApps:-}" ]]; then
4349 targetDirsThatExist=()
4450 targetDirsRealPath=()
4551
@@ -52,7 +58,7 @@ wrapGAppsHook() {
5258 find "${targetDir}" -type f -executable -print0 \
5359 | while IFS= read -r -d '' file; do
5460 echo "Wrapping program '${file}'"
55− wrapProgram "${file}" "${gappsWrapperArgs[@]}"
61+ wrapGApp "${file}"
5662 done
5763 fi
5864 done
@@ -71,7 +77,7 @@ wrapGAppsHook() {
7177 fi
7278 done
7379 echo "Wrapping link: '$linkPath'"
74− wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
80+ wrapGApp "${linkPath}"
7581 done
7682 fi
7783 fi
pkgs/desktops/deepin/dde-daemon/default.nix+1−1
@@ -115,7 +115,7 @@ buildGoPackage rec {
115115 postFixup = ''
116116 # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
117117 for binary in $out/lib/deepin-daemon/*; do
118− wrapProgram $binary "''${gappsWrapperArgs[@]}"
118+ wrapGApp "$binary"
119119 done
120120
121121 searchHardCodedPaths $out # debugging
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+1−1
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
6464 sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
6565 -i $file
6666
67− wrapProgram $file "''${gappsWrapperArgs[@]}"
67+ wrapGApp "$file"
6868 done
6969 '';
7070
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
7676 postFixup = ''
7777 # Let’s wrap the daemons
7878 for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
79− echo "Wrapping program ''${file}"
80− wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
79+ echo "Wrapping program $file"
80+ wrapGApp "$file"
8181 done
8282 '';
8383
pkgs/development/compilers/gerbil/build.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, makeStaticLibraries,
22 coreutils, rsync, bash,
3− openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
3+ openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
44 version, git-version, gambit, src }:
55
66# TODO: distinct packages for gerbil-release and gerbil-devel
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
1212 inherit src;
1313
1414 # Use makeStaticLibraries to enable creation of statically linked binaries
15− buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
15+ buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
1616 buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
1717
1818 buildInputs = [ gambit rsync bash ]
1919 ++ buildInputs_libraries ++ buildInputs_staticLibraries;
2020
21− NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
21+ NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
2222
2323 postPatch = ''
2424 echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
4040# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
4141# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
4242# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
43−MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
43+MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
4444# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
4545LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
4646EOF
pkgs/development/compilers/hhvm/default.nix+2−2
@@ -2,7 +2,7 @@
22, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
33, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
44, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
5−, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
5+, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
66, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
77}:
88
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 };
2020
2121 buildInputs =
22− [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
22+ [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
2323 libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
2424 oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
2525 libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
pkgs/development/compilers/neko/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
2−, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
2+, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
33}:
44
55stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake pkgconfig git ];
1515 buildInputs =
1616 [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
17− mysql.connector-c mbedtls openssl libpthreadstubs ]
17+ libmysqlclient mbedtls openssl libpthreadstubs ]
1818 ++ stdenv.lib.optional stdenv.isLinux gtk2
1919 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
2020 pkgs.darwin.apple_sdk.frameworks.Carbon];
pkgs/development/compilers/urweb/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, file, openssl, mlton
2−, mysql, postgresql, sqlite, gcc, icu
2+, libmysqlclient, postgresql, sqlite, gcc, icu
33}:
44
55stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
1212 };
1313
14− buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
14+ buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
1515
1616 prePatch = ''
1717 sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
2121
2222 preConfigure = ''
2323 export PGHEADER="${postgresql}/include/libpq-fe.h";
24− export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
24+ export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
2525 export SQHEADER="${sqlite.dev}/include/sqlite3.h";
2626
2727 export CC="${gcc}/bin/gcc";
2828 export CCARGS="-I$out/include \
2929 -L${openssl.out}/lib \
30− -L${mysql.connector-c}/lib \
30+ -L${libmysqlclient}/lib \
3131 -L${postgresql.lib}/lib \
3232 -L${sqlite.out}/lib";
3333 '';
pkgs/development/haskell-modules/configuration-nix.nix+1−1
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
5353
5454 # Use the default version of mysql to build this package (which is actually mariadb).
5555 # test phase requires networking
56− mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
56+ mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
5757
5858 # CUDA needs help finding the SDK headers and libraries.
5959 cuda = overrideCabal super.cuda (drv: {
pkgs/development/interpreters/perl/sw_vers.patch+1−1
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
77 # "ProductVersion: 10.10.5" "10.10"
88 # "ProductVersion: 10.11" "10.11"
99- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
10−+ prodvers="10.10"
10++ prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
1111 case "$prodvers" in
1212 10.*)
1313 add_macosx_version_min ccflags $prodvers
pkgs/development/interpreters/php/default.nix+4−4
@@ -1,6 +1,6 @@
11# pcre functionality is tested in nixos/tests/php-pcre.nix
22{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
3−, mysql, libxml2, readline, zlib, curl, postgresql, gettext
3+, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
44, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
55, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
66, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -64,7 +64,7 @@ let
6464 }:
6565
6666 let
67− mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
67+ mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
6868 libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
6969 in stdenv.mkDerivation {
7070
@@ -149,9 +149,9 @@ let
149149 ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
150150 ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
151151 ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
152− ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
152+ ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
153153 ++ optionals mysqliSupport [
154− "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
154+ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
155155 ]
156156 ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
157157 ++ optional bcmathSupport "--enable-bcmath"
pkgs/development/libraries/cppdb/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
1+{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
22
33stdenv.mkDerivation rec {
44 pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
1111
1212 enableParallelBuilding = true;
1313
14− buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
14+ buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
1515
1616 cmakeFlags = [ "--no-warn-unused-cli" ];
17− NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
17+ NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
1818
1919 meta = with stdenv.lib; {
2020 homepage = http://cppcms.com/sql/cppdb/;
pkgs/development/libraries/expat/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4− name = "expat-2.2.7";
4+ name = "expat-2.2.8";
55
66 src = fetchurl {
7− url = "mirror://sourceforge/expat/${name}.tar.bz2";
8− sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
7+ url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
8+ sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
99 };
1010
1111 outputs = [ "out" "dev" ]; # TODO: fix referrers
pkgs/development/libraries/gdal/2.4.0.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
2−, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
2+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
44, libiconv, libxml2
55, netcdfSupport ? true, netcdf, hdf5, curl
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 "--with-poppler=${poppler.dev}" # optional
3131 "--with-libz=${zlib.dev}" # optional
3232 "--with-pg=${postgresql}/bin/pg_config"
33− "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
33+ "--with-mysql=${libmysqlclient}/bin/mysql_config"
3434 "--with-geotiff=${libgeotiff.dev}"
3535 "--with-sqlite3=${sqlite.dev}"
3636 "--with-spatialite=${libspatialite}"
pkgs/development/libraries/gdal/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
2−, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
2+, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
44, libiconv, libxml2, autoreconfHook
55, netcdfSupport ? true, netcdf, hdf5, curl
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 "--with-poppler=${poppler.dev}" # optional
3939 "--with-libz=${zlib.dev}" # optional
4040 "--with-pg=${postgresql}/bin/pg_config"
41− "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
41+ "--with-mysql=${libmysqlclient}/bin/mysql_config"
4242 "--with-geotiff=${libgeotiff}"
4343 "--with-sqlite3=${sqlite.dev}"
4444 "--with-spatialite=${libspatialite}"
pkgs/development/libraries/giflib/5.1.nix → pkgs/development/libraries/giflib/default.nixrenamed+11−5
@@ -1,18 +1,24 @@
11{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
22
3−stdenv.mkDerivation {
4− name = "giflib-5.1.4";
3+stdenv.mkDerivation rec {
4+ name = "giflib-5.2.1";
55 src = fetchurl {
6− url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
7− sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
6+ url = "mirror://sourceforge/giflib/${name}.tar.gz";
7+ sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
88 };
99
10+ postPatch = ''
11+ substituteInPlace Makefile \
12+ --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
13+ '';
14+
1015 buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
16+
1117 meta = {
1218 description = "A library for reading and writing gif images";
1319 platforms = stdenv.lib.platforms.unix;
1420 license = stdenv.lib.licenses.mit;
1521 maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
16− branch = "5.1";
22+ branch = "5.2";
1723 };
1824}
pkgs/development/libraries/kdb/default.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib, fetchurl,
33 extra-cmake-modules,
4− qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
4+ qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
55}:
66
77mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
1515
1616 nativeBuildInputs = [ extra-cmake-modules ];
1717
18− buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
18+ buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
1919
2020 propagatedBuildInputs = [ qtbase ];
2121
pkgs/development/libraries/libagar/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
22, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
3−, libsndfile, portaudio, mysql, fontconfig
3+, libsndfile, portaudio, libmysqlclient, fontconfig
44}:
55
66let srcs = import ./srcs.nix { inherit fetchurl; }; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 "--with-gettext=${gettext}"
2121 "--with-jpeg=${libjpeg.dev}"
2222 "--with-gl=${libGLU_combined}"
23− "--with-mysql=${mysql.connector-c}"
23+ "--with-mysql=${libmysqlclient}"
2424 "--with-manpages=yes"
2525 ];
2626
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 nativeBuildInputs = [ pkgconfig libtool gettext ];
3030
3131 buildInputs = [
32− bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
32+ bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
3333 freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
3434 ];
3535
pkgs/development/libraries/libdbi-drivers/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, libdbi
2−, mysql ? null
2+, libmysqlclient ? null
33, sqlite ? null
44, postgresql ? null
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
1414 };
1515
16− buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
16+ buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
1717
1818 postPatch = ''
1919 sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
2626 "--enable-libdbi"
2727 "--with-dbi-incdir=${libdbi}/include"
2828 "--with-dbi-libdir=${libdbi}/lib"
29− ] ++ optionals (mysql != null) [
29+ ] ++ optionals (libmysqlclient != null) [
3030 "--with-mysql"
31− "--with-mysql-incdir=${mysql.connector-c}/include/mysql"
32− "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
31+ "--with-mysql-incdir=${libmysqlclient}/include/mysql"
32+ "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
3333 ] ++ optionals (sqlite != null) [
3434 "--with-sqlite3"
3535 "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
pkgs/development/libraries/libgda/default.nix+3−3
@@ -1,10 +1,10 @@
11{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
22, overrideCC, gcc6
3−, mysqlSupport ? false, mysql ? null
3+, mysqlSupport ? false, libmysqlclient ? null
44, postgresSupport ? false, postgresql ? null
55}:
66
7−assert mysqlSupport -> mysql != null;
7+assert mysqlSupport -> libmysqlclient != null;
88assert postgresSupport -> postgresql != null;
99
1010(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
2525
2626 nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
2727 buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
28− ++ optional (mysqlSupport) mysql.connector-c
28+ ++ optional (mysqlSupport) libmysqlclient
2929 ++ optional (postgresSupport) postgresql;
3030
3131 passthru = {
pkgs/development/libraries/libgdiplus/default.nix+5−19
@@ -2,33 +2,19 @@
22, libtiff, giflib, libjpeg, libpng
33, libXrender, libexif, autoreconfHook, fetchpatch }:
44
5−stdenv.mkDerivation {
6− name = "libgdiplus-5.6.1";
5+stdenv.mkDerivation rec {
6+ pname = "libgdiplus";
7+ version = "6.0.2";
78
89 src = fetchFromGitHub {
910 owner = "mono";
1011 repo = "libgdiplus";
11− rev = "5.6.1";
12− sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
12+ rev = version;
13+ sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
1314 };
1415
1516 NIX_LDFLAGS = "-lgif";
1617
17− patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
18− (fetchpatch {
19− url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
20− sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
21− })
22− (fetchpatch {
23− url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
24− sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
25− })
26− (fetchpatch {
27− url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
28− sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
29− })
30− ];
31−
3218 hardeningDisable = [ "format" ];
3319
3420 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/librdf/redland.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
22, curl, pcre, libxml2, librdf_rasqal, gmp
3−, mysql, withMysql ? false
3+, libmysqlclient, withMysql ? false
44, postgresql, withPostgresql ? false
55, sqlite, withSqlite ? true
66, db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ perl pkgconfig ];
1818
1919 buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
20− ++ stdenv.lib.optional withMysql mysql.connector-c
20+ ++ stdenv.lib.optional withMysql libmysqlclient
2121 ++ stdenv.lib.optional withSqlite sqlite
2222 ++ stdenv.lib.optional withPostgresql postgresql
2323 ++ stdenv.lib.optional withBdb db;
pkgs/development/libraries/opendbx/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
1+{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
22
33stdenv.mkDerivation rec {
44 name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
99 };
1010
1111 preConfigure = ''
12− export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
13− export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
12+ export CPPFLAGS="-I${libmysqlclient}/include/mysql"
13+ export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
1414 configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
1515 '';
1616
17− buildInputs = [ readline mysql.connector-c postgresql sqlite ];
17+ buildInputs = [ readline libmysqlclient postgresql sqlite ];
1818
1919 meta = with stdenv.lib; {
2020 description = "Extremely lightweight but extensible database access library written in C";
pkgs/development/libraries/openssl/default.nix+4−4
@@ -127,8 +127,8 @@ let
127127in {
128128
129129 openssl_1_0_2 = common {
130− version = "1.0.2s";
131− sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
130+ version = "1.0.2t";
131+ sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
132132 patches = [
133133 ./1.0.2/nix-ssl-cert-file.patch
134134
@@ -139,8 +139,8 @@ in {
139139 };
140140
141141 openssl_1_1 = common {
142− version = "1.1.1c";
143− sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
142+ version = "1.1.1d";
143+ sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
144144 patches = [
145145 ./1.1/nix-ssl-cert-file.patch
146146
pkgs/development/libraries/poco/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
1+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
22
33stdenv.mkDerivation rec {
44 pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ cmake pkgconfig ];
1414
15− buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
15+ buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
1616
17− MYSQL_DIR = mysql.connector-c;
17+ MYSQL_DIR = libmysqlclient;
1818 MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
1919
2020 cmakeFlags = [
pkgs/development/libraries/qt-3/default.nix+3−3
@@ -5,7 +5,7 @@
55, xineramaSupport ? true, libXinerama ? null
66, cursorSupport ? true, libXcursor ? null
77, threadSupport ? true
8−, mysqlSupport ? false, mysql ? null
8+, mysqlSupport ? false, libmysqlclient ? null
99, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
1010, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
1111, libGLU_combined ? null, libXmu ? null
@@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
1616assert xrenderSupport -> xftSupport && libXrender != null;
1717assert xrandrSupport -> libXrandr != null;
1818assert cursorSupport -> libXcursor != null;
19−assert mysqlSupport -> mysql != null;
19+assert mysqlSupport -> libmysqlclient != null;
2020assert openglSupport -> libGLU_combined != null && libXmu != null;
2121
2222stdenv.mkDerivation {
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
6262 ] ++ stdenv.lib.optionals cursorSupport [
6363 "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
6464 ] ++ stdenv.lib.optionals mysqlSupport [
65− "-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
65+ "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
6666 ] ++ stdenv.lib.optionals xftSupport [
6767 "-L${libXft.out}/lib" "-I${libXft.dev}/include"
6868 "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
pkgs/development/libraries/qt-4.x/4.8/default.nix+3−3
@@ -2,7 +2,7 @@
22, libXrender, libXinerama, libXcursor, libXv, libXext
33, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
44, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
5−, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
5+, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
66, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
77, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
88, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
166166 (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
167167 "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
168168
169− "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
169+ "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
170170
171171 "-exceptions" "-xmlpatterns"
172172
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
192192 buildInputs =
193193 [ cups # Qt dlopen's libcups instead of linking to it
194194 postgresql sqlite libjpeg libmng libtiff icu ]
195− ++ lib.optionals (mysql != null) [ mysql.connector-c ]
195+ ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
196196 ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
197197 ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
198198
pkgs/development/libraries/qt-5/modules/qtbase.nix+6−6
@@ -14,7 +14,7 @@
1414 zlib,
1515
1616 # optional dependencies
17− cups ? null, mysql ? null, postgresql ? null,
17+ cups ? null, libmysqlclient ? null, postgresql ? null,
1818 withGtk3 ? false, dconf ? null, gtk3 ? null,
1919
2020 # options
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
8080 )
8181 ++ lib.optional developerBuild gdb
8282 ++ lib.optional (cups != null) cups
83− ++ lib.optional (mysql != null) mysql.connector-c
83+ ++ lib.optional (libmysqlclient != null) libmysqlclient
8484 ++ lib.optional (postgresql != null) postgresql;
8585
8686 nativeBuildInputs =
@@ -285,7 +285,7 @@ stdenv.mkDerivation {
285285 "-L" "${openssl.out}/lib"
286286 "-I" "${openssl.dev}/include"
287287 "-system-sqlite"
288− ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
288+ ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
289289 ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
290290
291291 "-make libs"
@@ -349,9 +349,9 @@ stdenv.mkDerivation {
349349 "-L" "${cups.lib}/lib"
350350 "-I" "${cups.dev}/include"
351351 ]
352− ++ lib.optionals (mysql != null) [
353− "-L" "${mysql.out}/lib"
354− "-I" "${mysql.out}/include"
352+ ++ lib.optionals (libmysqlclient != null) [
353+ "-L" "${libmysqlclient}/lib"
354+ "-I" "${libmysqlclient}/include"
355355 ]
356356 );
357357
pkgs/development/libraries/tntdb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
1+{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
1010 };
1111
12− buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
12+ buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
1313
1414 enableParallelBuilding = true;
1515
pkgs/development/libraries/unixODBCDrivers/default.nix+11−6
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
1+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
22
33# I haven't done any parameter tweaking.. So the defaults provided here might be bad
44
@@ -29,18 +29,23 @@
2929
3030 mariadb = stdenv.mkDerivation rec {
3131 pname = "mariadb-connector-odbc";
32− version = "2.0.10";
32+ version = "3.1.2";
3333
3434 src = fetchurl {
35− url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
36− sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
35+ url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
36+ sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
3737 };
3838
3939 nativeBuildInputs = [ cmake ];
40− buildInputs = [ unixODBC mariadb.connector-c ];
40+ buildInputs = [ unixODBC libmysqlclient openssl ];
4141
4242 cmakeFlags = [
43− "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
43+ "-DWITH_OPENSSL=ON"
44+ ];
45+
46+ NIX_CFLAGS_COMPILE = [
47+ "-I${libmysqlclient}/include/mysql"
48+ "-L${libmysqlclient}/lib/mysql"
4449 ];
4550
4651 passthru = {
pkgs/development/libraries/wt/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
2−, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
2+, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
33, pcre, harfbuzz
44}:
55
@@ -22,7 +22,7 @@ let
2222 nativeBuildInputs = [ pkgconfig ];
2323 buildInputs = [
2424 cmake boost doxygen qt48Full libharu
25− pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
25+ pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
2626 openssl pcre
2727 ];
2828
@@ -30,7 +30,7 @@ let
3030 "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
3131 "-DWT_CPP_11_MODE=-std=c++11"
3232 "-DGM_PREFIX=${graphicsmagick}"
33− "-DMYSQL_PREFIX=${mysql.connector-c}"
33+ "-DMYSQL_PREFIX=${libmysqlclient}"
3434 "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
3535 "--no-warn-unused-cli"
3636 ];
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix+4−4
@@ -53,11 +53,11 @@ in
5353 cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
5454 cl-async-test = addNativeLibs [pkgs.openssl];
5555 clsql = x: {
56− propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
56+ propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
5757 overrides = y: (x.overrides y) // {
5858 preConfigure = ((x.overrides y).preConfigure or "") + ''
59− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"
60− export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"
59+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
60+ export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
6161 '';
6262 };
6363 };
@@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
7777 };
7878 };
7979 cffi = addNativeLibs [pkgs.libffi];
80− cl-mysql = addNativeLibs [pkgs.mysql];
80+ cl-mysql = addNativeLibs [pkgs.libmysqlclient];
8181 cl-ppcre-template = x: {
8282 overrides = y: (x.overrides y) // {
8383 postPatch = ''
pkgs/development/lisp-modules/shell.nix+2−2
@@ -6,11 +6,11 @@ self = rec {
66 env = buildEnv { name = name; paths = buildInputs; };
77 buildInputs = [
88 gcc stdenv
9− openssl fuse libuv mysql.connector-c libfixposix libev sqlite
9+ openssl fuse libuv libmysqlclient libfixposix libev sqlite
1010 freetds
1111 lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
1212 ];
1313 CPATH = "${libfixposix}/include";
14− LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
14+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
1515};
1616in stdenv.mkDerivation self
pkgs/development/lua-modules/overrides.nix+3−3
@@ -154,12 +154,12 @@ with super;
154154 luadbi-mysql = super.luadbi-mysql.override({
155155 extraVariables = ''
156156 -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
157− MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
158− MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
157+ MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
158+ MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
159159 '';
160160 buildInputs = [
161161 pkgs.mysql.client
162− pkgs.mysql.connector-c
162+ pkgs.libmysqlclient
163163 ];
164164 });
165165
pkgs/development/ocaml-modules/mysql/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
1+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
22
33# TODO: la versione stabile da' un errore di compilazione dovuto a
44# qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 createFindlibDestdir = true;
2828
29− propagatedBuildInputs = [ mysql.connector-c ];
29+ propagatedBuildInputs = [ libmysqlclient ];
3030
3131 patches = [
3232 (fetchpatch {
pkgs/development/perl-modules/DBD-mysql/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
1+{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
22
33buildPerlPackage {
44 pname = "DBD-mysql";
@@ -9,7 +9,7 @@ buildPerlPackage {
99 sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
1010 };
1111
12− buildInputs = [ mysql.connector-c DevelChecklib ] ;
12+ buildInputs = [ libmysqlclient DevelChecklib ] ;
1313 propagatedBuildInputs = [ DBI ];
1414
1515 doCheck = false;
pkgs/development/pure-modules/glpk/default.nix+3−3
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl,
2− pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
2+ pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
33
44stdenv.mkDerivation rec {
55 baseName = "glpk";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 glpkWithExtras = lib.overrideDerivation glpk (attrs: {
15− propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
15+ propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
1616
1717 CPPFLAGS = "-I${gmp.dev}/include";
1818
1919 preConfigure = ''
2020 substituteInPlace configure \
21− --replace /usr/include/mysql ${mysql.connector-c}/include/mysql
21+ --replace /usr/include/mysql ${libmysqlclient}/include/mysql
2222 '';
2323 configureFlags = [ "--enable-dl"
2424 "--enable-odbc"
pkgs/development/python-modules/cryptography/default.nix+10−1
@@ -1,6 +1,7 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4+, fetchpatch
45, openssl
56, cryptography_vectors
67, darwin
@@ -49,10 +50,18 @@ buildPythonPackage rec {
4950 pytz
5051 ];
5152
53+ # remove when https://github.com/pyca/cryptography/issues/4998 is fixed
5254 checkPhase = ''
53− py.test --disable-pytest-warnings tests
55+ py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
5456 '';
5557
58+ patches = [
59+ (fetchpatch {
60+ url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
61+ sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
62+ })
63+ ];
64+
5665 # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
5766 # can do until nix 1.11's release
5867 __impureHostDeps = [ "/usr/lib" ];
pkgs/development/python-modules/mysqlclient/default.nix+3−3
@@ -1,15 +1,15 @@
1−{ stdenv, buildPythonPackage, fetchPypi, mysql }:
1+{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
22
33buildPythonPackage rec {
44 pname = "mysqlclient";
55 version = "1.4.4";
66
77 nativeBuildInputs = [
8− mysql.connector-c
8+ libmysqlclient
99 ];
1010
1111 buildInputs = [
12− mysql.connector-c
12+ libmysqlclient
1313 ];
1414
1515 # Tests need a MySQL database
pkgs/development/python-modules/pyopenssl/default.nix+2−1
@@ -9,6 +9,7 @@
99, pretend
1010, flaky
1111, glibcLocales
12+, six
1213}:
1314
1415with stdenv.lib;
@@ -84,7 +85,7 @@ buildPythonPackage rec {
8485 doCheck = !stdenv.isDarwin;
8586
8687 nativeBuildInputs = [ openssl ];
87− propagatedBuildInputs = [ cryptography pyasn1 idna ];
88+ propagatedBuildInputs = [ cryptography pyasn1 idna six ];
8889
8990 checkInputs = [ pytest pretend flaky glibcLocales ];
9091}
pkgs/development/r-modules/default.nix+2−2
@@ -325,7 +325,7 @@ let
325325 rmatio = [ pkgs.zlib.dev ];
326326 Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
327327 Rmpi = [ pkgs.openmpi ];
328− RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];
328+ RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
329329 RNetCDF = [ pkgs.netcdf pkgs.udunits ];
330330 RODBCext = [ pkgs.libiodbc ];
331331 RODBC = [ pkgs.libiodbc ];
@@ -810,7 +810,7 @@ let
810810 });
811811
812812 RMySQL = old.RMySQL.overrideDerivation (attrs: {
813− MYSQL_DIR=pkgs.mysql.connector-c;
813+ MYSQL_DIR="${pkgs.libmysqlclient}";
814814 preConfigure = ''
815815 patchShebangs configure
816816 '';
pkgs/development/ruby-modules/gem-config/default.nix+3−3
@@ -20,7 +20,7 @@
2020{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
2121, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
2222, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
23−, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
23+, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
2424, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
2525, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
2626, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -349,11 +349,11 @@ in
349349 };
350350
351351 mysql = attrs: {
352− buildInputs = [ mysql.connector-c zlib openssl ];
352+ buildInputs = [ libmysqlclient zlib openssl ];
353353 };
354354
355355 mysql2 = attrs: {
356− buildInputs = [ mysql.connector-c zlib openssl ];
356+ buildInputs = [ libmysqlclient zlib openssl ];
357357 };
358358
359359 ncursesw = attrs: {
pkgs/development/tools/misc/patchelf/default.nix+15−4
@@ -1,16 +1,27 @@
1−{ stdenv, fetchurl }:
1+{ stdenv, fetchurl, autoreconfHook }:
22
33stdenv.mkDerivation rec {
4− name = "patchelf-0.9";
4+ name = "patchelf-${version}";
5+ version = "0.10";
56
67 src = fetchurl {
78 url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
8− sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
9+ sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
910 };
1011
12+ # Drop test that fails on musl (?)
13+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
14+ substituteInPlace tests/Makefile.am \
15+ --replace "set-rpath-library.sh" ""
16+ '';
17+
1118 setupHook = [ ./setup-hook.sh ];
1219
13− doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
20+ nativeBuildInputs = [ autoreconfHook ];
21+ buildInputs = [ ];
22+
23+ # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
24+ doCheck = stdenv.hostPlatform.isMusl;
1425
1526 meta = with stdenv.lib; {
1627 homepage = https://nixos.org/patchelf.html;
pkgs/development/tools/misc/patchelf/unstable.nix+10−16
@@ -1,24 +1,18 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ stdenv, fetchurl, autoreconfHook }:
22
33stdenv.mkDerivation rec {
4− pname = "patchelf";
5− version = "0.10-pre-20190328";
4+ name = "patchelf-${version}";
5+ version = "0.10";
66
7− src = fetchFromGitHub {
8− owner = "NixOS";
9− repo = "patchelf";
10− rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
11− sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
7+ src = fetchurl {
8+ url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
9+ sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
1210 };
1311
1412 # Drop test that fails on musl (?)
1513 postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
1614 substituteInPlace tests/Makefile.am \
1715 --replace "set-rpath-library.sh" ""
18− '' +
19− # extend version identifier to more informative than "0.10".
20− ''
21− echo -n ${version} > version
2216 '';
2317
2418 setupHook = [ ./setup-hook.sh ];
@@ -28,11 +22,11 @@ stdenv.mkDerivation rec {
2822
2923 doCheck = !stdenv.isDarwin;
3024
31− meta = {
25+ meta = with stdenv.lib; {
3226 homepage = https://nixos.org/patchelf.html;
33− license = "GPL";
27+ license = licenses.gpl3;
3428 description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
35− maintainers = [ stdenv.lib.maintainers.eelco ];
36− platforms = stdenv.lib.platforms.all;
29+ maintainers = [ maintainers.eelco ];
30+ platforms = platforms.all;
3731 };
3832}
pkgs/development/tools/misc/sysbench/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
22, libaio }:
33
44stdenv.mkDerivation {
55 name = "sysbench-1.0.17";
66
77 nativeBuildInputs = [ autoreconfHook pkgconfig ];
8− buildInputs = [ vim mysql.connector-c libaio ];
8+ buildInputs = [ vim libmysqlclient libaio ];
99
1010 src = fetchFromGitHub {
1111 owner = "akopytov";
pkgs/development/tools/tora/default.nix+3−3
@@ -1,5 +1,5 @@
11{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
2−, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
2+, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
33, qscintilla, qtbase, qttools }:
44
55mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
1616 nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
1717
1818 buildInputs = [
19− boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
19+ boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
2020 ];
2121
2222 preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
4747 "-lssl"
4848 ];
4949
50− NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
50+ NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
5151
5252 qtWrapperArgs = [
5353 ''--prefix PATH : ${lib.getBin graphviz}/bin''
pkgs/games/zod/default.nix+3−3
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
2−, mysql, makeWrapper }:
2+, libmysqlclient, makeWrapper }:
33
44stdenv.mkDerivation {
55 name = "zod-engine-2011-03-18";
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
2424 sourceRoot=`pwd`/src
2525 '';
2626
27− buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
27+ buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
2828
29− NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
29+ NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
3030
3131 installPhase = ''
3232 mkdir -p $out/bin $out/share/zod
pkgs/os-specific/linux/firmware/fwupd/default.nix+3−3
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
237237 postFixup = ''
238238 find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
239239 | while IFS= read -r -d ''' file; do
240− if [[ "''${file}" != *.efi ]]; then
241− echo "Wrapping program ''${file}"
242− wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
240+ if [[ "$file" != *.efi ]]; then
241+ echo "Wrapping program $file"
242+ wrapGApp "$file"
243243 fi
244244 done
245245 '';
pkgs/os-specific/linux/kexectools/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 depsBuildBuild = [ buildPackages.stdenv.cc ];
1919 buildInputs = [ zlib ];
2020
21− patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
21+ patches = [
2222 # fix build on i686
2323 # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
2424 (fetchpatch {
pkgs/servers/clickhouse/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, cmake, libtool
22, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
3−, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
3+, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
44, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
55}:
66
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ cmake libtool ninja ];
1919 buildInputs = [
2020 boost capnproto cctz clang-unwrapped double-conversion gperftools icu
21− libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
21+ libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
2222 readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
2323 ];
2424
pkgs/servers/computing/slurm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
22, python, munge, perl, pam, openssl, zlib
3−, ncurses, mysql, gtk2, lua, hwloc, numactl
3+, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
44, readline, freeipmi, libssh2, xorg, lz4
55# enable internal X11 support via libssh2
66, enableX11 ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 nativeBuildInputs = [ pkgconfig libtool ];
3636 buildInputs = [
3737 curl python munge perl pam openssl zlib
38− mysql.connector-c ncurses gtk2 lz4
38+ libmysqlclient ncurses gtk2 lz4
3939 lua hwloc numactl readline freeipmi
4040 ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
4141
pkgs/servers/freeradius/default.nix+3−3
@@ -13,7 +13,7 @@
1313, withMemcached ? false
1414, hiredis
1515, withRedis ? false
16−, mysql
16+, libmysqlclient
1717, withMysql ? false
1818, json_c
1919, withJson ? false
@@ -31,7 +31,7 @@ assert withPcap -> libpcap != null;
3131assert withCap -> libcap != null;
3232assert withMemcached -> libmemcached != null;
3333assert withRedis -> hiredis != null;
34−assert withMysql -> mysql != null;
34+assert withMysql -> libmysqlclient != null;
3535assert withYubikey -> libyubikey != null;
3636assert withCollectd -> collectd != null;
3737assert withRest -> curl != null && withJson;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959 ++ optional withCap libcap
6060 ++ optional withMemcached libmemcached
6161 ++ optional withRedis hiredis
62− ++ optional withMysql mysql.connector-c
62+ ++ optional withMysql libmysqlclient
6363 ++ optional withJson json_c
6464 ++ optional withYubikey libyubikey
6565 ++ optional withCollectd collectd
pkgs/servers/http/lighttpd/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
22, openssl, enableMagnet ? false, lua5_1 ? null
3−, enableMysql ? false, mysql ? null
3+, enableMysql ? false, libmysqlclient ? null
44, enableLdap ? false, openldap ? null
55, enableWebDAV ? false, sqlite ? null, libuuid ? null
66, enableExtendedAttrs ? false, attr ? null
@@ -8,7 +8,7 @@
88}:
99
1010assert enableMagnet -> lua5_1 != null;
11−assert enableMysql -> mysql != null;
11+assert enableMysql -> libmysqlclient != null;
1212assert enableLdap -> openldap != null;
1313assert enableWebDAV -> sqlite != null;
1414assert enableWebDAV -> libuuid != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 nativeBuildInputs = [ pkgconfig ];
3434 buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
3535 ++ stdenv.lib.optional enableMagnet lua5_1
36− ++ stdenv.lib.optional enableMysql mysql.connector-c
36+ ++ stdenv.lib.optional enableMysql libmysqlclient
3737 ++ stdenv.lib.optional enableLdap openldap
3838 ++ stdenv.lib.optional enableWebDAV sqlite
3939 ++ stdenv.lib.optional enableWebDAV libuuid;
pkgs/servers/mail/dovecot/default.nix+2−2
@@ -3,7 +3,7 @@
33, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
44, nixosTests
55# Auth modules
6−, withMySQL ? false, mysql
6+, withMySQL ? false, libmysqlclient
77, withPgSQL ? false, postgresql
88, withSQLite ? true, sqlite
99}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs =
1616 [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
1717 ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
18− ++ lib.optional withMySQL mysql.connector-c
18+ ++ lib.optional withMySQL libmysqlclient
1919 ++ lib.optional withPgSQL postgresql
2020 ++ lib.optional withSQLite sqlite;
2121
pkgs/servers/mail/exim/default.nix+6−6
@@ -1,6 +1,6 @@
11{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
22, enableLDAP ? false, openldap
3−, enableMySQL ? false, mysql, zlib
3+, enableMySQL ? false, libmysqlclient, zlib
44, enableAuthDovecot ? false, dovecot
55, enablePAM ? false, pam
66, enableSPF ? true, libspf2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [ coreutils db openssl perl pcre ]
1919 ++ stdenv.lib.optional enableLDAP openldap
20− ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
20+ ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
2121 ++ stdenv.lib.optional enableAuthDovecot dovecot
2222 ++ stdenv.lib.optional enablePAM pam
2323 ++ stdenv.lib.optional enableSPF libspf2;
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
5353 ''}
5454 ${stdenv.lib.optionalString enableMySQL ''
5555 s:^# \(LOOKUP_MYSQL=yes\)$:\1:
56− s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
57− s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
58− s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
59− s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
56+ s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
57+ s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
58+ s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
59+ s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
6060 ''}
6161 ${stdenv.lib.optionalString enableAuthDovecot ''
6262 s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
pkgs/servers/mail/opensmtpd/extras.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, openssl, libevent, libasr,
2− python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
2+ python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
33 enablePython ? true,
44 enableLua ? true,
55 enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [ pkgconfig ];
2222 buildInputs = [ openssl libevent
23− libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
23+ libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
2424
2525 configureFlags = [
2626 "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
8080 stdenv.lib.optional enableRedis
8181 "-I${hiredis}/include/hiredis -lhiredis"
8282 ++ stdenv.lib.optional enableMysql
83− "-L${mysql.connector-c}/lib/mysql";
83+ "-L${libmysqlclient}/lib/mysql";
8484
8585 meta = with stdenv.lib; {
8686 homepage = https://www.opensmtpd.org/;
pkgs/servers/mail/postfix/default.nix+3−3
@@ -3,7 +3,7 @@
33, buildPackages
44, withLDAP ? true, openldap
55, withPgSQL ? false, postgresql
6−, withMySQL ? false, mysql
6+, withMySQL ? false, libmysqlclient
77, withSQLite ? false, sqlite
88}:
99
@@ -12,7 +12,7 @@ let
1212 "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
1313 "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
1414 ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
15− ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
15+ ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
1616 ++ lib.optional withSQLite "-DHAS_SQLITE"
1717 ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
1818 auxlibs = lib.concatStringsSep " " ([
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
3636 nativeBuildInputs = [ makeWrapper m4 ];
3737 buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
3838 ++ lib.optional withPgSQL postgresql
39− ++ lib.optional withMySQL mysql.connector-c
39+ ++ lib.optional withMySQL libmysqlclient
4040 ++ lib.optional withSQLite sqlite
4141 ++ lib.optional withLDAP openldap;
4242
pkgs/servers/monitoring/plugins/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
22, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
3−, dnsutils, libdbi, mysql, zlib, openldap, procps
3+, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
44, runtimeShell }:
55
66with stdenv.lib;
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
4848 '';
4949
5050 # !!! make openssh a runtime dependency only
51− buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
51+ buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
5252
5353 nativeBuildInputs = [ autoreconfHook ];
5454
pkgs/servers/monitoring/zabbix/proxy.nix+2−2
@@ -3,7 +3,7 @@
33, snmpSupport ? true, net_snmp
44, sshSupport ? true, libssh2
55, sqliteSupport ? false, sqlite
6−, mysqlSupport ? false, mysql
6+, mysqlSupport ? false, libmysqlclient
77, postgresqlSupport ? false, postgresql
88}:
99
@@ -37,7 +37,7 @@ in
3737 ++ optional snmpSupport net_snmp
3838 ++ optional sqliteSupport sqlite
3939 ++ optional sshSupport libssh2
40− ++ optional mysqlSupport mysql.connector-c
40+ ++ optional mysqlSupport libmysqlclient
4141 ++ optional postgresqlSupport postgresql;
4242
4343 configureFlags = [
pkgs/servers/monitoring/zabbix/server.nix+2−2
@@ -4,7 +4,7 @@
44, odbcSupport ? true, unixODBC
55, snmpSupport ? true, net_snmp
66, sshSupport ? true, libssh2
7−, mysqlSupport ? false, mysql
7+, mysqlSupport ? false, libmysqlclient
88, postgresqlSupport ? false, postgresql
99}:
1010
@@ -40,7 +40,7 @@ in
4040 ++ optional ldapSupport openldap
4141 ++ optional snmpSupport net_snmp
4242 ++ optional sshSupport libssh2
43− ++ optional mysqlSupport mysql.connector-c
43+ ++ optional mysqlSupport libmysqlclient
4444 ++ optional postgresqlSupport postgresql;
4545
4646 configureFlags = [
pkgs/servers/sql/mariadb/connector-c/3_1.nixnew file+6
@@ -0,0 +1,6 @@
1+{ callPackage, ... } @ args:
2+
3+callPackage ./. (args // {
4+ version = "3.1.2";
5+ sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
6+})
pkgs/servers/sql/mariadb/connector-c/default.nixnew file+54
@@ -0,0 +1,54 @@
1+{ stdenv, fetchurl, cmake
2+, curl, openssl, zlib
3+, libiconv
4+, version, sha256, ...
5+}:
6+
7+with stdenv.lib;
8+
9+stdenv.mkDerivation {
10+ pname = "mariadb-connector-c";
11+ inherit version;
12+
13+ src = fetchurl {
14+ urls = [
15+ "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
16+ "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
17+ ];
18+ inherit sha256;
19+ };
20+
21+ cmakeFlags = [
22+ "-DWITH_EXTERNAL_ZLIB=ON"
23+ "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
24+ "-DWITH_CURL=ON"
25+ ];
26+
27+ # The cmake setup-hook uses $out/lib by default, this is not the case here.
28+ preConfigure = optionalString stdenv.isDarwin ''
29+ cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
30+ '';
31+
32+ nativeBuildInputs = [ cmake ];
33+ propagatedBuildInputs = [ curl openssl zlib ];
34+ buildInputs = [ libiconv ];
35+
36+ enableParallelBuilding = true;
37+
38+ postFixup = ''
39+ ln -sv mariadb_config $out/bin/mysql_config
40+ ln -sv mariadb $out/lib/mysql
41+ ln -sv mariadb $out/include/mysql
42+ ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
43+ ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
44+ ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
45+ ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
46+ '';
47+
48+ meta = {
49+ description = "Client library that can be used to connect to MySQL or MariaDB";
50+ license = licenses.lgpl21;
51+ maintainers = with maintainers; [ globin ];
52+ platforms = platforms.all;
53+ };
54+}
pkgs/servers/sql/mariadb/default.nix−98
@@ -18,13 +18,6 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
1818mariadb = server // {
1919 inherit client; # MariaDB Client
2020 server = server; # MariaDB Server
21− inherit connector-c; # libmysqlclient.so
22− inherit galera;
23−};
24−
25−galeraLibs = buildEnv {
26− name = "galera-lib-inputs-united";
27− paths = [ openssl.out boost check ];
2821};
2922
3023common = rec { # attributes common to both builds
@@ -218,95 +211,4 @@ server = stdenv.mkDerivation (common // {
218211
219212 CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
220213});
221−
222−connector-c = stdenv.mkDerivation rec {
223− pname = "mariadb-connector-c";
224− version = "2.3.7";
225−
226− src = fetchurl {
227− url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
228− sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
229− name = "mariadb-connector-c-${version}-src.tar.gz";
230− };
231−
232− # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
233− cmakeFlags = [
234− "-DWITH_EXTERNAL_ZLIB=ON"
235− "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
236− ];
237−
238− # The cmake setup-hook uses $out/lib by default, this is not the case here.
239− preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
240− cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
241− '';
242−
243− nativeBuildInputs = [ cmake ];
244− propagatedBuildInputs = [ openssl zlib ];
245− buildInputs = [ libiconv ];
246−
247− enableParallelBuilding = true;
248−
249− postFixup = ''
250− ln -sv mariadb_config $out/bin/mysql_config
251− ln -sv mariadb $out/lib/mysql
252− ln -sv mariadb $out/include/mysql
253− '';
254−
255− meta = with stdenv.lib; {
256− description = "Client library that can be used to connect to MySQL or MariaDB";
257− license = licenses.lgpl21;
258− maintainers = with maintainers; [ globin ];
259− platforms = platforms.all;
260− };
261−};
262−
263−galera = stdenv.mkDerivation rec {
264− pname = "mariadb-galera";
265− version = "25.3.26";
266−
267− src = fetchFromGitHub {
268− owner = "codership";
269− repo = "galera";
270− rev = "release_${version}";
271− sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
272− fetchSubmodules = true;
273− };
274−
275− buildInputs = [ asio boost check openssl scons ];
276−
277− postPatch = ''
278− substituteInPlace SConstruct \
279− --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
280− '';
281−
282− preConfigure = ''
283− export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
284− export LIBPATH="${galeraLibs}/lib"
285− '';
286−
287− sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0";
288−
289− installPhase = ''
290− # copied with modifications from scripts/packages/freebsd.sh
291− GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
292− install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
293− install -m 555 "garb/garbd" "$out/bin/garbd"
294− install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
295− install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
296− install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
297− install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
298− install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
299− install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
300− install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
301− install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
302− '';
303−
304− meta = {
305− description = "Galera 3 wsrep provider library";
306− homepage = http://galeracluster.com/;
307− license = licenses.lgpl2;
308− maintainers = with maintainers; [ izorkin ];
309− platforms = platforms.all;
310− };
311−};
312214in mariadb
pkgs/servers/sql/mariadb/galera/25.nixnew file+6
@@ -0,0 +1,6 @@
1+{ callPackage, ... } @ args:
2+
3+callPackage ./. (args // {
4+ version = "25.3.27";
5+ sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
6+})
pkgs/servers/sql/mariadb/galera/default.nixnew file+63
@@ -0,0 +1,63 @@
1+{ stdenv, fetchFromGitHub, buildEnv
2+, asio, boost, check, openssl, scons
3+, version, sha256, ...
4+}:
5+
6+let
7+ pname = "mariadb-galera";
8+ galeraLibs = buildEnv {
9+ name = "galera-lib-inputs-united";
10+ paths = [ openssl.out boost check ];
11+ };
12+
13+in stdenv.mkDerivation {
14+ inherit pname;
15+ inherit version;
16+
17+ src = fetchFromGitHub {
18+ owner = "codership";
19+ repo = "galera";
20+ rev = "release_${version}";
21+ inherit sha256;
22+ fetchSubmodules = true;
23+ };
24+
25+ buildInputs = [ asio boost check openssl scons ];
26+
27+ postPatch = ''
28+ substituteInPlace SConstruct \
29+ --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
30+ '';
31+
32+ preConfigure = ''
33+ export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
34+ export LIBPATH="${galeraLibs}/lib"
35+ '';
36+
37+ sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
38+
39+ enableParallelBuilding = true;
40+
41+ installPhase = ''
42+ # copied with modifications from scripts/packages/freebsd.sh
43+ GALERA_LICENSE_DIR="$share/licenses/${pname}"
44+ install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
45+ install -m 555 "garb/garbd" "$out/bin/garbd"
46+ install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
47+ install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
48+ install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
49+ install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
50+ install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
51+ install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
52+ install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
53+ install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
54+ '';
55+
56+ meta = with stdenv.lib; {
57+ description = "Galera 3 wsrep provider library";
58+ homepage = http://galeracluster.com/;
59+ license = licenses.lgpl2;
60+ maintainers = with maintainers; [ izorkin ];
61+ platforms = platforms.all;
62+ };
63+}
pkgs/servers/uwsgi/default.nix+2−2
@@ -4,7 +4,7 @@
44, pam, withPAM ? stdenv.isLinux
55, systemd, withSystemd ? stdenv.isLinux
66, python2, python3, ncurses
7−, ruby, php-embed, mysql
7+, ruby, php-embed, libmysqlclient
88}:
99
1010let 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 "
3434 # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
3535 path = "plugins/php";
3636 inputs = [ php-embed ] ++ php-embed.buildInputs;
37− NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
37+ NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
3838 })
3939 ];
4040
pkgs/tools/backup/bareos/default.nix+4−4
@@ -1,10 +1,10 @@
11{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
22, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
3−, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
3+, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
44, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
55}:
66
7−assert sqlite != null || postgresql != null || mysql != null;
7+assert sqlite != null || postgresql != null || libmysqlclient != null;
88
99with stdenv.lib;
1010let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 nativeBuildInputs = [ pkgconfig ];
2626 buildInputs = [
2727 nettools gettext readline openssl python2 flex ncurses sqlite postgresql
28− mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb
28+ libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
2929 ];
3030
3131 postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
5656 ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
5757 ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
58− ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
58+ ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
5959 ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
6060 ++ optional (lzo != null) "--with-lzo=${lzo}"
6161 ++ optional (jansson != null) "--with-jansson=${jansson}"
pkgs/tools/backup/mydumper/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, pkgconfig
2−, glib, zlib, pcre, mysql, libressl }:
2+, glib, zlib, pcre, libmysqlclient, libressl }:
33
44stdenv.mkDerivation rec {
55 version = "0.9.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ cmake pkgconfig ];
1616
17− buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
17+ buildInputs = [ glib zlib pcre libmysqlclient libressl ];
1818
1919 meta = with stdenv.lib; {
2020 description = ''High-perfomance MySQL backup tool'';
pkgs/tools/graphics/zbar/default.nix+3−1
@@ -8,6 +8,7 @@
88, qtbase
99, qtx11extras
1010, wrapQtAppsHook
11+, wrapGAppsHook
1112, gtk3
1213, xmlto
1314, docbook_xsl
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
3637 autoreconfHook
3738 docbook_xsl
3839 wrapQtAppsHook
40+ wrapGAppsHook
3941 ];
4042
4143 buildInputs = [
@@ -71,7 +73,7 @@ stdenv.mkDerivation rec {
7173 dontWrapGApps = true;
7274
7375 postFixup = lib.optionalString enableVideo ''
74− wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
76+ wrapGApp "$out/bin/zbarcam-gtk"
7577 wrapQtApp "$out/bin/zbarcam-qt"
7678 '';
7779
pkgs/tools/networking/kea/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
2−, boost, python3, postgresql, mysql, gmp, bzip2 }:
2+, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
33
44stdenv.mkDerivation rec {
55 pname = "kea";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
2020 configureFlags = [
2121 "--localstatedir=/var"
2222 "--with-pgsql=${postgresql}/bin/pg_config"
23− "--with-mysql=${mysql.connector-c}/bin/mysql_config"
23+ "--with-mysql=${libmysqlclient}/bin/mysql_config"
2424 ];
2525
2626 nativeBuildInputs = [ autoreconfHook pkgconfig ];
2727 buildInputs = [
28− openssl log4cplus boost python3 mysql.connector-c
28+ openssl log4cplus boost python3 libmysqlclient
2929 botan2 gmp bzip2
3030 ];
3131
pkgs/tools/networking/mailutils/default.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
22, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
3−, python, gss, mysql, system-sendmail }:
3+, python, gss, libmysqlclient, system-sendmail }:
44
55stdenv.mkDerivation rec {
66 name = "${project}-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sed -i -e '/chown root:mail/d' \
1717 -e 's/chmod [24]755/chmod 0755/' \
1818 */Makefile{.in,.am}
19− sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac
19+ sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac
2020 sed -i 's/0\.18/0.19/' configure.ac
2121 sed -i -e 's:mysql/mysql.h:mysql.h:' \
2222 -e 's:mysql/errmsg.h:errmsg.h:' \
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929
3030 buildInputs = [
3131 gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
32− gss mysql.connector-c python
32+ gss libmysqlclient python
3333 ];
3434
3535 patches = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
6262 (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
6363 ];
6464
65− NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";
65+ NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
6666
6767 checkInputs = [ dejagnu ];
6868 doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
pkgs/tools/networking/maxscale/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
2−, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
2+, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient
33, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
44, libaio, libedit, libtool, libui, libuuid, zlib
55}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ cmake pkgconfig ];
1919
2020 buildInputs = [
21− bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c
21+ bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient
2222 ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
2323 libaio libedit libtool libui libuuid zlib
2424 ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
6363 postInstall = ''
6464 find $out/bin -type f -perm -0100 | while read f1; do
6565 patchelf \
66− --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \
66+ --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
6767 --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
6868 && patchelf --shrink-rpath $f1
6969 done
pkgs/tools/networking/modem-manager/default.nix−7
@@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
3232
3333 doCheck = true;
3434
35− postInstall = ''
36− # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
37− # aliases ourselves.
38− ln -s $out/etc/systemd/system/ModemManager.service \
39− $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
40− '';
41−
4235 meta = with stdenv.lib; {
4336 description = "WWAN modem manager, part of NetworkManager";
4437 homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
pkgs/tools/networking/network-manager/default.nix−5
@@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
9797 '';
9898
9999 postInstall = ''
100− # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
101− # aliases ourselves.
102− ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
103− ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
104−
105100 # Add the legacy service name from before #51382 to prevent NetworkManager
106101 # from not starting back up:
107102 # TODO: remove this once 19.10 is released
pkgs/tools/security/thc-hydra/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql
1+{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql
22, withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
33
44let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 '';
2424
2525 nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
26− buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]
26+ buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql ]
2727 ++ lib.optional withGUI gtk2;
2828
2929 postInstall = lib.optionalString withGUI ''
pkgs/tools/system/collectd/default.nix+2−2
@@ -22,7 +22,7 @@
2222, libtool
2323, lm_sensors
2424, lvm2
25−, mysql
25+, libmysqlclient
2626, numactl
2727, postgresql
2828, protobufc
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
6363 libxml2 postgresql protobufc rrdtool
6464 varnish yajl jdk libtool python hiredis libmicrohttpd
6565 riemann_c_client mosquitto rdkafka mongoc
66− ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c
66+ ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient
6767 ] ++ stdenv.lib.optionals stdenv.isLinux [
6868 iptables libatasmart libcredis libmodbus libsigrok
6969 lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
pkgs/tools/system/rsyslog/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
2−, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
2+, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
33, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
44, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
55, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
2727 librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
2828 rabbitmq-c hiredis mongoc
29− ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c
29+ ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
3030 ++ stdenv.lib.optional stdenv.isLinux systemd;
3131
3232 hardeningDisable = [ "format" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 (mkFlag false "valgrind")
5151 (mkFlag false "diagtools")
5252 (mkFlag true "usertools")
53− (mkFlag (mysql != null) "mysql")
53+ (mkFlag (libmysqlclient != null) "mysql")
5454 (mkFlag (postgresql != null) "pgsql")
5555 (mkFlag (libdbi != null) "libdbi")
5656 (mkFlag (net_snmp != null) "snmp")
pkgs/top-level/aliases.nix−1
@@ -189,7 +189,6 @@ mapAliases ({
189189 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
190190 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
191191 liblapackWithoutAtlas = liblapack; # added 2018-11-05
192− libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
193192 libqrencode = qrencode; # added 2019-01-01
194193 librecad2 = librecad; # backwards compatibility alias, added 2015-10
195194 libsysfs = sysfsutils; # added 2018-04-25
pkgs/top-level/all-packages.nix+16−8
@@ -1966,7 +1966,7 @@ in
19661966 libkrb5 = null;
19671967 systemd = null;
19681968 jemalloc = null;
1969− mysql = null;
1969+ libmysqlclient = null;
19701970 postgresql = null;
19711971 libdbi = null;
19721972 net_snmp = null;
@@ -11712,7 +11712,7 @@ in
1171211712 libdbi = callPackage ../development/libraries/libdbi { };
1171311713
1171411714 libdbiDriversBase = libdbiDrivers.override {
11715− mysql = null;
11715+ libmysqlclient = null;
1171611716 sqlite = null;
1171711717 };
1171811718
@@ -12430,9 +12430,8 @@ in
1243012430
1243112431 libwhereami = callPackage ../development/libraries/libwhereami { };
1243212432
12433− giflib = giflib_5_1;
1243412433 giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
12435− giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
12434+ giflib = callPackage ../development/libraries/giflib { };
1243612435
1243712436 libunarr = callPackage ../development/libraries/libunarr { };
1243812437
@@ -13141,7 +13140,7 @@ in
1314113140 cups = if stdenv.isLinux then cups else null;
1314213141
1314313142 # XXX: mariadb doesn't built on fbsd as of nov 2015
13144− mysql = if (!stdenv.isFreeBSD) then mysql else null;
13143+ libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
1314513144
1314613145 inherit (pkgs.darwin) libobjc;
1314713146 inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@@ -13900,7 +13899,7 @@ in
1390013899
1390113900 unixODBC = callPackage ../development/libraries/unixODBC { };
1390213901
13903− unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
13902+ unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
1390413903
1390513904 ustr = callPackage ../development/libraries/ustr { };
1390613905
@@ -14888,8 +14887,17 @@ in
1488814887
1488914888 rpcbind = callPackage ../servers/rpcbind { };
1489014889
14891− mariadb = callPackage ../servers/sql/mariadb {
14890+ libmysqlclient = libmysqlclient_3_1;
14891+ libmysqlclient_3_1 = mariadb-connector-c_3_1;
14892+ mariadb-connector-c = mariadb-connector-c_3_1;
14893+ mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
14894+
14895+ mariadb-galera = mariadb-galera_25;
14896+ mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
1489214897 asio = asio_1_10;
14898+ };
14899+
14900+ mariadb = callPackage ../servers/sql/mariadb {
1489314901 # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
1489414902 # https://jira.mariadb.org/browse/MDEV-15034
1489514903 jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
@@ -24157,7 +24165,7 @@ in
2415724165 mnemonicode = callPackage ../misc/mnemonicode { };
2415824166
2415924167 mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
24160− gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
24168+ gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
2416124169 mysql = mysql;
2416224170 pcre = pcre-cpp;
2416324171 });