Unverified Commit 003eb726 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #258686 from flyingcircusio/percona-xtrabackup-8.0.34

parents 09940ec1 4f267a0b

pkgs/tools/backup/percona-xtrabackup/8_0.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/tools/backup/percona-xtrabackup/generic.nix

+5 −5
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -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 { };