Merge pull request #131698 from mweinelt/21.05/mysql

[21.05] mysql 8.0.22 -> 8.0.26
This commit is contained in:
ajs124 2021-07-28 02:24:17 +02:00 committed by GitHub
commit 0562809586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

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