Commit Graph

100 Commits

Author SHA1 Message Date
Matthew Justin Bauer
542412ec7a
Merge pull request #37976 from Izorkin/mariadb-connector-c-2.3.5
mariadb.connector-c: 2.3.4 -> 2.3.5
2018-04-17 10:09:00 -05:00
Izorkin
991fd430f3 mariadb.connector-c: 2.3.4 -> 2.3.5 2018-03-28 11:14:22 +03:00
Izorkin
610c49ef89 mariadb: 10.2.13 -> 10.2.14 2018-03-28 11:04:12 +03:00
Izorkin
2470d22ae1 mariadb: 10.2.12 -> 10.2.13 (#35119) 2018-02-20 22:24:38 +01:00
Will Dietz
24721aad18 mariadb: disable tokudb on musl, per docs (and fix build) 2018-02-13 09:45:02 -06:00
Daiderd Jordan
d71c8da8da
mariadb: fix connector-c library install_name on darwin 2018-01-27 22:52:33 +01:00
Orivej Desh
45f6d97e6e mariadb: clean up during the rebuild from merging #33513 2018-01-06 18:45:38 +00:00
Izorkin
08cde7d69f mariadb: 10.2.11 -> 10.2.12 2018-01-06 18:41:00 +01:00
Orivej Desh
306eefaa95 mariadb.client: fix darwin build
Fixes #33517
2018-01-06 16:31:42 +00:00
Daiderd Jordan
106d87b6c6 mariadb: fix darwin build 2018-01-06 16:36:48 +01:00
Orivej Desh
210a281a1a
Merge pull request #33267 from Izorkin/mariadb-mysqltest
mariadb: disabling mysql-test and sql-bench directories
2018-01-06 03:11:32 +00:00
Orivej Desh
4f5aa9bc25 mariadb: fix eval 2018-01-05 14:54:42 +00:00
Orivej Desh
b41e5ece14 mysql.connector-c: fix build on Darwin
Broken by #30546.
2018-01-05 14:19:50 +00:00
Izorkin
b2598d57d0 mariadb: disabling mysql-test and sql-bench directories 2018-01-01 11:45:45 +03:00
Izorkin
88657b3a50 mariadb: remove broken link file rcmysql 2017-12-29 02:18:35 +01:00
Izorkin
62a3561b5e mariadb connector-c: 2.3.3 -> 2.3.4 2017-12-29 02:18:35 +01:00
Robin Gloster
4fb9533511 mariadb: add lib/include path compatibility to mysql 2017-12-29 02:18:35 +01:00
Robin Gloster
1ca8a7aff6 mariadb: cleanup obsolete code and fix upstream cmake 2017-12-29 02:18:35 +01:00
Izorkin
b96bf4a891 mariadb: 10.2.9 -> 10.2.11 2017-12-29 02:18:35 +01:00
Robin Gloster
c707fa002d mariadb: 10.2.8 -> 10.2.9 2017-12-29 02:18:35 +01:00
Robin Gloster
3fcf6bf518 mariadb: 10.2.7 -> 10.2.8 2017-12-29 02:18:35 +01:00
Markus Mueller
3e241efe9b mariadb: fix socket path
This also fixes mysql connections to localhost  in php because it gets
the socket path from mysql_config.
2017-12-29 02:18:35 +01:00
Robin Gloster
52e65be0d6 mariadb: fix i686 build 2017-12-29 02:18:35 +01:00
Robin Gloster
5672ca2d0b mariadb: 10.2.6 -> 10.2.7 2017-12-29 02:18:35 +01:00
Robin Gloster
77af1d2000 mysql.server: fix build
That moveToOutput should've been only for the client
2017-12-29 02:18:35 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
9265012de6 mariadb: fix lib cycle and hash 2017-12-29 02:18:35 +01:00
Robin Gloster
a8df05ee2f mariadb: 10.1.26 -> 10.2.6 2017-12-29 02:18:35 +01:00
Florian Jacob
7504c75c9c mariadb: 10.1.26 -> 10.1.28 2017-10-02 22:22:25 +02:00
Florian Jacob
e911e39c26 mariadb: 10.1.25 -> 10.1.26 2017-09-27 09:42:32 +02:00
Tim Steinbach
820c7591f8
mariadb: 10.1.21 -> 10.1.25 2017-07-29 15:05:09 -04:00
Sebastian Hagen
cb9fe8cead Mariadb: Fix URL for source tarball.
mariadb.org appears to have changed their URL schemes, and the tarball URL used
by this derivation no longer works, which makes this unbuildable from scratch.

This change updates that URL to a mariadb.org location that will still serve
this tarball.

Hash is unchanged.
2017-07-03 02:53:13 +01:00
Graham Christensen
111b4e4c87
mariadb: 10.1.19 -> 10.1.21 for multiple CVEs 2017-01-25 20:53:24 -05:00
Tim Steinbach
0736bd2c53
mariadb: 10.1.18 -> 10.1.19 2016-11-16 12:04:41 -05:00
Tim Steinbach
697dbb9741
mariadb: 10.1.17 -> 10.1.18 2016-10-09 16:04:58 -04:00
Tim Steinbach
e525217269
mariadb: 10.1.16 -> 10.1.17 2016-09-23 11:45:42 -04:00
Eelco Dolstra
33da338bde mariadb: Don't install mysqlbug
This causes a dependency on gcc.
2016-09-19 20:03:40 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Dan Peebles
ccd16f87d5 mariadb: re-enable jemalloc on darwin and fix impurity
CMake in its usual infinite wisdom searches all over the system for java
and finds the host OSX java and JNI headers. It then decides to build the
connector and fails later on because we didn't actually tell Nix that we
wanted java in scope. So instead, we just tell CMake that we don't want
the jdbc connector. I believe it does the same with GSS, so I disable
that stuff too. None of this should affect Linux, but let me know if it
does somheow.
2016-08-14 15:08:23 -04:00
Vladimír Čunát
1c9307d348 mariadb on Darwin: another attempt to fix
Adding jemalloc to buildInputs didn't work out a97df891,
as jemalloc doesn't build correctly on Darwin ATM.
2016-08-13 09:03:33 +02:00
Vladimír Čunát
a97df891fe mariadb: use jemalloc on every platform
It seems to be failing to configure without it on Darwin:
http://hydra.nixos.org/build/38440660/nixlog/1/raw
This doesn't cause a rebuild on Linux platforms.
2016-08-11 19:25:51 +02:00
Vladimír Čunát
6f5c6fb6a1 mariadb: remove darwin patch that no longer applies
Hopefully it isn't needed anymore.
2016-08-10 22:07:33 +02:00
Vladimír Čunát
b94559dc7f mariadb: make the attribute point to the full build
It will create least surprises. Only those who want to go light
have to choose.
2016-08-07 22:44:57 +02:00
Vladimír Čunát
9a072482e6 mariadb: completely separate a server-less build
libmysqlclient is all that most closures need; now it's smaller and
quick to build. For cases that need a server (via executable or lib),
there's a full build for now; later it could be slimmed by removing the
client stuff.
2016-08-07 20:46:36 +02:00
Phil Wetzel
6ce89e174f mariadb: wrap mysqld with --basedir 2016-05-12 18:22:53 -04:00
Arseniy Seroka
0b3827d04a Merge pull request #14772 from cleverca22/mariadb
mariadb: fix arm builds
2016-04-17 22:16:24 +03:00
Dan Peebles
5ced92f83b mariadb: fix build on darwin
My simplistic test seemed to work just fine, so I assume the
install_name_tool shenanigans became unnecessary at some point.
2016-04-17 14:49:25 -04:00
michael bishop
437468d5ea
mariadb: fix arm builds 2016-04-17 00:40:10 -03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Eelco Dolstra
523f4f2f69 mariadb: Disable parallel building again
It still fails intermittently on lex_token.h.

http://hydra.nixos.org/build/33571559
2016-03-23 20:11:07 +01:00