From f6d3da9061a54576436906e201fa336f1fdda716 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Wed, 7 Jul 2021 16:45:12 +0100 Subject: [PATCH 1/2] mysql 8.0.22 -> 8.0.25 --- pkgs/servers/sql/mysql/8.0.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index cdbfdaea7adf..d5bc01716997 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -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 From d44293e8470479666c9a83e23e83179aa00d45f9 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Thu, 8 Jul 2021 15:55:35 +0100 Subject: [PATCH 2/2] mysql 8.0.25: protobuf 3.7 -> 3.11 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0b60596998..4f84fb21d223 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19838,7 +19838,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; };