diff options
author | Artturi <Artturin@artturin.com> | 2023-10-04 00:31:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-04 00:31:39 +0300 |
commit | 003eb726eb9ec0bd350925a3ebe3f02a157c5293 (patch) | |
tree | 55c60d88513e1344130161fd9b9854ac3a8f89d3 | |
parent | 09940ec19c64523bb7e9ce951fc992e554a4448d (diff) | |
parent | 4f267a0b776931134e131c8b65c35c95e3b30483 (diff) |
Merge pull request #258686 from flyingcircusio/percona-xtrabackup-8.0.34
-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 d5e1389d618e9..5bdfd864daca7 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 3bcf09ca43f92..112a3f556204a 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 31b4b12ba4edd..f5025012e8c55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11865,7 +11865,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 { }; |