diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2022-01-30 12:00:47 +0100 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2022-01-30 12:06:01 +0100 |
| commit | b054a140f4e79dda3a556a8bf13492968c3a4f26 (patch) | |
| tree | 1b55c4b72d65b916ee22d60186485b22d54cd384 /pkgs/tools/backup | |
| parent | e09c5b306185ea9e5938979d82a61e2abbc50a2c (diff) | |
| download | nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar.gz nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar.bz2 nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar.lz nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar.xz nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.tar.zst nixpkgs-b054a140f4e79dda3a556a8bf13492968c3a4f26.zip | |
mysql: 8.0.27 -> 8.0.28
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-28.html
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/8_0.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/abi-check.patch | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 2878e93fe70..648074eb5b9 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -5,7 +5,7 @@ callPackage ./generic.nix (args // { sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; extraPatches = [ - ./../../../servers/sql/mysql/abi-check.patch + ./abi-check.patch ]; extraPostInstall = '' diff --git a/pkgs/tools/backup/percona-xtrabackup/abi-check.patch b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch new file mode 100644 index 00000000000..de45d9c3ea2 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch @@ -0,0 +1,18 @@ +MySQL ABI check assumes that with -nostdinc any standard #include terminates +preprocessing, but we do not provide that: +https://github.com/NixOS/nixpkgs/issues/44530 + +"#error" does not terminate preprocessing, so we #include a non-existent file instead. + +--- 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 +@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) +- COMMAND sed -e "/^# /d" ++ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" +--- /dev/null ++++ b/include/nostdinc/stdint.h +@@ -0,0 +1,1 @@ ++#include <-nostdinc> |