Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát 2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
90 changed files with 428 additions and 367 deletions

View file

@ -210,7 +210,7 @@ mkDerivation {
dontWrapGApps = true; dontWrapGApps = true;
# Arguments to be passed to `makeWrapper`, only used by qt5s mkDerivation # Arguments to be passed to `makeWrapper`, only used by qt5s mkDerivation
qtWrapperArgs [ qtWrapperArgs = [
"\${gappsWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"
]; ];
} }
@ -258,6 +258,16 @@ mkDerivation {
</para> </para>
</listitem> </listitem>
</varlistentry> </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> </variablelist>
</section> </section>
</section> </section>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,33 +2,19 @@
, libtiff, giflib, libjpeg, libpng , libtiff, giflib, libjpeg, libpng
, libXrender, libexif, autoreconfHook, fetchpatch }: , libXrender, libexif, autoreconfHook, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libgdiplus-5.6.1"; pname = "libgdiplus";
version = "6.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mono"; owner = "mono";
repo = "libgdiplus"; repo = "libgdiplus";
rev = "5.6.1"; rev = version;
sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2"; sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
}; };
NIX_LDFLAGS = "-lgif"; 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" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
, pcre, harfbuzz , pcre, harfbuzz
}: }:
@ -22,7 +22,7 @@ let
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cmake boost doxygen qt48Full libharu cmake boost doxygen qt48Full libharu
pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
openssl pcre openssl pcre
]; ];
@ -30,7 +30,7 @@ let
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11" "-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}" "-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${mysql.connector-c}" "-DMYSQL_PREFIX=${libmysqlclient}"
"-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
"--no-warn-unused-cli" "--no-warn-unused-cli"
]; ];

View file

