Merge #157386: mysql: 8.0.27 -> 8.0.28

+7 -10
+6 -9
pkgs/servers/sql/mysql/8.0.x.nix
··· 1 { lib, stdenv, fetchurl, bison, cmake, pkg-config 2 - , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd 3 - , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools 4 }: 5 6 let 7 self = stdenv.mkDerivation rec { 8 pname = "mysql"; 9 - version = "8.0.27"; 10 11 src = fetchurl { 12 url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; 13 - sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c="; 14 }; 15 - 16 - patches = [ 17 - ./abi-check.patch 18 - ]; 19 20 nativeBuildInputs = [ bison cmake pkg-config ] 21 ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; ··· 28 29 buildInputs = [ 30 boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib 31 - zstd 32 ] ++ lib.optionals stdenv.isLinux [ 33 numactl libtirpc 34 ] ++ lib.optionals stdenv.isDarwin [ ··· 68 connector-c = self; 69 server = self; 70 mysqlVersion = "8.0"; 71 }; 72 73 meta = with lib; {
··· 1 { lib, stdenv, fetchurl, bison, cmake, pkg-config 2 + , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2 3 + , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests 4 }: 5 6 let 7 self = stdenv.mkDerivation rec { 8 pname = "mysql"; 9 + version = "8.0.28"; 10 11 src = fetchurl { 12 url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; 13 + sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI="; 14 }; 15 16 nativeBuildInputs = [ bison cmake pkg-config ] 17 ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; ··· 24 25 buildInputs = [ 26 boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib 27 + zstd libfido2 28 ] ++ lib.optionals stdenv.isLinux [ 29 numactl libtirpc 30 ] ++ lib.optionals stdenv.isDarwin [ ··· 64 connector-c = self; 65 server = self; 66 mysqlVersion = "8.0"; 67 + tests = nixosTests.mysql.mysql80; 68 }; 69 70 meta = with lib; {
pkgs/servers/sql/mysql/abi-check.patch pkgs/tools/backup/percona-xtrabackup/abi-check.patch
+1 -1
pkgs/tools/backup/percona-xtrabackup/8_0.nix
··· 5 sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; 6 7 extraPatches = [ 8 - ./../../../servers/sql/mysql/abi-check.patch 9 ]; 10 11 extraPostInstall = ''
··· 5 sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; 6 7 extraPatches = [ 8 + ./abi-check.patch 9 ]; 10 11 extraPostInstall = ''