From 8eabf7a637809ac9e5f7c7f1e45c1921d3ea41dc Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 17 Oct 2022 21:50:51 +0200 Subject: [PATCH 1/3] percona-xtrabackup_*: fix version test, cleanup * Reorder `libevent` and `libev` in `buildInputs`. Otherwise, cmake picks up the wrong `event.h` and the version test for `libevent` fails. * Remove apparently obsolete workaround from fc8061dae4. --- pkgs/tools/backup/percona-xtrabackup/generic.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 2ea2088645e4..01286288775f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -19,17 +19,12 @@ stdenv.mkDerivation rec { 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" From 213e8e9224be6555c460067ad75a4ffc1d319197 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 17 Oct 2022 21:50:51 +0200 Subject: [PATCH 2/3] percona-xtrabackup_8_0: 8.0.13 -> 8.0.29-22 * boost: 1.70 -> 1.77 * Unpin stdenv --- pkgs/tools/backup/percona-xtrabackup/8_0.nix | 7 +++++-- pkgs/tools/backup/percona-xtrabackup/abi-check.patch | 8 ++++---- pkgs/tools/backup/percona-xtrabackup/generic.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 648074eb5b96..d5e1389d618e 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -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 diff --git a/pkgs/tools/backup/percona-xtrabackup/abi-check.patch b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch index de45d9c3ea21..53442ef5bc00 100644 --- a/pkgs/tools/backup/percona-xtrabackup/abi-check.patch +++ b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch @@ -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 @@ diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 01286288775f..3bcf09ca43f9 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -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,7 +13,7 @@ stdenv.mkDerivation rec { owner = "percona"; repo = "percona-xtrabackup"; rev = "${pname}-${version}"; - inherit sha256; + inherit sha256 fetchSubmodules; }; nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ce969e09072..47668bd9ae63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10078,8 +10078,7 @@ with pkgs; 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; }; From 4b32f3795e9f38cd12f8606e0ac01b18fb9f08fe Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 17 Oct 2022 23:45:59 +0200 Subject: [PATCH 3/3] percona-xtrabackup_2_4: 2.4.20 -> 2.4.26 * Unpin stdenv --- pkgs/tools/backup/percona-xtrabackup/2_4.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/2_4.nix b/pkgs/tools/backup/percona-xtrabackup/2_4.nix index 5c9ce70e5b95..0d2f951c5f89 100644 --- a/pkgs/tools/backup/percona-xtrabackup/2_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/2_4.nix @@ -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="; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47668bd9ae63..42683724ec9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10073,7 +10073,6 @@ 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; };