3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

248 commits

Author SHA1 Message Date
github-actions[bot] defe3d1bbd
Merge staging-next into staging 2021-11-26 00:02:13 +00:00
github-actions[bot] c39cd5f314
Merge master into staging-next 2021-11-26 00:01:38 +00:00
SCOTT-HAMILTON b47648f6c8
mariadb-connector-c: fix static build (#147166) 2021-11-25 16:03:55 -05:00
toonn 787a8b85fb mariadb: Add comment to clarify version file renames 2021-11-24 15:17:13 -08:00
toonn 8b09fd98eb mariadb: Rename "version" files for LLVM 11
Libc++abi 11 has `#include <version>` in some places. This clashes with
projects that have files named "version" in directories that end up on
the include path. This includes files named "VERSION" on
case-insensitive file systems.
2021-11-24 15:17:13 -08:00
github-actions[bot] 588cccd6c5
Merge master into staging-next 2021-11-24 06:01:08 +00:00
Vika Shleina ccb2baa615
mariadb: fix build on non-x86_64 linux
pmdk is only available on x86_64-linux, yet included in other platforms.

Things tested:
 - build on x86_64-linux is the same (substituted from binary cache)
 - build on aarch64-linux doesn't crash now with an "unsupported system"
2021-11-24 02:18:47 +03:00
Artturi 40d43349e6
Merge pull request #146442 from Artturin/mariaconnectormyconfig 2021-11-22 19:11:15 +02:00
Izorkin 8aa3e1f42a
mariadb-galera: 26.4.9 -> 26.4.10 2021-11-19 20:58:04 +03:00
Izorkin 1fa2e5fdc9
mariadb: move patches to subfolder 2021-11-19 20:58:04 +03:00
Izorkin 595511e632
mariadb: cleanup build configuration 2021-11-19 20:58:01 +03:00
Izorkin cff899a959
mariadb: add pmem support 2021-11-19 20:56:03 +03:00
Izorkin be52b4640f
mariadb: move fix mytop to common stage 2021-11-19 20:54:12 +03:00
ajs124 937cf30e7e mariadb: replace libaio with liburing
was missed in a160dfbf35

see also https://jira.mariadb.org/browse/MDEV-24883
2021-11-19 16:10:34 +01:00
Artturin e148f5ff46 mariadb-connector-c: install my_config.h
https://github.com/bmwiedemann/openSUSE/blob/master/packages/m/mariadb-connector-c/mariadb-connector-c.spec#L152
https://github.com/NixOS/nixpkgs/issues/146340

arch, however, packages it in their mariadb-libs package which provides
connector-c so a nixpkgs mariadb maintainer may want to look into that
https://archlinux.org/packages/extra/x86_64/mariadb-libs/files/
2021-11-18 02:03:17 +02:00
Dmitry Kalinkin 86db5fef7b
mariadb: fix darwin build 2021-11-17 02:46:12 -05:00
Dmitry Kalinkin 6253ab088a
mariadb: revert to using fetchurl
Unlike the `fetchzip`, the `fetchurl` allows for tarballs to be backed
up to tarballs.nixos.org.
2021-11-17 02:43:44 -05:00
ajs124 09d3d7fe36 mariadb: 10.6.3 -> 10.6.5
https://mariadb.com/kb/en/mariadb-1064-release-notes/
https://mariadb.com/kb/en/mariadb-1065-release-notes/
2021-11-11 00:34:39 +01:00
Jan Tojnar 4d440e9089 mariadb: remove broken symlink
We are removing the file this links to so let’s remove the link as well.
2021-09-24 02:39:16 +02:00
Vladimír Čunát 01ab36d875
mariadb.client: fixup build
I expect it got broken by mariadb update in PR #132916 (a160dfbf3).
2021-09-12 11:42:22 +02:00
ajs124 9aad425904 libmysqlclient: init 3.2 and default to it
https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/
2021-08-12 13:22:39 +02:00
ajs124 5055c1e969 mariadb-galera: 26.4.8 -> 26.4.9 2021-08-12 13:22:36 +02:00
ajs124 a160dfbf35 mariadb: 10.5.11 -> 10.6.3
new minor release https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/
2021-08-12 13:22:34 +02:00
github-actions[bot] 75dab3d616
Merge master into staging-next 2021-07-07 12:01:21 +00:00
Kasper Gałkowski cd7ca4552a mariadb: replace galera_new_cluster in postPatch instead of postInstall
This prevents build errors when building mariadb with systemd removed
from buildInputs, in which case the galera_new_cluster file isn't
copied to $out/bin.

Also fixes a small bug where the URL in the script became invalid
after replacing - now it correctly points to an article on the MariaDB
website.
2021-07-06 00:33:56 +02:00
github-actions[bot] a28ba52cac
Merge staging-next into staging 2021-07-05 18:01:46 +00:00
Izorkin f85b19387d
mariadb: libsodium is required to build mroonga storage 2021-07-04 22:51:17 +03:00
ajs124 c016be18c5 mariadb: 10.5.10 -> 10.5.11
https://mariadb.com/kb/en/mariadb-10511-release-notes/
2021-06-23 23:58:09 +02:00
ajs124 8cde2b8d37 mariadb-connector-c: 3.1.12 -> 3.1.13
https://mariadb.com/kb/en/mariadb-connector-c-3113-release-notes/
2021-06-23 23:57:42 +02:00
github-actions[bot] 115881e756
Merge master into staging-next 2021-05-10 12:24:32 +00:00
github-actions[bot] 450e66080b
Merge master into staging-next 2021-05-09 18:23:01 +00:00
ajs124 59eba3aa9c mariadb-galera: don't produce symlink loop
as sugested by Izorkin
2021-05-09 15:41:55 +02:00
ajs124 b58f6f6b51 mariadb-galera: remove unused code 2021-05-09 15:19:15 +02:00
ajs124 878c4135cd mariadb-galera: 26.4.7 -> 26.4.8
- switch from scons to cmake, because scons was deprecated upstream
  and this allows us to simplify the derivation significantly

- add myself as maintainer
2021-05-08 02:48:45 +02:00
ajs124 8b30f2e15b mariadb: 10.5.8 -> 10.5.10 2021-05-08 01:55:18 +02:00
Izorkin 1f3560bb68
mariadb-connector-c: 3.1.8 -> 3.1.12 2021-04-24 11:51:50 +03:00
sternenseemann 92887309bb mariadb-connector-c: correct license, lgpl 2.1 or later 2021-03-20 01:40:48 +01:00
Izorkin 0607ca0001
mariadb-galera: 26.4.5 -> 26.4.7 2021-02-01 17:50:03 +03:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob 872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Izorkin 856a8b6ab5
mariadb: disable build S3 plugin on Darwin 2021-01-12 17:22:54 +03:00
Izorkin 91e580397e
mariadb: 10.4.15 -> 10.5.8 2021-01-12 17:22:54 +03:00
Izorkin d688f790dd
mariadb: drop build server with tokudb storage 2021-01-12 17:22:47 +03:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
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