Merge pull request #129661 from peperunas/master

mysql: 8.0.22 -> 8.0.25
This commit is contained in:
Ben Siraphob 2021-07-09 19:18:00 +07:00 committed by GitHub
commit 3191d4f0af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -1,16 +1,16 @@
{ 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
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl
}:
let
self = stdenv.mkDerivation rec {
pname = "mysql";
version = "8.0.22";
version = "8.0.25";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a";
sha256 = "c16aa9cf621bc028efba2bb11f3c36a323b125fa0d108ff92fab60e46309206e";
};
patches = [
@ -27,7 +27,7 @@ self = stdenv.mkDerivation rec {
'';
buildInputs = [
boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
zstd
] ++ lib.optionals stdenv.isLinux [
numactl libtirpc

View file

@ -19851,7 +19851,7 @@ in
inherit (darwin) cctools developer_cmds;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_7;
protobuf = protobuf3_11;
icu = icu67;
};