diff options
90 files changed, 367 insertions, 428 deletions
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 8b3151d5bf94..9e0f21a6c74f 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/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> diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index db047e6d0b89..db4d0e328e2d 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/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 diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 562a5e616a32..360d94d1b825 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/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" ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index ea4cf986f399..f591dd5a60dd 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/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 = { diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 135745feec31..172f999223a8 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/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 ''; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8db7068f7cfa..83515de49903 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/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 ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a459302177b9..f5f53e10496b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/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 diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 4739d5265584..eb774a309416 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/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 diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index bd57e355c757..f31dd0daa5c3 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/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 = { diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 1cd5e364208a..4de683cdce90 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/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 diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 7953cde24139..773c63b0036d 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/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 diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 717740f1f20f..906b1db9d10e 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/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 diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index da217186e276..19089a6b050e 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/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 diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 9e44573d2e38..ac1e9ee85c01 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/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 ''; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index cef00513df1c..cff0db665bba 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/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 ''; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b5ccbca6f7e6..9ef650c330fa 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/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 diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 7066744bb54d..24e88f9ee2e2 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/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 diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 79c4aacbed5b..74ccaac388f2 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/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]; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 31381aac741d..01d4972a55d5 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/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"; ''; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 91fdb1ece276..5db25686fc66 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/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: { diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch index 2e30dba92924..9d4cd75486e6 100644 --- a/pkgs/development/interpreters/perl/sw_vers.patch +++ b/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 diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 508339d0da6b..9a82868b7b3d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/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" diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index a21b3cc93faa..737122c57bfe 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/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/; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index bb86ac57832a..ef2574019459 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/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 diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index d41b4c55f867..baf847d4e0a2 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/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}" diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index bb53277075f1..413d4e19dde7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/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}" diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/5.1.nix index d97477e3f3a5..fee760b3ea26 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/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"; }; } diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 03eabc6447b4..4a403a19964e 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 630b17121587..48fb0f1153e7 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 52b8a32fab4a..99cd636b03b8 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/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" diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 270326079963..bb6402dc4287 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index ca65c3fdf8c2..9ba3cdbd09aa 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8835490187d1..30d8d8a94e9d 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/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; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 16ec6a5c1103..f954aaf72457 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0b026ae75f4e..03082eab0917 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/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 diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index e69ed0236f48..c19e343f19ae 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index a46dcec03128..3b3f406485c7 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/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" diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7c7f8f51de7d..b5a10e8f11a7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8119513618b2..e2c71a77062e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/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" ] ); diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 2d6ae3f18cad..13b4e6b97a9a 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/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; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 44e7ed17f0c6..b9aa1696d487 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/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"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC libmysqlclient openssl ]; + buildInputs = [ unixODBC mariadb.connector-c ]; cmakeFlags = [ - "-DWITH_OPENSSL=ON" - ]; - - NIX_CFLAGS_COMPILE = [ - "-I${libmysqlclient}/include/mysql" - "-L${libmysqlclient}/lib/mysql" + "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; passthru = { diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 31fa104fb059..319b0effc578 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu -, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl +, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz }: @@ -22,7 +22,7 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysqlclient postgresql graphicsmagick glew + pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew openssl pcre ]; @@ -30,7 +30,7 @@ let "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysqlclient}" + "-DMYSQL_PREFIX=${mysql.connector-c}" "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" "--no-warn-unused-cli" ]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index acc98215af01..052bfb119498 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -53,11 +53,11 @@ in cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { - propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib]; + propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" ''; }; }; @@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs" }; }; cffi = addNativeLibs [pkgs.libffi]; - cl-mysql = addNativeLibs [pkgs.libmysqlclient]; + cl-mysql = addNativeLibs [pkgs.mysql]; cl-ppcre-template = x: { overrides = y: (x.overrides y) // { postPatch = '' diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index 4a1f9ded56c8..b3d50b2fb075 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -6,11 +6,11 @@ self = rec { env = buildEnv { name = name; paths = buildInputs; }; buildInputs = [ gcc stdenv - openssl fuse libuv libmysqlclient libfixposix libev sqlite + openssl fuse libuv mysql.connector-c libfixposix libev sqlite freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - 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"; + 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"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 41dae8347eed..233503c2eca8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -154,12 +154,12 @@ with super; luadbi-mysql = super.luadbi-mysql.override({ extraVariables = '' -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql'; - MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql'; + MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql'; + MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql'; ''; buildInputs = [ pkgs.mysql.client - pkgs.libmysqlclient + pkgs.mysql.connector-c ]; }); diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 9be5ebf8a7bc..1986f7e48f69 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - propagatedBuildInputs = [ libmysqlclient ]; + propagatedBuildInputs = [ mysql.connector-c ]; patches = [ (fetchpatch { diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index eb5393396032..6eed57c4e7c6 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }: +{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: buildPerlPackage { pname = "DBD-mysql"; @@ -9,7 +9,7 @@ buildPerlPackage { sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; - buildInputs = [ libmysqlclient DevelChecklib ] ; + buildInputs = [ mysql.connector-c DevelChecklib ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 34d12f1471fb..7b615928da9a 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ]; + propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${libmysqlclient}/include/mysql + --replace /usr/include/mysql ${mysql.connector-c}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2a5d4fa47573..6b20b4b570a3 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , openssl , cryptography_vectors , darwin @@ -50,18 +49,10 @@ buildPythonPackage rec { pytz ]; - # remove when https://github.com/pyca/cryptography/issues/4998 is fixed checkPhase = '' - py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' + py.test --disable-pytest-warnings tests ''; - patches = [ - (fetchpatch { - url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch"; - sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp"; - }) - ]; - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index b37f191286e4..488f6f9a7bb5 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: +{ stdenv, buildPythonPackage, fetchPypi, mysql }: buildPythonPackage rec { pname = "mysqlclient"; version = "1.4.4"; nativeBuildInputs = [ - libmysqlclient + mysql.connector-c ]; buildInputs = [ - libmysqlclient + mysql.connector-c ]; # Tests need a MySQL database diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 018463ead546..ec17b77ba200 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -9,7 +9,6 @@ , pretend , flaky , glibcLocales -, six }: with stdenv.lib; @@ -85,7 +84,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + propagatedBuildInputs = [ cryptography pyasn1 idna ]; checkInputs = [ pytest pretend flaky glibcLocales ]; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cef7f0aecf26..1616eacffc65 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -325,7 +325,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -810,7 +810,7 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.libmysqlclient}"; + MYSQL_DIR=pkgs.mysql.connector-c; preConfigure = '' patchShebangs configure ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 157e15e375f6..a03e40e8097c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi -, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz @@ -349,11 +349,11 @@ in }; mysql = attrs: { - buildInputs = [ libmysqlclient zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ libmysqlclient zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index db8bb4f42435..77d03f299f4a 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; - version = "0.10"; + name = "patchelf-0.9"; src = fetchurl { url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; + sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; }; - # Drop test that fails on musl (?) - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace tests/Makefile.am \ - --replace "set-rpath-library.sh" "" - ''; - setupHook = [ ./setup-hook.sh ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; - - # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6 - doCheck = stdenv.hostPlatform.isMusl; + doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { homepage = https://nixos.org/patchelf.html; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index f5ff1c74bcc9..c673bd261098 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; - version = "0.10"; + pname = "patchelf"; + version = "0.10-pre-20190328"; - src = fetchurl { - url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "patchelf"; + rev = "e1e39f3639e39360ceebb2f7ed533cede4623070"; + sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k"; }; # Drop test that fails on musl (?) postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace tests/Makefile.am \ --replace "set-rpath-library.sh" "" + '' + + # extend version identifier to more informative than "0.10". + '' + echo -n ${version} > version ''; setupHook = [ ./setup-hook.sh ]; @@ -22,11 +28,11 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = { homepage = https://nixos.org/patchelf.html; - license = licenses.gpl3; + license = "GPL"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; - maintainers = [ maintainers.eelco ]; - platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 8076925f29b0..e2d507ab8013 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql , libaio }: stdenv.mkDerivation { name = "sysbench-1.0.17"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysqlclient libaio ]; + buildInputs = [ vim mysql.connector-c libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 931c00ecce58..74f1f22426f9 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper -, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki +, boost, doxygen, openssl, mysql, postgresql, graphviz, loki , qscintilla, qtbase, qttools }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ]; buildInputs = [ - boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase ]; preConfigure = '' @@ -47,7 +47,7 @@ mkDerivation { "-lssl" ]; - NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.getBin graphviz}/bin'' diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 888b7bd3d6aa..c14eda2968e0 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer -, libmysqlclient, makeWrapper }: +, mysql, makeWrapper }: stdenv.mkDerivation { name = "zod-engine-2011-03-18"; @@ -24,9 +24,9 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ]; - NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; + NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 75144799d014..9fdf9ca0bc15 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -237,9 +237,9 @@ stdenv.mkDerivation rec { postFixup = '' find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ | while IFS= read -r -d ''' file; do - if [[ "$file" != *.efi ]]; then - echo "Wrapping program $file" - wrapGApp "$file" + if [[ "''${file}" != *.efi ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" fi done ''; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 4e9007c73625..d6fd7346f4f5 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; - patches = [ + patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [ # fix build on i686 # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298 (fetchpatch { diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index ab2d44577c0d..e48dec7d20c8 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu -, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka +, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu - libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka + libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 93e1a31abb17..c448e4936f64 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib -, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl +, ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 , enableX11 ? true @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl zlib - libmysqlclient ncurses gtk2 lz4 + mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index eeea3298ecdc..6c6eb2b0c091 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -13,7 +13,7 @@ , withMemcached ? false , hiredis , withRedis ? false -, libmysqlclient +, mysql , withMysql ? false , json_c , withJson ? false @@ -31,7 +31,7 @@ assert withPcap -> libpcap != null; assert withCap -> libcap != null; assert withMemcached -> libmemcached != null; assert withRedis -> hiredis != null; -assert withMysql -> libmysqlclient != null; +assert withMysql -> mysql != null; assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; assert withRest -> curl != null && withJson; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ optional withCap libcap ++ optional withMemcached libmemcached ++ optional withRedis hiredis - ++ optional withMysql libmysqlclient + ++ optional withMysql mysql.connector-c ++ optional withJson json_c ++ optional withYubikey libyubikey ++ optional withCollectd collectd diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index f67bc5b00452..7dacb997d470 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null -, enableMysql ? false, libmysqlclient ? null +, enableMysql ? false, mysql ? null , enableLdap ? false, openldap ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null , enableExtendedAttrs ? false, attr ? null @@ -8,7 +8,7 @@ }: assert enableMagnet -> lua5_1 != null; -assert enableMysql -> libmysqlclient != null; +assert enableMysql -> mysql != null; assert enableLdap -> openldap != null; assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql libmysqlclient + ++ stdenv.lib.optional enableMysql mysql.connector-c ++ stdenv.lib.optional enableLdap openldap ++ stdenv.lib.optional enableWebDAV sqlite ++ stdenv.lib.optional enableWebDAV libuuid; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 4104b0443ff0..e3afd1f98798 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -3,7 +3,7 @@ , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests # Auth modules -, withMySQL ? false, libmysqlclient +, withMySQL ? false, mysql , withPgSQL ? false, postgresql , withSQLite ? true, sqlite }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] - ++ lib.optional withMySQL libmysqlclient + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 96c8ad4a383e..fcafd5817d4e 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,6 +1,6 @@ { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv , enableLDAP ? false, openldap -, enableMySQL ? false, libmysqlclient, zlib +, enableMySQL ? false, mysql, zlib , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] + ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam ++ stdenv.lib.optional enableSPF libspf2; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: + s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index f7ed6382a7be..71b27facbab6 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, + python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libevent - libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; + libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ]; configureFlags = [ "--sysconfdir=/etc" @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional enableRedis "-I${hiredis}/include/hiredis -lhiredis" ++ stdenv.lib.optional enableMysql - "-L${libmysqlclient}/lib/mysql"; + "-L${mysql.connector-c}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index b299d212a185..39845f12f03c 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -3,7 +3,7 @@ , buildPackages , withLDAP ? true, openldap , withPgSQL ? false, postgresql -, withMySQL ? false, libmysqlclient +, withMySQL ? false, mysql , withSQLite ? false, sqlite }: @@ -12,7 +12,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); auxlibs = lib.concatStringsSep " " ([ @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper m4 ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysqlclient + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 62f40b59d374..9f23cc3e54c3 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps +, dnsutils, libdbi, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 53932af6a18f..48b72dc0590d 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -3,7 +3,7 @@ , snmpSupport ? true, net_snmp , sshSupport ? true, libssh2 , sqliteSupport ? false, sqlite -, mysqlSupport ? false, libmysqlclient +, mysqlSupport ? false, mysql , postgresqlSupport ? false, postgresql }: @@ -37,7 +37,7 @@ in ++ optional snmpSupport net_snmp ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 - ++ optional mysqlSupport libmysqlclient + ++ optional mysqlSupport mysql.connector-c ++ optional postgresqlSupport postgresql; configureFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index ac5dcca901d5..51ca38e8cfc8 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -4,7 +4,7 @@ , odbcSupport ? true, unixODBC , snmpSupport ? true, net_snmp , sshSupport ? true, libssh2 -, mysqlSupport ? false, libmysqlclient +, mysqlSupport ? false, mysql , postgresqlSupport ? false, postgresql }: @@ -40,7 +40,7 @@ in ++ optional ldapSupport openldap ++ optional snmpSupport net_snmp ++ optional sshSupport libssh2 - ++ optional mysqlSupport libmysqlclient + ++ optional mysqlSupport mysql.connector-c ++ optional postgresqlSupport postgresql; configureFlags = [ diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix deleted file mode 100644 index c8bc4858f719..000000000000 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "3.1.2"; - sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm"; -}) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix deleted file mode 100644 index 0e0302685401..000000000000 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, cmake -, curl, openssl, zlib -, libiconv -, version, sha256, ... -}: - -with stdenv.lib; - -stdenv.mkDerivation { - pname = "mariadb-connector-c"; - inherit version; - - src = fetchurl { - urls = [ - "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - ]; - inherit sha256; - }; - - cmakeFlags = [ - "-DWITH_EXTERNAL_ZLIB=ON" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DWITH_CURL=ON" - ]; - - # The cmake setup-hook uses $out/lib by default, this is not the case here. - preConfigure = optionalString stdenv.isDarwin '' - cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") - ''; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ curl openssl zlib ]; - buildInputs = [ libiconv ]; - - enableParallelBuilding = true; - - postFixup = '' - ln -sv mariadb_config $out/bin/mysql_config - ln -sv mariadb $out/lib/mysql - ln -sv mariadb $out/include/mysql - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so - ''; - - meta = { - description = "Client library that can be used to connect to MySQL or MariaDB"; - license = licenses.lgpl21; - maintainers = with maintainers; [ globin ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2352d7c1088d..15553055457c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -18,6 +18,13 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ] mariadb = server // { inherit client; # MariaDB Client server = server; # MariaDB Server + inherit connector-c; # libmysqlclient.so + inherit galera; +}; + +galeraLibs = buildEnv { + name = "galera-lib-inputs-united"; + paths = [ openssl.out boost check ]; }; common = rec { # attributes common to both builds @@ -211,4 +218,95 @@ server = stdenv.mkDerivation (common // { CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; }); + +connector-c = stdenv.mkDerivation rec { + pname = "mariadb-connector-c"; + version = "2.3.7"; + + src = fetchurl { + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/"; + sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl"; + name = "mariadb-connector-c-${version}-src.tar.gz"; + }; + + # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0 + cmakeFlags = [ + "-DWITH_EXTERNAL_ZLIB=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + ]; + + # The cmake setup-hook uses $out/lib by default, this is not the case here. + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") + ''; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ openssl zlib ]; + buildInputs = [ libiconv ]; + + enableParallelBuilding = true; + + postFixup = '' + ln -sv mariadb_config $out/bin/mysql_config + ln -sv mariadb $out/lib/mysql + ln -sv mariadb $out/include/mysql + ''; + + meta = with stdenv.lib; { + description = "Client library that can be used to connect to MySQL or MariaDB"; + license = licenses.lgpl21; + maintainers = with maintainers; [ globin ]; + platforms = platforms.all; + }; +}; + +galera = stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "25.3.26"; + + src = fetchFromGitHub { + owner = "codership"; + repo = "galera"; + rev = "release_${version}"; + sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f"; + fetchSubmodules = true; + }; + + buildInputs = [ asio boost check openssl scons ]; + + postPatch = '' + substituteInPlace SConstruct \ + --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" + ''; + + preConfigure = '' + export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" + export LIBPATH="${galeraLibs}/lib" + ''; + + sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0"; + + installPhase = '' + # copied with modifications from scripts/packages/freebsd.sh + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" + install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} + install -m 555 "garb/garbd" "$out/bin/garbd" + install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" + install -m 444 "scripts/packages/README" "$out/share/doc/galera/" + install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/" + install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" + install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" + install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" + install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" + install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium" + ''; + + meta = { + description = "Galera 3 wsrep provider library"; + homepage = http://galeracluster.com/; + license = licenses.lgpl2; + maintainers = with maintainers; [ izorkin ]; + platforms = platforms.all; + }; +}; in mariadb diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e398b..000000000000 --- a/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix deleted file mode 100644 index 263a21983e26..000000000000 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchFromGitHub, buildEnv -, asio, boost, check, openssl, scons -, version, sha256, ... -}: - -let - pname = "mariadb-galera"; - galeraLibs = buildEnv { - name = "galera-lib-inputs-united"; - paths = [ openssl.out boost check ]; - }; - -in stdenv.mkDerivation { - inherit pname; - inherit version; - - src = fetchFromGitHub { - owner = "codership"; - repo = "galera"; - rev = "release_${version}"; - inherit sha256; - fetchSubmodules = true; - }; - - buildInputs = [ asio boost check openssl scons ]; - - postPatch = '' - substituteInPlace SConstruct \ - --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" - ''; - - preConfigure = '' - export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" - export LIBPATH="${galeraLibs}/lib" - ''; - - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; - - enableParallelBuilding = true; - - installPhase = '' - # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}" - install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} - install -m 555 "garb/garbd" "$out/bin/garbd" - install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" - install -m 444 "scripts/packages/README" "$out/share/doc/galera/" - install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/" - install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" - install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" - install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" - install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" - install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium" - ''; - - meta = with stdenv.lib; { - description = "Galera 3 wsrep provider library"; - homepage = http://galeracluster.com/; - license = licenses.lgpl2; - maintainers = with maintainers; [ izorkin ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 556c44b61a75..85fa6cd80063 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,7 +4,7 @@ , pam, withPAM ? stdenv.isLinux , systemd, withSystemd ? stdenv.isLinux , python2, python3, ncurses -, ruby, php-embed, libmysqlclient +, ruby, php-embed, mysql }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { @@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else " # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; inputs = [ php-embed ] ++ php-embed.buildInputs; - NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ]; }) ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 949e45de5e11..79ae1e50ca2b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb -, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || libmysqlclient != null; +assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql - libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb + mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}" + ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 7160e7f19503..5538b45c5f1b 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glib, zlib, pcre, libmysqlclient, libressl }: +, glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { version = "0.9.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glib zlib pcre libmysqlclient libressl ]; + buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 687c4832e476..6423a84badc6 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -8,7 +8,6 @@ , qtbase , qtx11extras , wrapQtAppsHook -, wrapGAppsHook , gtk3 , xmlto , docbook_xsl @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { autoreconfHook docbook_xsl wrapQtAppsHook - wrapGAppsHook ]; buildInputs = [ @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; postFixup = lib.optionalString enableVideo '' - wrapGApp "$out/bin/zbarcam-gtk" + wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}" wrapQtApp "$out/bin/zbarcam-qt" ''; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 3986cadd08a5..bc35a25cfde8 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus -, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }: +, boost, python3, postgresql, mysql, gmp, bzip2 }: stdenv.mkDerivation rec { pname = "kea"; @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-pgsql=${postgresql}/bin/pg_config" - "--with-mysql=${libmysqlclient}/bin/mysql_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 libmysqlclient + openssl log4cplus boost python3 mysql.connector-c botan2 gmp bzip2 ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 40eeed7f0501..f507e4dc2872 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, libmysqlclient, system-sendmail }: +, python, gss, mysql, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} - sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac + sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac sed -i 's/0\.18/0.19/' configure.ac sed -i -e 's:mysql/mysql.h:mysql.h:' \ -e 's:mysql/errmsg.h:errmsg.h:' \ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss libmysqlclient python + gss mysql.connector-c python ]; patches = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) ]; - NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; + NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql"; checkInputs = [ dejagnu ]; doCheck = false; # fails 1 out of a bunch of tests, looks like a bug diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index d047646fa719..32f6b11d77c5 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc -, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient +, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient + bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { postInstall = '' find $out/bin -type f -perm -0100 | while read f1; do patchelf \ - --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \ + --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \ --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \ && patchelf --shrink-rpath $f1 done diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index fedc8d4b71d7..b2644d0c2a49 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { doCheck = true; + postInstall = '' + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/ModemManager.service \ + $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service + ''; + meta = with stdenv.lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 490ebd0fa6bb..5bc915caea65 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -97,6 +97,11 @@ in stdenv.mkDerivation rec { ''; postInstall = '' + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + # Add the legacy service name from before #51382 to prevent NetworkManager # from not starting back up: # TODO: remove this once 19.10 is released diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 57deaaf0498c..252d73b479b6 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql +{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql , withGUI ? false, makeWrapper, pkgconfig, gtk2 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; - buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql ] + buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ] ++ lib.optional withGUI gtk2; postInstall = lib.optionalString withGUI '' diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 3e7e4e5969ab..1df73e08d1e3 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -22,7 +22,7 @@ , libtool , lm_sensors , lvm2 -, libmysqlclient +, mysql , numactl , postgresql , protobufc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd riemann_c_client mosquitto rdkafka mongoc - ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient + ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 34b7b7d908a8..2899837f3f88 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc - ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient + ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (libmysqlclient != null) "mysql") + (mkFlag (mysql != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38ca7129645a..a837336740b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -189,6 +189,7 @@ mapAliases ({ libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 + libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libqrencode = qrencode; # added 2019-01-01 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b521af8e7824..830b1505370f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1966,7 +1966,7 @@ in libkrb5 = null; systemd = null; jemalloc = null; - libmysqlclient = null; + mysql = null; postgresql = null; libdbi = null; net_snmp = null; @@ -11710,7 +11710,7 @@ in libdbi = callPackage ../development/libraries/libdbi { }; libdbiDriversBase = libdbiDrivers.override { - libmysqlclient = null; + mysql = null; sqlite = null; }; @@ -12428,8 +12428,9 @@ in libwhereami = callPackage ../development/libraries/libwhereami { }; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; - giflib = callPackage ../development/libraries/giflib { }; + giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; libunarr = callPackage ../development/libraries/libunarr { }; @@ -13138,7 +13139,7 @@ in cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 - libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null; + mysql = if (!stdenv.isFreeBSD) then mysql else null; inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; @@ -13897,7 +13898,7 @@ in unixODBC = callPackage ../development/libraries/unixODBC { }; - unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); + unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); ustr = callPackage ../development/libraries/ustr { }; @@ -14885,17 +14886,8 @@ in rpcbind = callPackage ../servers/rpcbind { }; - libmysqlclient = libmysqlclient_3_1; - libmysqlclient_3_1 = mariadb-connector-c_3_1; - mariadb-connector-c = mariadb-connector-c_3_1; - mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { - asio = asio_1_10; - }; - mariadb = callPackage ../servers/sql/mariadb { + asio = asio_1_10; # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". # https://jira.mariadb.org/browse/MDEV-15034 jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); @@ -24163,7 +24155,7 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { - gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; + gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; }); |