pyrox.dev / nixpkgs
lol
fork atom

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