Commit Graph

175 Commits

Author SHA1 Message Date
Frederik Rietdijk ef156f7a8b Merge staging-next into staging 2020-02-27 10:15:34 +01:00
Jörg Thalheim 5b732a1f51
Merge pull request #80768 from aanderse/mysql-dialog
mariadb: do not delete runtime plugins from package
2020-02-25 20:08:43 +00:00
Jörg Thalheim b93ef3bf00
Merge pull request #80756 from B4dM4n/mariadb-pkgconfig-link
mariadb-connector-c: add mysqlclient.pc pkgconfig symlink
2020-02-25 19:13:44 +00:00
Izorkin ca4cec7c87 mariadb-connector-c: 3.1.5 -> 3.1.7 2020-02-23 10:36:38 +03:00
Izorkin 982a23de94 mariadb: add needed packages 2020-02-22 11:31:05 +03:00
Izorkin c6d159d696 mariadb: build server with NUMA 2020-02-22 11:30:07 +03:00
Izorkin e4f17a2b17 mariadb: 10.3.20 -> 10.3.22 2020-02-22 11:26:28 +03:00
Aaron Andersen 951ceca9df mariadb: do not delete runtime plugins from package 2020-02-21 20:31:35 -05:00
Fabian Möller 349a991bfb
mariadb-connector-c: add mysqlclient.pc pkgconfig symlink 2020-02-21 23:05:44 +01:00
Johannes Schleifenbaum 39ebcc496f
mariadb: mytop add "clear" to PATH
The following error was printed every second:

    Can't exec "clear": Not a directory at /nix/store/.../bin/.mytop-wrapped line 110.
    Use of uninitialized value $CLEAR in string at /nix/store/.../bin/.mytop-wrapped line 781.

Therefore the mytop output was repeatedly displayed instead of updating itself "in-place".
2020-02-03 15:48:18 +01:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b 9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
Izorkin 7470e6e6de mariadb: refactor build configuration 2019-11-15 10:16:51 +03:00
Izorkin 3c824cd0f6 mariadb: remove development components 2019-11-15 10:15:25 +03:00
Jan Tojnar da76deffd1
Merge branch 'master' into staging-next 2019-11-14 23:25:36 +01:00
Aaron Andersen 2295a94fc1 mariadb: 10.3.18 -> 10.3.20 2019-11-14 10:13:27 -08:00
Izorkin 571c59fa42 mariadb-connector-c: 3.1.4 -> 3.1.5 2019-11-12 14:51:45 +01:00
Frederik Rietdijk d9642e006f mariadb-connector-c: make patch only for darwin to reduce rebuilds 2019-10-30 15:01:52 +01:00
Izorkin 638edb9528 mariadb-connector-c: fix crypt_libs 2019-10-30 15:00:43 +01:00
Izorkin 527372f2ec mariadb-connector-c: fix mysql_version.h search error 2019-10-25 12:40:53 +03:00
Izorkin ffae858195 mariadb-connector-c: 3.1.2 -> 3.1.4 2019-10-23 10:01:40 +03:00
Dmitry Kalinkin 1f9882cb29
Merge pull request #70841 from callahad/mariadb
mariadb: fix builds on darwin
2019-10-10 22:58:28 -04:00
Dan Callahan b0b0bb7e0b
mariadb: fix darwin build
We want to disable `PLUGIN_AUTH_PAM` when building:

1. `mariadb` on macOS.
2. `mariadb-client` on any platform

Unfortunately, the interaction of these two commits
  6c97b0486c
  7e43b4d0ae
created a situation where we disable it *twice* when building on macOS.
Once in a darwin-specific `prePatch` script, and again in the `patches`
section for client builds.

This removes the redundant `prePatch` script and conditionally applies
the patch to `mariadb` server builds on darwin.

Fixes #70835
2019-10-09 21:56:59 +01:00
ajs124 532c3a6075 mariadb-connector-c: fix socket path 2019-09-29 13:03:05 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Matthew Bauer 067b4dbb93 mariadb: add patch for missing libcrypt on darwin
Really fixes #69034
2019-09-22 17:34:24 -04:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát 41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Matthew Bauer 7e43b4d0ae mariadb: disable auth_pam plugin on darwin
Fixes #69034

This plugin doesn’t work right for us now, needs to be disabled. It
was added first in 10.3.18:

91fdb931fa (diff-7cea40646c6b8df9a67a3eac4eec9bc6)
2019-09-21 00:18:34 -04:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Yurii Izorkin 6c97b0486c mariadb: 10.3.17 -> 10.3.18 (#68541)
* mariadb: fix library locate

* mariadb: 10.3.17 -> 10.3.18
2019-09-15 23:48:37 -04:00
Izorkin edf389d92b mariadb-connector-c: drop v2.3 2019-09-09 16:05:01 +03:00
Izorkin 50fbe46ae7 mariadb-galera: 25.3.26 -> 25.3.27 2019-09-09 15:55:34 +03:00
Izorkin e2bd655822 mariadb-galera: move to external package 2019-09-09 15:55:34 +03:00
Izorkin 3def2b4b6a mariadb-connector-c: init at 3.1.2 2019-09-09 15:55:34 +03:00
Izorkin cfb909229d mariadb-connector-c: move to external package 2019-09-09 15:55:34 +03:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Izorkin 21e891efd1 mariadb: fix build in Darwin 2019-08-02 13:31:13 +03:00
Izorkin 12f95f7572 mariadb: remove c++11 narrowing error patch 2019-08-01 20:26:23 +03:00
Izorkin ac90575382 mariadb: clean config 2019-08-01 20:26:21 +03:00
Izorkin 0692c615e5 mariadb: remove test binaries 2019-08-01 14:22:10 +03:00
Izorkin 0a4562277f mariadb: fix config build mariadb client 2019-08-01 14:18:12 +03:00
Izorkin c8488b913a mariadb: add option to build server without client binary files 2019-08-01 14:15:55 +03:00
Izorkin f0d88f05b6 mariadb: fix mariadb_config path 2019-08-01 14:08:45 +03:00
Izorkin 9d5e531dff mariadb: 10.3.15 -> 10.3.17 2019-08-01 14:01:56 +03:00
Aaron Andersen ccb9ada402 mariadb: fix mytop script 2019-07-31 22:35:15 -04:00
Andrew Childs b8a6649797 mariadb: fix clang and darwin build
The contents of `clang-isfinite.patch` are no longer necessary after
upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which
includes a similar change.

Building in c++11 mode removes support for the GCC `typeof` extension
in favor of the standardized `__typeof__`. This causes errors when
using the `strmake_buf` macro, which relies on `typeof`.
2019-06-07 00:29:40 +09:00
Matthew Bauer 75a82b54a1
Merge pull request #44343 from Izorkin/mariadb-10.3
mariadb: 10.2.17 -> 10.3.15
2019-06-04 12:28:31 -04:00
Izorkin a3da901ec7 mariadb: 10.2.17 -> 10.3.15 2019-06-04 19:02:16 +03:00