diff options
| author | Tobias Stenzel <ts@flyingcircus.io> | 2023-10-03 00:57:21 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-10-04 19:58:29 +0000 |
| commit | 14d1a8ff666038dc71329e598a31b74dad52d904 (patch) | |
| tree | cb0fd4b7681b5c1ce502e2a15d71af58557033c8 | |
| parent | Merge pull request #259007 from NixOS/backport-258769-to-release-23.05 (diff) | |
| download | nixpkgs-origin/backport-258686-to-release-23.05.tar.gz | |
percona-xtrabackup_8_0: 8.0.29-22 -> 8.0.34-29origin/backport-258686-to-release-23.05
https://docs.percona.com/percona-xtrabackup/8.0/release-notes/8.0/8.0.34-29.0.html
(cherry picked from commit 4f267a0b776931134e131c8b65c35c95e3b30483)
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/8_0.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/generic.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index d5e1389d618e..5bdfd864daca 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "8.0.29-22"; - sha256 = "sha256-dGpfU+IesAyr2s1AEjfYggOEkMGQ9JdEesu5PtJHNXA="; + version = "8.0.34-29"; + hash = "sha256-dO5ciIIAnKj2t+fYhrtnY7MvBThoA+SymBzN8H07giM="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 3bcf09ca43f9..112a3f556204 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 -, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib +, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib , perlPackages -, version, sha256, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... }: stdenv.mkDerivation rec { @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { owner = "percona"; repo = "percona-xtrabackup"; rev = "${pname}-${version}"; - inherit sha256 fetchSubmodules; + inherit hash fetchSubmodules; }; nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; buildInputs = [ (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 - ncurses numactl openssl protobuf valgrind xxd zlib + ncurses numactl openssl procps protobuf valgrind xxd zlib ] ++ (with perlPackages; [ perl DBI DBDmysql ]); patches = extraPatches; @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ]; + maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11ac31cc4850..c93bde2685df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11121,7 +11121,6 @@ with pkgs; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost177; - openssl = openssl_1_1; }; pick = callPackage ../tools/misc/pick { }; |