3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

203 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
Thomas Tuegel f72d7dcf77
mariadb-connector-c: separate .dev output 2020-09-12 06:58:20 -05: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
Frederik Rietdijk 43f71029cc Merge master into staging-next 2020-06-05 19:40:53 +02:00
Izorkin f23e4bdc56 mariadb-galera: 26.4.3 -> 26.4.5 2020-05-23 15:33:16 +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
Jan Tojnar f8a9c6efac
Merge branch 'staging-next' into staging 2020-05-18 21:09:48 +02:00
Izorkin c1983f71a2 mariadb-connector-c: 3.1.7 -> 3.1.8 2020-05-15 16:37:48 +03:00
Izorkin 6ac9a9fcb4 mariadb: 10.3.22 -> 10.4.12 2020-05-14 17:29:40 +03:00
Izorkin a40a811b17 mariadb-galera: 25.3.27 -> 26.4.3 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
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