Merge #157386: mysql: 8.0.27 -> 8.0.28

pkgs/servers/sql/mysql/8.0.x.nix

@@ -1,22 +1,18 @@
 { lib, stdenv, fetchurl, bison, cmake, pkg-config
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
-, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools
+, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2
+, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
 }:
 
 let
 self = stdenv.mkDerivation rec {
   pname = "mysql";
-  version = "8.0.27";
+  version = "8.0.28";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c=";
+    sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
   };
 
-  patches = [
-    ./abi-check.patch
-  ];
-
   nativeBuildInputs = [ bison cmake pkg-config ]
     ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
 
@@ -28,7 +24,7 @@ self = stdenv.mkDerivation rec {
 
   buildInputs = [
     boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
-    zstd
+    zstd libfido2
   ] ++ lib.optionals stdenv.isLinux [
     numactl libtirpc
   ] ++ lib.optionals stdenv.isDarwin [
@@ -68,6 +64,7 @@ self = stdenv.mkDerivation rec {
     connector-c = self;
     server = self;
     mysqlVersion = "8.0";
+    tests = nixosTests.mysql.mysql80;
   };
 
   meta = with lib; {

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 = ''