JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #196485 from panicgh/percona-xtrabackup

Browse Source
This commit is contained in:
Sandro 2022-10-29 20:49:54 +02:00 committed by GitHub
commit 1e8bea25d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/backup/percona-xtrabackup/2_4.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "2.4.20";
sha256 = "0awdpkcgvx2aq7pwxy8jyzkin6cyrrh3d576x9ldm851kis9n5ii";
version = "2.4.26";
sha256 = "sha256-/erBv/Asi/MfoSvAcQ647VAgOfiViPunFWmvy/W9J18=";
})

7
pkgs/tools/backup/percona-xtrabackup/8_0.nix
View File

@ -1,8 +1,11 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "8.0.13";
sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr";
version = "8.0.29-22";
sha256 = "sha256-dGpfU+IesAyr2s1AEjfYggOEkMGQ9JdEesu5PtJHNXA=";
# includes https://github.com/Percona-Lab/libkmip.git
fetchSubmodules = true;
extraPatches = [
./abi-check.patch

8
pkgs/tools/backup/percona-xtrabackup/abi-check.patch
View File

@ -7,11 +7,11 @@ https://github.com/NixOS/nixpkgs/issues/44530
--- a/cmake/do_abi_check.cmake
+++ b/cmake/do_abi_check.cmake
@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS})
- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
+ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include
- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include
+ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include/nostdinc -I${ABI_SOURCE_DIR}/include
@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS})
- COMMAND sed -e "/^# /d"
+ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d"
- COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d"
+ COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" -e "/^#include <-nostdinc>$/d"
--- /dev/null
+++ b/include/nostdinc/stdint.h
@@ -0,0 +1,1 @@

11
pkgs/tools/backup/percona-xtrabackup/generic.nix
View File

@ -2,7 +2,7 @@
, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4
, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib
, perlPackages
, version, sha256, extraPatches ? [], extraPostInstall ? "", ...
, version, sha256, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
}:
stdenv.mkDerivation rec {
@ -13,23 +13,18 @@ stdenv.mkDerivation rec {
owner = "percona";
repo = "percona-xtrabackup";
rev = "${pname}-${version}";
inherit sha256;
inherit sha256 fetchSubmodules;
};
nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
buildInputs = [
(curl.override { inherit openssl; }) cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4
(curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4
ncurses numactl openssl protobuf valgrind xxd zlib
] ++ (with perlPackages; [ perl DBI DBDmysql ]);
patches = extraPatches;
# Workaround build failure on -fno-common toolchains:
# ld: xbstream.c.o:(.bss+0x0): multiple definition of
# `datasink_buffer'; ds_buffer.c.o:(.data.rel.local+0x0): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
cmakeFlags = [
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DBUILD_CONFIG=xtrabackup_release"

4
pkgs/top-level/all-packages.nix
View File

@ -10157,13 +10157,11 @@ with pkgs;
percona-xtrabackup = percona-xtrabackup_8_0;
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix {
stdenv = gcc10StdenvCompat;
boost = boost159;
openssl = openssl_1_1;
};
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
stdenv = gcc10StdenvCompat;
boost = boost170;
boost = boost177;
openssl = openssl_1_1;
};