Merge pull request #171366 from aaronjheng/mysql-shell

mysql-shell: 8.0.28 -> 8.0.29

pkgs/development/tools/mysql-shell/default.nix

@@ -31,14 +31,10 @@
 , CoreServices
 , developer_cmds
 , DarwinTools
-, mysql-shell
 }:
 
 let
-  pythonDeps = [
-    python3.pkgs.certifi
-    python3.pkgs.paramiko
-  ];
+  pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ];
   site = ''
 
     import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
@@ -46,24 +42,22 @@ let
 in
 stdenv.mkDerivation rec{
   pname = "mysql-shell";
-  version = "8.0.28";
+  version = "8.0.29";
 
   srcs = [
     (fetchurl {
       url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
-      sha256 = "sha256-xm2sepVgI0MPs25vu+BcRQeksaVhHcQlymreN1myu6c=";
+      sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
-      sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
+      sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY=";
     })
   ];
 
   sourceRoot = "mysql-shell-${version}-src";
 
   postPatch = ''
-    patch ../mysql-${version}/cmake/fido2.cmake ${./fido2.cmake.patch}
-
     substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool
     substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
 
@@ -73,12 +67,7 @@ stdenv.mkDerivation rec{
     echo '${site}' >> python/packages/mysqlsh/__init__.py
   '';
 
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    git
-    bison
-  ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
+  nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
 
   buildInputs = [
     boost
@@ -99,30 +88,21 @@ stdenv.mkDerivation rec{
     cyrus_sasl
     openldap
     v8
+    python3
   ] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
     numactl
     libtirpc
-  ] ++ lib.optionals stdenv.isDarwin [
-    cctools
-    CoreServices
-    developer_cmds
-    DarwinTools
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ];
 
   preConfigure = ''
     # Build MySQL
-    cmake -DWITH_BOOST=system \
-      -DWITH_SYSTEM_LIBS=ON \
-      -DWITH_ROUTER=OFF \
-      -DWITH_UNIT_TESTS=OFF \
-      -DFORCE_UNSUPPORTED_COMPILER=1 \
-      -S ../mysql-${version} -B ../mysql-${version}/build
+    cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
+      -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build
 
     cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
 
     # Get libv8_monolith
-    mkdir -p ../v8/lib
-    ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
+    mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
   '';
 
   cmakeFlags = [
@@ -139,10 +119,7 @@ stdenv.mkDerivation rec{
     "-DHAVE_PYTHON=1"
   ];
 
-  CXXFLAGS = [
-    "-DV8_COMPRESS_POINTERS=1"
-    "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1"
-  ];
+  CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
 
   meta = with lib; {
     homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";

pkgs/development/tools/mysql-shell/fido2.cmake.patch

@@ -1,25 +0,0 @@
-diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake
-index c20e6e75c0d..f2d5cbd8430 100644
---- a/cmake/fido2.cmake
-+++ b/cmake/fido2.cmake
-@@ -30,19 +30,8 @@ MACRO(FIND_FIDO_VERSION)
-   IF(WITH_FIDO STREQUAL "bundled")
-     SET(FIDO_VERSION "1.7.0")
-   ELSE()
--    # This does not set any version information:
--    # PKG_CHECK_MODULES(SYSTEM_FIDO fido2)
--
-     MYSQL_CHECK_PKGCONFIG()
--    EXECUTE_PROCESS(
--      COMMAND ${MY_PKG_CONFIG_EXECUTABLE} --modversion libfido2
--      OUTPUT_VARIABLE MY_FIDO_MODVERSION
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_MODVERSION_RESULT
--      )
--    IF(MY_MODVERSION_RESULT EQUAL 0)
--      SET(FIDO_VERSION ${MY_FIDO_MODVERSION})
--    ENDIF()
-+    PKG_CHECK_MODULES(FIDO libfido2)
-   ENDIF()
-   MESSAGE(STATUS "FIDO_VERSION (${WITH_FIDO}) is ${FIDO_VERSION}")
- ENDMACRO(FIND_FIDO_VERSION)

pkgs/top-level/all-packages.nix

@@ -625,8 +625,8 @@ with pkgs;
   mysql-shell = callPackage ../development/tools/mysql-shell {
     inherit (darwin) cctools developer_cmds DarwinTools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
-    boost = boost173; # Configure checks for specific version.
-    protobuf = protobuf3_11;
+    boost = boost177; # Configure checks for specific version.
+    protobuf = protobuf3_19;
     icu =  icu67;
     v8 = v8_8_x;
   };