Commit Graph

180 Commits

Author SHA1 Message Date
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Aaron Andersen
7298f524e5
Merge pull request #100413 from helsinki-systems/fix/mariadb-perl
pkgs/mariadb: Fix when running without aliases
2020-10-27 08:23:56 -04:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Stig Palmquist
2929f5edb9
mariadb: 10.4.14 -> 10.4.15
Fixes CVE-2020-15180
2020-10-23 12:24:20 +02:00
Andrew Childs
722d02a720 treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
2020-10-21 13:26:53 +09:00
Janne Heß
ba003ec930
pkgs/mariadb: Fix when running without aliases
DataDumper is an alias to `null` in top-level/perl-packages.nix since
it's included as part of perl.
2020-10-13 15:18:31 +02:00
Izorkin
8e4ecf17db mariadb: 10.4.13 -> 10.4.14 2020-08-15 10:42:13 +03:00
Doron Behar
1f13d6506f mariadb: don't move pam files on Darwin 2020-06-11 21:34:38 +03:00
Izorkin
a1ec028812 mariadb: move mariadb_mtr to share/pam 2020-05-23 15:32:46 +03:00
Izorkin
2f0396776e mariadb: change directory installing pam 2020-05-23 15:32:46 +03:00
Izorkin
feaac81f01 mariadb: 10.4.12 -> 10.4.13 2020-05-23 15:32:46 +03:00
Izorkin
6ac9a9fcb4 mariadb: 10.3.22 -> 10.4.12 2020-05-14 17:29:40 +03:00
Izorkin
585bbc598c mariadb: add link to all mysql tests 2020-05-06 16:42:31 +03:00
Izorkin
300c3f9990 nixos/tests: add check mariadb galera cluster with rsync-based SST 2020-05-06 16:42:31 +03:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Izorkin
5abc729dd6 mariadb: fix deps build 2020-04-02 18:05:07 +03:00
Izorkin
24357432cd mariadb: add zstd compression 2020-04-02 18:05:06 +03:00
Izorkin
eafdfc8f51 mariadb: add option to build server without rocksdb storage 2020-04-02 18:05:06 +03:00
Izorkin
0296e678cf mariadb: add option to build server without tokudb storage 2020-04-02 18:05:04 +03:00
Florian Klink
4b8d66aa72 mariadb: remove withoutClient
When used as a global override, it breaks most of the options in the
mysql module, such as ensureDatabases, ensureUsers, initialDatabases,
initialScript.

We could use `.client` there, but if the reasoning behind this was
closure size reduction, we now end up with the same (or a bigger)
runtime closure and more complexity.

Apart from the options exposed by the mysql module, the client is also
likely to be required for local backups or DBA tasks anyways.

Instead of dealing with all the increased complexity of this for no
arguable benefit, let's just remove the `withoutClient` argument.
Storage space on mysql servers shouldn't be that much of an issue.

Closes #82428.
2020-03-15 13:49:13 +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
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
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
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
Aaron Andersen
2295a94fc1 mariadb: 10.3.18 -> 10.3.20 2019-11-14 10:13:27 -08: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
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
e2bd655822 mariadb-galera: move to external package 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