Merge pull request #200006 from aaronjheng/mysql-shell

mysql-shell: 8.0.30 -> 8.0.31

authored by Mario Rodas and committed by GitHub a17cdadb 62c59662

+21 -17
+20 -17
pkgs/development/tools/mysql-shell/default.nix
··· 4 , cmake 5 , fetchurl 6 , git 7 , bison 8 , openssl 9 , protobuf ··· 26 , python3 27 , cyrus_sasl 28 , openldap 29 - , numactl 30 - , cctools 31 - , CoreServices 32 - , developer_cmds 33 - , DarwinTools 34 - , makeWrapper 35 }: 36 37 let 38 pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; 39 - pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps; 40 in 41 - stdenv.mkDerivation rec{ 42 pname = "mysql-shell"; 43 - version = "8.0.30"; 44 45 srcs = [ 46 (fetchurl { 47 url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; 48 - sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA="; 49 }) 50 (fetchurl { 51 url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; 52 - sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q="; 53 }) 54 ]; 55 ··· 62 substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool 63 ''; 64 65 - nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; 66 67 buildInputs = [ 68 boost ··· 84 openldap 85 v8 86 python3 87 - ] ++ pythonDeps ++ lib.optionals stdenv.isLinux [ 88 - numactl 89 - libtirpc 90 - ] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; 91 92 preConfigure = '' 93 # Build MySQL 94 cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ 95 -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build 96 ··· 114 CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; 115 116 postFixup = '' 117 - wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}" 118 ''; 119 120 meta = with lib; {
··· 4 , cmake 5 , fetchurl 6 , git 7 + , cctools 8 + , developer_cmds 9 + , DarwinTools 10 + , makeWrapper 11 + , CoreServices 12 , bison 13 , openssl 14 , protobuf ··· 31 , python3 32 , cyrus_sasl 33 , openldap 34 + , antlr 35 }: 36 37 let 38 pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; 39 in 40 + stdenv.mkDerivation rec { 41 pname = "mysql-shell"; 42 + version = "8.0.31"; 43 44 srcs = [ 45 (fetchurl { 46 url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; 47 + sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s="; 48 }) 49 (fetchurl { 50 url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; 51 + sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; 52 }) 53 ]; 54 ··· 61 substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool 62 ''; 63 64 + nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] 65 + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] 66 + ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; 67 68 buildInputs = [ 69 boost ··· 85 openldap 86 v8 87 python3 88 + antlr.runtime.cpp 89 + ] ++ pythonDeps 90 + ++ lib.optionals stdenv.isLinux [ libtirpc ] 91 + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; 92 93 preConfigure = '' 94 # Build MySQL 95 + echo "Building mysqlclient mysqlxclient" 96 + 97 cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ 98 -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build 99 ··· 117 CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; 118 119 postFixup = '' 120 + wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" 121 ''; 122 123 meta = with lib; {
+1
pkgs/top-level/all-packages.nix
··· 790 mysql-shell = callPackage ../development/tools/mysql-shell { 791 inherit (darwin) cctools developer_cmds DarwinTools; 792 inherit (darwin.apple_sdk.frameworks) CoreServices; 793 boost = boost177; # Configure checks for specific version. 794 protobuf = protobuf3_19; 795 icu = icu69;
··· 790 mysql-shell = callPackage ../development/tools/mysql-shell { 791 inherit (darwin) cctools developer_cmds DarwinTools; 792 inherit (darwin.apple_sdk.frameworks) CoreServices; 793 + antlr = antlr4_10; 794 boost = boost177; # Configure checks for specific version. 795 protobuf = protobuf3_19; 796 icu = icu69;