Unverified Commit 5ba8d3a0 authored by Aaron Jheng's avatar Aaron Jheng
Browse files

mysql-shell-innovation: 8.4.0 -> 9.0.0

parent 46d2f0f7

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

+13 −7
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
let

  pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];



  mysqlShellVersion = "8.4.0";

  mysqlServerVersion = "8.4.0";

  mysqlShellVersion = "9.0.0";

  mysqlServerVersion = "9.0.0";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "mysql-shell-innovation";
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { 
  srcs = [

    (fetchurl {

      url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";

      hash = "sha256-R6VDP83WOduDa5nhtUWcK4E8va0j/ytd1K0n95K6kY4=";

      hash = "sha256-Eadqo0BGFcacgv/FKL4GnzPWwXvjsCaz01YYFBAUCy0=";

    })

    (fetchurl {

      url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";

      hash = "sha256-QT30FNogn7JR/dQ3V86QaAZaMREMKvTocRTUaNLGVlg=";

      hash = "sha256-0b+QUVp6D1a8ed1HG7u+s4PZ8rGfM6uCOcpq/T8FPjs=";

    })

  ];
@@ -58,11 +58,17 @@ stdenv.mkDerivation (finalAttrs: { 
    mv mysql-${mysqlServerVersion} mysql

  '';



  patches = [

    # No openssl bundling on macOS. It's not working.

    # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53

    ./no-openssl-bundling.patch

  ];



  postPatch = ''

    substituteInPlace ../mysql/cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool

    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-quiet /usr/bin/libtool libtool

    substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool

    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool



    substituteInPlace cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool

    substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool

  '';



  nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]

pkgs/development/tools/mysql-shell/no-openssl-bundling.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 33931e02a..59f613a9d 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -901,7 +901,6 @@ endif()

 ### Bundling of OpenSSL libraries (if needed)

 # macro MYSQL_CHECK_SSL_DLLS() adapted for Shell

 IF (WITH_SSL_PATH AND (APPLE OR WIN32 OR LINUX_STANDALONE))

-  SET(BUNDLED_OPENSSL 1)

   MESSAGE(STATUS "WITH_SSL_PATH ${WITH_SSL_PATH}")

 

   # In MySQL Server 8.0.4 and up, OpenSSL is linked dynamically and