Merge pull request #109006 from totten/master-mysql-8022

mysql80: 8.0.17 -> 8.0.22

pkgs/servers/sql/mysql/8.0.x.nix

@@ -1,27 +1,33 @@
 { lib, stdenv, fetchurl, bison, cmake, pkgconfig
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib
+, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
 , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto
 }:
 
 let
 self = stdenv.mkDerivation rec {
   pname = "mysql";
-  version = "8.0.17";
+  version = "8.0.22";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
-    sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6";
+    sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a";
   };
 
   patches = [
     ./abi-check.patch
-    ./libutils.patch
   ];
 
   nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ];
 
+  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
+  postPatch = ''
+    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
+    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+  '';
+
   buildInputs = [
     boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
+    zstd
   ] ++ lib.optionals stdenv.isLinux [
     numactl libtirpc
   ] ++ lib.optionals stdenv.isDarwin [

pkgs/servers/sql/mysql/libutils.patch

@@ -1,5 +0,0 @@
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
--      COMMAND /usr/bin/libtool -static -o $<TARGET_FILE:${TARGET}>
-+      COMMAND libtool -static -o $<TARGET_FILE:${TARGET}>

pkgs/top-level/all-packages.nix

@@ -17839,7 +17839,7 @@ in
   mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
     inherit (darwin) cctools developer_cmds;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
-    boost = boost169; # Configure checks for specific version.
+    boost = boost173; # Configure checks for specific version.
     protobuf = protobuf3_7;
   };