@ -53,11 +53,11 @@ in
cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
cl-async-test = addNativeLibs [pkgs.openssl]; cl-async-test = addNativeLibs [pkgs.openssl];
clsql = x: { clsql = x: {
propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
overrides = y: (x.overrides y) // { overrides = y: (x.overrides y) // {
preConfigure = ((x.overrides y).preConfigure or "") + '' preConfigure = ((x.overrides y).preConfigure or "") + ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
''; '';
}; };
}; };
@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
}; };
}; };
cffi = addNativeLibs [pkgs.libffi]; cffi = addNativeLibs [pkgs.libffi];
cl-mysql = addNativeLibs [pkgs.mysql]; cl-mysql = addNativeLibs [pkgs.libmysqlclient];
cl-ppcre-template = x: { cl-ppcre-template = x: {
overrides = y: (x.overrides y) // { overrides = y: (x.overrides y) // {
postPatch = '' postPatch = ''

View file

@ -6,11 +6,11 @@ self = rec {
env = buildEnv { name = name; paths = buildInputs; }; env = buildEnv { name = name; paths = buildInputs; };
buildInputs = [ buildInputs = [
gcc stdenv gcc stdenv
openssl fuse libuv mysql.connector-c libfixposix libev sqlite openssl fuse libuv libmysqlclient libfixposix libev sqlite
freetds freetds
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
]; ];
CPATH = "${libfixposix}/include"; CPATH = "${libfixposix}/include";
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"; 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";
}; };
in stdenv.mkDerivation self in stdenv.mkDerivation self

View file

@ -154,12 +154,12 @@ with super;
luadbi-mysql = super.luadbi-mysql.override({ luadbi-mysql = super.luadbi-mysql.override({
extraVariables = '' extraVariables = ''
-- Can't just be /include and /lib, unfortunately needs the trailing 'mysql' -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql'; MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql'; MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
''; '';
buildInputs = [ buildInputs = [
pkgs.mysql.client pkgs.mysql.client
pkgs.mysql.connector-c pkgs.libmysqlclient
]; ];
}); });

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }: { stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
# TODO: la versione stabile da' un errore di compilazione dovuto a # TODO: la versione stabile da' un errore di compilazione dovuto a
# qualche cambiamento negli header .h # qualche cambiamento negli header .h
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true; createFindlibDestdir = true;
propagatedBuildInputs = [ mysql.connector-c ]; propagatedBuildInputs = [ libmysqlclient ];
patches = [ patches = [
(fetchpatch { (fetchpatch {

View file

@ -1,4 +1,4 @@
{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: { fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
buildPerlPackage { buildPerlPackage {
pname = "DBD-mysql"; pname = "DBD-mysql";
@ -9,7 +9,7 @@ buildPerlPackage {
sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
}; };
buildInputs = [ mysql.connector-c DevelChecklib ] ; buildInputs = [ libmysqlclient DevelChecklib ] ;
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
doCheck = false; doCheck = false;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, { lib, stdenv, fetchurl,
pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "glpk"; baseName = "glpk";
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
}; };
glpkWithExtras = lib.overrideDerivation glpk (attrs: { glpkWithExtras = lib.overrideDerivation glpk (attrs: {
propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
CPPFLAGS = "-I${gmp.dev}/include"; CPPFLAGS = "-I${gmp.dev}/include";
preConfigure = '' preConfigure = ''
substituteInPlace configure \ substituteInPlace configure \
--replace /usr/include/mysql ${mysql.connector-c}/include/mysql --replace /usr/include/mysql ${libmysqlclient}/include/mysql
''; '';
configureFlags = [ "--enable-dl" configureFlags = [ "--enable-dl"
"--enable-odbc" "--enable-odbc"

View file

@ -1,6 +1,7 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, fetchpatch
, openssl , openssl
, cryptography_vectors , cryptography_vectors
, darwin , darwin
@ -49,10 +50,18 @@ buildPythonPackage rec {
pytz pytz
]; ];
# remove when https://github.com/pyca/cryptography/issues/4998 is fixed
checkPhase = '' checkPhase = ''
py.test --disable-pytest-warnings tests py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
''; '';
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 # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
# can do until nix 1.11's release # can do until nix 1.11's release
__impureHostDeps = [ "/usr/lib" ]; __impureHostDeps = [ "/usr/lib" ];

View file

@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, mysql }: { stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mysqlclient"; pname = "mysqlclient";
version = "1.4.4"; version = "1.4.4";
nativeBuildInputs = [ nativeBuildInputs = [
mysql.connector-c libmysqlclient
]; ];
buildInputs = [ buildInputs = [
mysql.connector-c libmysqlclient
]; ];
# Tests need a MySQL database # Tests need a MySQL database

View file

@ -9,6 +9,7 @@
, pretend , pretend
, flaky , flaky
, glibcLocales , glibcLocales
, six
}: }:
with stdenv.lib; with stdenv.lib;
@ -84,7 +85,7 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
propagatedBuildInputs = [ cryptography pyasn1 idna ]; propagatedBuildInputs = [ cryptography pyasn1 idna six ];
checkInputs = [ pytest pretend flaky glibcLocales ]; checkInputs = [ pytest pretend flaky glibcLocales ];
} }

View file

@ -325,7 +325,7 @@ let
rmatio = [ pkgs.zlib.dev ]; rmatio = [ pkgs.zlib.dev ];
Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
Rmpi = [ pkgs.openmpi ]; Rmpi = [ pkgs.openmpi ];
RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ];
RODBCext = [ pkgs.libiodbc ]; RODBCext = [ pkgs.libiodbc ];
RODBC = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ];
@ -810,7 +810,7 @@ let
}); });
RMySQL = old.RMySQL.overrideDerivation (attrs: { RMySQL = old.RMySQL.overrideDerivation (attrs: {
MYSQL_DIR=pkgs.mysql.connector-c; MYSQL_DIR="${pkgs.libmysqlclient}";
preConfigure = '' preConfigure = ''
patchShebangs configure patchShebangs configure
''; '';

View file

@ -20,7 +20,7 @@
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@ -349,11 +349,11 @@ in
}; };
mysql = attrs: { mysql = attrs: {
buildInputs = [ mysql.connector-c zlib openssl ]; buildInputs = [ libmysqlclient zlib openssl ];
}; };
mysql2 = attrs: { mysql2 = attrs: {
buildInputs = [ mysql.connector-c zlib openssl ]; buildInputs = [ libmysqlclient zlib openssl ];
}; };
ncursesw = attrs: { ncursesw = attrs: {

View file

@ -1,16 +1,27 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "patchelf-0.9"; name = "patchelf-${version}";
version = "0.10";
src = fetchurl { src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
}; };
# 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 ]; setupHook = [ ./setup-hook.sh ];
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
# if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
doCheck = stdenv.hostPlatform.isMusl;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html; homepage = https://nixos.org/patchelf.html;

View file

@ -1,24 +1,18 @@
{ stdenv, fetchFromGitHub, autoreconfHook }: { stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "patchelf"; name = "patchelf-${version}";
version = "0.10-pre-20190328"; version = "0.10";
src = fetchFromGitHub { src = fetchurl {
owner = "NixOS"; url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
repo = "patchelf"; sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
}; };
# Drop test that fails on musl (?) # Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \ substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" "" --replace "set-rpath-library.sh" ""
'' +
# extend version identifier to more informative than "0.10".
''
echo -n ${version} > version
''; '';
setupHook = [ ./setup-hook.sh ]; setupHook = [ ./setup-hook.sh ];
@ -28,11 +22,11 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
meta = { meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html; homepage = https://nixos.org/patchelf.html;
license = "GPL"; license = licenses.gpl3;
description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ stdenv.lib.maintainers.eelco ]; maintainers = [ maintainers.eelco ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

View file

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

View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki , boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
, qscintilla, qtbase, qttools }: , qscintilla, qtbase, qttools }:
mkDerivation { mkDerivation {
@ -16,7 +16,7 @@ mkDerivation {
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
buildInputs = [ buildInputs = [
boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
]; ];
preConfigure = '' preConfigure = ''
@ -47,7 +47,7 @@ mkDerivation {
"-lssl" "-lssl"
]; ];
NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ]; NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
qtWrapperArgs = [ qtWrapperArgs = [
''--prefix PATH : ${lib.getBin graphviz}/bin'' ''--prefix PATH : ${lib.getBin graphviz}/bin''

View file

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

View file

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

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [ patches = [
# fix build on i686 # fix build on i686
# See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298 # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
(fetchpatch { (fetchpatch {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libtool { stdenv, fetchFromGitHub, cmake, libtool
, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka , libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libtool ninja ]; nativeBuildInputs = [ cmake libtool ninja ];
buildInputs = [ buildInputs = [
boost capnproto cctz clang-unwrapped double-conversion gperftools icu boost capnproto cctz clang-unwrapped double-conversion gperftools icu
libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
]; ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl, zlib , python, munge, perl, pam, openssl, zlib
, ncurses, mysql, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg, lz4 , readline, freeipmi, libssh2, xorg, lz4
# enable internal X11 support via libssh2 # enable internal X11 support via libssh2
, enableX11 ? true , enableX11 ? true
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = [ buildInputs = [
curl python munge perl pam openssl zlib curl python munge perl pam openssl zlib
mysql.connector-c ncurses gtk2 lz4 libmysqlclient ncurses gtk2 lz4
lua hwloc numactl readline freeipmi lua hwloc numactl readline freeipmi
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];

View file

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

View file

@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
, openssl, enableMagnet ? false, lua5_1 ? null , openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, mysql ? null , enableMysql ? false, libmysqlclient ? null
, enableLdap ? false, openldap ? null , enableLdap ? false, openldap ? null
, enableWebDAV ? false, sqlite ? null, libuuid ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null
, enableExtendedAttrs ? false, attr ? null , enableExtendedAttrs ? false, attr ? null
@ -8,7 +8,7 @@
}: }:
assert enableMagnet -> lua5_1 != null; assert enableMagnet -> lua5_1 != null;
assert enableMysql -> mysql != null; assert enableMysql -> libmysqlclient != null;
assert enableLdap -> openldap != null; assert enableLdap -> openldap != null;
assert enableWebDAV -> sqlite != null; assert enableWebDAV -> sqlite != null;
assert enableWebDAV -> libuuid != null; assert enableWebDAV -> libuuid != null;
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql.connector-c ++ stdenv.lib.optional enableMysql libmysqlclient
++ stdenv.lib.optional enableLdap openldap ++ stdenv.lib.optional enableLdap openldap
++ stdenv.lib.optional enableWebDAV sqlite ++ stdenv.lib.optional enableWebDAV sqlite
++ stdenv.lib.optional enableWebDAV libuuid; ++ stdenv.lib.optional enableWebDAV libuuid;

View file

@ -3,7 +3,7 @@
, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
, nixosTests , nixosTests
# Auth modules # Auth modules
, withMySQL ? false, mysql , withMySQL ? false, libmysqlclient
, withPgSQL ? false, postgresql , withPgSQL ? false, postgresql
, withSQLite ? true, sqlite , withSQLite ? true, sqlite
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
++ lib.optional withMySQL mysql.connector-c ++ lib.optional withMySQL libmysqlclient
++ lib.optional withPgSQL postgresql ++ lib.optional withPgSQL postgresql
++ lib.optional withSQLite sqlite; ++ lib.optional withSQLite sqlite;

View file

@ -1,6 +1,6 @@
{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
, enableLDAP ? false, openldap , enableLDAP ? false, openldap
, enableMySQL ? false, mysql, zlib , enableMySQL ? false, libmysqlclient, zlib
, enableAuthDovecot ? false, dovecot , enableAuthDovecot ? false, dovecot
, enablePAM ? false, pam , enablePAM ? false, pam
, enableSPF ? true, libspf2 , enableSPF ? true, libspf2
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ coreutils db openssl perl pcre ] buildInputs = [ coreutils db openssl perl pcre ]
++ stdenv.lib.optional enableLDAP openldap ++ stdenv.lib.optional enableLDAP openldap
++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enableAuthDovecot dovecot
++ stdenv.lib.optional enablePAM pam ++ stdenv.lib.optional enablePAM pam
++ stdenv.lib.optional enableSPF libspf2; ++ stdenv.lib.optional enableSPF libspf2;
@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
''} ''}
${stdenv.lib.optionalString enableMySQL '' ${stdenv.lib.optionalString enableMySQL ''
s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL=yes\)$:\1:
s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/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_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
''} ''}
${stdenv.lib.optionalString enableAuthDovecot '' ${stdenv.lib.optionalString enableAuthDovecot ''
s:^# \(AUTH_DOVECOT\)=.*:\1=yes: s:^# \(AUTH_DOVECOT\)=.*:\1=yes:

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, libevent, libasr, { stdenv, fetchurl, openssl, libevent, libasr,
python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis, python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
enablePython ? true, enablePython ? true,
enableLua ? true, enableLua ? true,
enablePerl ? true, enablePerl ? true,
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libevent buildInputs = [ openssl libevent
libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ]; libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional enableRedis stdenv.lib.optional enableRedis
"-I${hiredis}/include/hiredis -lhiredis" "-I${hiredis}/include/hiredis -lhiredis"
++ stdenv.lib.optional enableMysql ++ stdenv.lib.optional enableMysql
"-L${mysql.connector-c}/lib/mysql"; "-L${libmysqlclient}/lib/mysql";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/; homepage = https://www.opensmtpd.org/;

View file

@ -3,7 +3,7 @@
, buildPackages , buildPackages
, withLDAP ? true, openldap , withLDAP ? true, openldap
, withPgSQL ? false, postgresql , withPgSQL ? false, postgresql
, withMySQL ? false, mysql , withMySQL ? false, libmysqlclient
, withSQLite ? false, sqlite , withSQLite ? false, sqlite
}: }:
@ -12,7 +12,7 @@ let
"-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
] ++ lib.optional withPgSQL "-DHAS_PGSQL" ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optional withSQLite "-DHAS_SQLITE"
++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
auxlibs = lib.concatStringsSep " " ([ auxlibs = lib.concatStringsSep " " ([
@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper m4 ]; nativeBuildInputs = [ makeWrapper m4 ];
buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
++ lib.optional withPgSQL postgresql ++ lib.optional withPgSQL postgresql
++ lib.optional withMySQL mysql.connector-c ++ lib.optional withMySQL libmysqlclient
++ lib.optional withSQLite sqlite ++ lib.optional withSQLite sqlite
++ lib.optional withLDAP openldap; ++ lib.optional withLDAP openldap;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
, dnsutils, libdbi, mysql, zlib, openldap, procps , dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
, runtimeShell }: , runtimeShell }:
with stdenv.lib; with stdenv.lib;
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
''; '';
# !!! make openssh a runtime dependency only # !!! make openssh a runtime dependency only
buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View file

@ -3,7 +3,7 @@
, snmpSupport ? true, net_snmp , snmpSupport ? true, net_snmp
, sshSupport ? true, libssh2 , sshSupport ? true, libssh2
, sqliteSupport ? false, sqlite , sqliteSupport ? false, sqlite
, mysqlSupport ? false, mysql , mysqlSupport ? false, libmysqlclient
, postgresqlSupport ? false, postgresql , postgresqlSupport ? false, postgresql
}: }:
@ -37,7 +37,7 @@ in
++ optional snmpSupport net_snmp ++ optional snmpSupport net_snmp
++ optional sqliteSupport sqlite ++ optional sqliteSupport sqlite
++ optional sshSupport libssh2 ++ optional sshSupport libssh2
++ optional mysqlSupport mysql.connector-c ++ optional mysqlSupport libmysqlclient
++ optional postgresqlSupport postgresql; ++ optional postgresqlSupport postgresql;
configureFlags = [ configureFlags = [

View file

@ -4,7 +4,7 @@
, odbcSupport ? true, unixODBC , odbcSupport ? true, unixODBC
, snmpSupport ? true, net_snmp , snmpSupport ? true, net_snmp
, sshSupport ? true, libssh2 , sshSupport ? true, libssh2
, mysqlSupport ? false, mysql , mysqlSupport ? false, libmysqlclient
, postgresqlSupport ? false, postgresql , postgresqlSupport ? false, postgresql
}: }:
@ -40,7 +40,7 @@ in
++ optional ldapSupport openldap ++ optional ldapSupport openldap
++ optional snmpSupport net_snmp ++ optional snmpSupport net_snmp
++ optional sshSupport libssh2 ++ optional sshSupport libssh2
++ optional mysqlSupport mysql.connector-c ++ optional mysqlSupport libmysqlclient
++ optional postgresqlSupport postgresql; ++ optional postgresqlSupport postgresql;
configureFlags = [ configureFlags = [

View file

@ -0,0 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "3.1.2";
sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
})

View file

@ -0,0 +1,54 @@
{ 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;
};
}

View file

@ -18,13 +18,6 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
mariadb = server // { mariadb = server // {
inherit client; # MariaDB Client inherit client; # MariaDB Client
server = server; # MariaDB Server 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 common = rec { # attributes common to both builds
@ -218,95 +211,4 @@ server = stdenv.mkDerivation (common // {
CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; 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 in mariadb

View file

@ -0,0 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "25.3.27";
sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
})

View file

@ -0,0 +1,63 @@
{ 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;
};
}

View file

@ -4,7 +4,7 @@
, pam, withPAM ? stdenv.isLinux , pam, withPAM ? stdenv.isLinux
, systemd, withSystemd ? stdenv.isLinux , systemd, withSystemd ? stdenv.isLinux
, python2, python3, ncurses , python2, python3, ncurses
, ruby, php-embed, mysql , ruby, php-embed, libmysqlclient
}: }:
let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { 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 # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
path = "plugins/php"; path = "plugins/php";
inputs = [ php-embed ] ++ php-embed.buildInputs; inputs = [ php-embed ] ++ php-embed.buildInputs;
NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ]; NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
}) })
]; ];

View file

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

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig { stdenv, fetchFromGitHub, cmake, pkgconfig
, glib, zlib, pcre, mysql, libressl }: , glib, zlib, pcre, libmysqlclient, libressl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.5"; version = "0.9.5";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; buildInputs = [ glib zlib pcre libmysqlclient libressl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = ''High-perfomance MySQL backup tool''; description = ''High-perfomance MySQL backup tool'';

View file

@ -8,6 +8,7 @@
, qtbase , qtbase
, qtx11extras , qtx11extras
, wrapQtAppsHook , wrapQtAppsHook
, wrapGAppsHook
, gtk3 , gtk3
, xmlto , xmlto
, docbook_xsl , docbook_xsl
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
docbook_xsl docbook_xsl
wrapQtAppsHook wrapQtAppsHook
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
@ -71,7 +73,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; dontWrapGApps = true;
postFixup = lib.optionalString enableVideo '' postFixup = lib.optionalString enableVideo ''
wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}" wrapGApp "$out/bin/zbarcam-gtk"
wrapQtApp "$out/bin/zbarcam-qt" wrapQtApp "$out/bin/zbarcam-qt"
''; '';

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
, boost, python3, postgresql, mysql, gmp, bzip2 }: , boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kea"; pname = "kea";
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--with-pgsql=${postgresql}/bin/pg_config" "--with-pgsql=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.connector-c}/bin/mysql_config" "--with-mysql=${libmysqlclient}/bin/mysql_config"
]; ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ buildInputs = [
openssl log4cplus boost python3 mysql.connector-c openssl log4cplus boost python3 libmysqlclient
botan2 gmp bzip2 botan2 gmp bzip2
]; ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
, python, gss, mysql, system-sendmail }: , python, gss, libmysqlclient, system-sendmail }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${project}-${version}"; name = "${project}-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e '/chown root:mail/d' \ sed -i -e '/chown root:mail/d' \
-e 's/chmod [24]755/chmod 0755/' \ -e 's/chmod [24]755/chmod 0755/' \
*/Makefile{.in,.am} */Makefile{.in,.am}
sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac
sed -i 's/0\.18/0.19/' configure.ac sed -i 's/0\.18/0.19/' configure.ac
sed -i -e 's:mysql/mysql.h:mysql.h:' \ sed -i -e 's:mysql/mysql.h:mysql.h:' \
-e 's:mysql/errmsg.h:errmsg.h:' \ -e 's:mysql/errmsg.h:errmsg.h:' \
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
gss mysql.connector-c python gss libmysqlclient python
]; ];
patches = [ patches = [
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
(fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
]; ];
NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql"; NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
checkInputs = [ dejagnu ]; checkInputs = [ dejagnu ];
doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doCheck = false; # fails 1 out of a bunch of tests, looks like a bug

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient
, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
, libaio, libedit, libtool, libui, libuuid, zlib , libaio, libedit, libtool, libui, libuuid, zlib
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient
ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
libaio libedit libtool libui libuuid zlib libaio libedit libtool libui libuuid zlib
]; ];
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
find $out/bin -type f -perm -0100 | while read f1; do find $out/bin -type f -perm -0100 | while read f1; do
patchelf \ patchelf \
--set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \ --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
--set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \ --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
&& patchelf --shrink-rpath $f1 && patchelf --shrink-rpath $f1
done done

