pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #196485 from panicgh/percona-xtrabackup

authored by Sandro and committed by GitHub 1e8bea25 b647155e

+15 -19
unified split
+2 -2
pkgs/tools/backup/percona-xtrabackup/2_4.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // { 4 - version = "2.4.20"; 5 - sha256 = "0awdpkcgvx2aq7pwxy8jyzkin6cyrrh3d576x9ldm851kis9n5ii"; 4 + version = "2.4.26"; 5 + sha256 = "sha256-/erBv/Asi/MfoSvAcQ647VAgOfiViPunFWmvy/W9J18="; 6 6 })
+5 -2
pkgs/tools/backup/percona-xtrabackup/8_0.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // { 4 - version = "8.0.13"; 5 - sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; 4 + version = "8.0.29-22"; 5 + sha256 = "sha256-dGpfU+IesAyr2s1AEjfYggOEkMGQ9JdEesu5PtJHNXA="; 6 + 7 + # includes https://github.com/Percona-Lab/libkmip.git 8 + fetchSubmodules = true; 6 9 7 10 extraPatches = [ 8 11 ./abi-check.patch
+4 -4
pkgs/tools/backup/percona-xtrabackup/abi-check.patch
··· 7 7 --- a/cmake/do_abi_check.cmake 8 8 +++ b/cmake/do_abi_check.cmake 9 9 @@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS}) 10 - - -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include 11 - + -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include 10 + - -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include 11 + + -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include/nostdinc -I${ABI_SOURCE_DIR}/include 12 12 @@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) 13 - - COMMAND sed -e "/^# /d" 14 - + COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" 13 + - COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" 14 + + COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" 15 15 --- /dev/null 16 16 +++ b/include/nostdinc/stdint.h 17 17 @@ -0,0 +1,1 @@
+3 -8
pkgs/tools/backup/percona-xtrabackup/generic.nix
··· 2 2 , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 3 3 , ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib 4 4 , perlPackages 5 - , version, sha256, extraPatches ? [], extraPostInstall ? "", ... 5 + , version, sha256, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { ··· 13 13 owner = "percona"; 14 14 repo = "percona-xtrabackup"; 15 15 rev = "${pname}-${version}"; 16 - inherit sha256; 16 + inherit sha256 fetchSubmodules; 17 17 }; 18 18 19 19 nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; 20 20 21 21 buildInputs = [ 22 - (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4 22 + (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 23 23 ncurses numactl openssl protobuf valgrind xxd zlib 24 24 ] ++ (with perlPackages; [ perl DBI DBDmysql ]); 25 25 26 26 patches = extraPatches; 27 - 28 - # Workaround build failure on -fno-common toolchains: 29 - # ld: xbstream.c.o:(.bss+0x0): multiple definition of 30 - # `datasink_buffer'; ds_buffer.c.o:(.data.rel.local+0x0): first defined here 31 - NIX_CFLAGS_COMPILE = "-fcommon"; 32 27 33 28 cmakeFlags = [ 34 29 "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+1 -3
pkgs/top-level/all-packages.nix
··· 10157 10157 10158 10158 percona-xtrabackup = percona-xtrabackup_8_0; 10159 10159 percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { 10160 - stdenv = gcc10StdenvCompat; 10161 10160 boost = boost159; 10162 10161 openssl = openssl_1_1; 10163 10162 }; 10164 10163 percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { 10165 - stdenv = gcc10StdenvCompat; 10166 - boost = boost170; 10164 + boost = boost177; 10167 10165 openssl = openssl_1_1; 10168 10166 }; 10169 10167