alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mariadb: lib -> connector-c

Browse source
This commit is contained in:
Robin Gloster 2017-07-09 17:43:03 +02:00
parent 9265012de6
commit ee1c85aee9
18 changed files with 62 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/science/math/glsurf/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
}; };
buildInputs = [ freeglut mesa mysql.lib mpfr gmp buildInputs = [ freeglut mesa mysql.connector-c 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

2
pkgs/applications/video/kodi/default.nix
View file

@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
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.lib avahi lame sqlite mysql.connector-c 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

2
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -70,7 +70,7 @@ self: 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.lib; }); mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
# check requires mysql server # check requires mysql server
mysql-simple = dontCheck super.mysql-simple; mysql-simple = dontCheck super.mysql-simple;

2
pkgs/development/haskell-modules/configuration-nix.nix
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.lib; }); mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
# 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: {

2
pkgs/development/interpreters/php/default.nix
View file

@ -12,7 +12,7 @@ let
{ version, sha256 }: { version, sha256 }:
let php7 = lib.versionAtLeast version "7.0"; let php7 = lib.versionAtLeast version "7.0";
mysqlHeaders = mysql.lib.dev or mysql; mysqlHeaders = mysql.connector-c or mysql;
mysqlndSupport = config.php.mysqlnd or false; mysqlndSupport = config.php.mysqlnd or false;
mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders;

2
pkgs/development/libraries/gdal/default.nix
View file

@ -29,7 +29,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.lib.dev}/bin/mysql_config" "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-sqlite3=${sqlite.dev}" "--with-sqlite3=${sqlite.dev}"
"--with-spatialite=${libspatialite}" "--with-spatialite=${libspatialite}"

2
pkgs/development/libraries/gdal/gdal-1_11.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"--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.lib.dev}/bin/mysql_config" "--with-mysql=${mysql.connector-c}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-python" # optional "--with-python" # optional
"--with-static-proj4=${proj}" # optional "--with-static-proj4=${proj}" # optional

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -160,7 +160,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 ]
++ optionals (mysql != null) [ mysql.lib ] ++ optionals (mysql != null) [ mysql.connector-c ]
++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals gtkStyle [ gtk2 gdk_pixbuf ]
++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];

11
pkgs/development/ocaml-modules/mysql/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, mysql }: { stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }:
# 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,14 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true; createFindlibDestdir = true;
propagatedBuildInputs = [ mysql.client ]; propagatedBuildInputs = [ mysql.connector-c ];
patches = [
(fetchpatch {
url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch";
sha256 = "0018s2wcrvbsw9yaqmwq500qmikwffrgdp5xg9b8v7ixhd4gi6hn";
})
];
meta = { meta = {
homepage = http://ocaml-mysql.forge.ocamlcore.org; homepage = http://ocaml-mysql.forge.ocamlcore.org;

2
pkgs/development/perl-modules/DBD-mysql/default.nix
View file

@ -8,7 +8,7 @@ buildPerlPackage rec {
sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";
}; };
buildInputs = [ mysql.lib ] ; buildInputs = [ mysql.connector-c ] ;
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
doCheck = false; doCheck = false;

6
pkgs/development/r-modules/default.nix
View file

@ -320,7 +320,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.lib pkgs.mariadb pkgs.openssl.dev ]; RMySQL = [ pkgs.zlib pkgs.mysql.connector-c 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 ];
@ -798,10 +798,10 @@ let
}); });
RMySQL = old.RMySQL.overrideDerivation (attrs: { RMySQL = old.RMySQL.overrideDerivation (attrs: {
MYSQL_DIR="${pkgs.mysql.lib}"; MYSQL_DIR="${pkgs.mysql.connector-c}";
preConfigure = '' preConfigure = ''
patchShebangs configure patchShebangs configure
''; '';
}); });
devEMF = old.devEMF.overrideDerivation (attrs: { devEMF = old.devEMF.overrideDerivation (attrs: {

4
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -167,11 +167,11 @@ in
}; };
mysql = attrs: { mysql = attrs: {
buildInputs = [ mysql.lib zlib openssl ]; buildInputs = [ mysql.connector-c zlib openssl ];
}; };
mysql2 = attrs: { mysql2 = attrs: {
buildInputs = [ mysql.lib zlib openssl ]; buildInputs = [ mysql.connector-c zlib openssl ];
}; };
ncursesw = attrs: { ncursesw = attrs: {

2
pkgs/servers/http/lighttpd/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql.lib ++ stdenv.lib.optional enableMysql mysql.connector-c
++ stdenv.lib.optional enableLdap openldap; ++ stdenv.lib.optional enableLdap openldap;
configureFlags = [ "--with-openssl" ] configureFlags = [ "--with-openssl" ]

32
pkgs/servers/sql/mariadb/default.nix
View file

@ -11,7 +11,7 @@ let # in mariadb # spans the whole file
mariadb = everything // { mariadb = everything // {
inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin
server = everything; # a full single-output build, including everything in `client` again server = everything; # a full single-output build, including everything in `client` again
lib = client; # compat. with the old mariadb split inherit connector-c; # libmysqlclient.so
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
@ -159,4 +159,34 @@ everything = stdenv.mkDerivation (common // {
''; '';
}); });
connector-c = stdenv.mkDerivation rec {
name = "mariadb-connector-c-${version}";
version = "2.3.3";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
sha256 = "12a0j4r01vrdpvl53zq433fb74gd4mm4v5jqmnf4nrg76h0p39c2";
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" ];
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ openssl zlib ];
enableParallelBuilding = true;
postFixup = ''
ln -sv mariadb_config $out/bin/mysql_config
'';
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;
};
};
in mariadb in mariadb

2
pkgs/servers/web-apps/frab/Gemfile.lock
View file

@ -180,7 +180,7 @@ GEM
pry (~> 0.10) pry (~> 0.10)
pry-rails (0.3.4) pry-rails (0.3.4)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (3.6.0) puma (3.9.1)
rack (1.6.4) rack (1.6.4)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)

6
pkgs/servers/web-apps/frab/gemset.nix
View file

@ -628,10 +628,10 @@
puma = { puma = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399"; sha256 = "1k13n500r7v480rcbxm7k09hip0zi7p8zvy3vajj8g9hb7gdcwnp";
type = "gem"; type = "gem";
}; };
version = "3.6.0"; version = "3.9.1";
}; };
rack = { rack = {
source = { source = {
@ -929,4 +929,4 @@
}; };
version = "0.9.5"; version = "0.9.5";
}; };
} }

2
pkgs/tools/networking/mailutils/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional doCheck dejagnu; ] ++ stdenv.lib.optional doCheck dejagnu;
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.lib gss mysql.connector-c
]; ];
patches = [ patches = [

4
pkgs/top-level/python-packages.nix
View file

@ -11534,9 +11534,9 @@ in {
sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
}; };
buildInputs = with self; [ nose pkgs.openssl ]; buildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ]; propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ];
meta = { meta = {
description = "MySQL database binding for Python"; description = "MySQL database binding for Python";