View file

@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
doCheck = true; 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; { meta = with stdenv.lib; {
description = "WWAN modem manager, part of NetworkManager"; description = "WWAN modem manager, part of NetworkManager";
homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;

View file

@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
''; '';
postInstall = '' 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 # Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up: # from not starting back up:
# TODO: remove this once 19.10 is released # TODO: remove this once 19.10 is released

View file

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

View file

@ -22,7 +22,7 @@
, libtool , libtool
, lm_sensors , lm_sensors
, lvm2 , lvm2
, mysql , libmysqlclient
, numactl , numactl
, postgresql , postgresql
, protobufc , protobufc
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
libxml2 postgresql protobufc rrdtool libxml2 postgresql protobufc rrdtool
varnish yajl jdk libtool python hiredis libmicrohttpd varnish yajl jdk libtool python hiredis libmicrohttpd
riemann_c_client mosquitto rdkafka mongoc riemann_c_client mosquitto rdkafka mongoc
] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
iptables libatasmart libcredis libmodbus libsigrok iptables libatasmart libcredis libmodbus libsigrok
lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl

View file

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

View file

@ -189,7 +189,6 @@ mapAliases ({
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 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 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblapackWithoutAtlas = liblapack; # added 2018-11-05 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 libqrencode = qrencode; # added 2019-01-01
librecad2 = librecad; # backwards compatibility alias, added 2015-10 librecad2 = librecad; # backwards compatibility alias, added 2015-10
libsysfs = sysfsutils; # added 2018-04-25 libsysfs = sysfsutils; # added 2018-04-25

View file

@ -1966,7 +1966,7 @@ in
libkrb5 = null; libkrb5 = null;
systemd = null; systemd = null;
jemalloc = null; jemalloc = null;
mysql = null; libmysqlclient = null;
postgresql = null; postgresql = null;
libdbi = null; libdbi = null;
net_snmp = null; net_snmp = null;
@ -11712,7 +11712,7 @@ in
libdbi = callPackage ../development/libraries/libdbi { }; libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = libdbiDrivers.override { libdbiDriversBase = libdbiDrivers.override {
mysql = null; libmysqlclient = null;
sqlite = null; sqlite = null;
}; };
@ -12430,9 +12430,8 @@ in
libwhereami = callPackage ../development/libraries/libwhereami { }; libwhereami = callPackage ../development/libraries/libwhereami { };
giflib = giflib_5_1;
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; giflib = callPackage ../development/libraries/giflib { };
libunarr = callPackage ../development/libraries/libunarr { }; libunarr = callPackage ../development/libraries/libunarr { };
@ -13141,7 +13140,7 @@ in
cups = if stdenv.isLinux then cups else null; cups = if stdenv.isLinux then cups else null;
# XXX: mariadb doesn't built on fbsd as of nov 2015 # XXX: mariadb doesn't built on fbsd as of nov 2015
mysql = if (!stdenv.isFreeBSD) then mysql else null; libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@ -13900,7 +13899,7 @@ in
unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBC = callPackage ../development/libraries/unixODBC { };
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
ustr = callPackage ../development/libraries/ustr { }; ustr = callPackage ../development/libraries/ustr { };
@ -14888,8 +14887,17 @@ in
rpcbind = callPackage ../servers/rpcbind { }; rpcbind = callPackage ../servers/rpcbind { };
mariadb = callPackage ../servers/sql/mariadb { 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; asio = asio_1_10;
};
mariadb = callPackage ../servers/sql/mariadb {
# As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
# https://jira.mariadb.org/browse/MDEV-15034 # https://jira.mariadb.org/browse/MDEV-15034
jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
@ -24157,7 +24165,7 @@ in
mnemonicode = callPackage ../misc/mnemonicode { }; mnemonicode = callPackage ../misc/mnemonicode { };
mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
mysql = mysql; mysql = mysql;
pcre = pcre-cpp; pcre = pcre-cpp;
}); });