commit 5ba8d3a083a9e5e70bdb97b92df63076c8ae6611 · pyrox.dev/nixpkgs

+13 -7

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

···

       34
       34
        
       let

     

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

     

       36
       36
        
       

     

       37
       37
       -
         mysqlShellVersion = "8.4.0";

     

       38
       38
       -
         mysqlServerVersion = "8.4.0";

     

       37
       37
       +
         mysqlShellVersion = "9.0.0";

     

       38
       38
       +
         mysqlServerVersion = "9.0.0";

     

       39
       39
        
       in

     

       40
       40
        
       stdenv.mkDerivation (finalAttrs: {

     

       41
       41
        
         pname = "mysql-shell-innovation";

     
···

       44
       44
        
         srcs = [

     

       45
       45
        
           (fetchurl {

     

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

     

       47
       47
       -
             hash = "sha256-R6VDP83WOduDa5nhtUWcK4E8va0j/ytd1K0n95K6kY4=";

     

       47
       47
       +
             hash = "sha256-Eadqo0BGFcacgv/FKL4GnzPWwXvjsCaz01YYFBAUCy0=";

     

       48
       48
        
           })

     

       49
       49
        
           (fetchurl {

     

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

     

       51
       51
       -
             hash = "sha256-QT30FNogn7JR/dQ3V86QaAZaMREMKvTocRTUaNLGVlg=";

     

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

     

       52
       52
        
           })

     

       53
       53
        
         ];

     

       54
       54
        
       

     
···

       58
       58
        
           mv mysql-${mysqlServerVersion} mysql

     

       59
       59
        
         '';

     

       60
       60
        
       

     

       61
       61
       +
         patches = [

     

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

     

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

     

       64
       64
       +
           ./no-openssl-bundling.patch

     

       65
       65
       +
         ];

     

       66
       66
       +
       

     

       61
       67
        
         postPatch = ''

     

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

     

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

     

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

     

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

     

       64
       70
        
       

     

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

     

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

     

       66
       72
        
         '';

     

       67
       73
        
       

     

       68
       74
        
         nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]

+12

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

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index 33931e02a..59f613a9d 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

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

     

       6
       6
       +
        ### Bundling of OpenSSL libraries (if needed)

     

       7
       7
       +
        # macro MYSQL_CHECK_SSL_DLLS() adapted for Shell

     

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

     

       9
       9
       +
       -  SET(BUNDLED_OPENSSL 1)

     

       10
       10
       +
          MESSAGE(STATUS "WITH_SSL_PATH ${WITH_SSL_PATH}")

     

       11
       11
       +
        

     

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