diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-02-06 16:43:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-02-06 16:43:33 +0100 |
| commit | 846dbe5bc8ca131defcca09b8f1e765211eddc94 (patch) | |
| tree | e8daa688a97fdff2beac441a4432a43d368b9a1d /pkgs | |
| parent | 189f73465b9b1c7534e28e327283c4cdd34ddf41 (diff) | |
| parent | b054a140f4e79dda3a556a8bf13492968c3a4f26 (diff) | |
| download | nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar.gz nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar.bz2 nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar.lz nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar.xz nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.tar.zst nixpkgs-846dbe5bc8ca131defcca09b8f1e765211eddc94.zip | |
Merge #157386: mysql: 8.0.27 -> 8.0.28
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sql/mysql/8.0.x.nix | 15 | ||||
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/8_0.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/backup/percona-xtrabackup/abi-check.patch (renamed from pkgs/servers/sql/mysql/abi-check.patch) | 0 |
3 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 58b264c9b1e..ae2e170379d 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/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; { diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 2878e93fe70..648074eb5b9 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/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 = '' diff --git a/pkgs/servers/sql/mysql/abi-check.patch b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch index de45d9c3ea2..de45d9c3ea2 100644 --- a/pkgs/servers/sql/mysql/abi-check.patch +++ b/pkgs/tools/backup/percona-xtrabackup/abi-check.patch |