Merge pull request #200006 from aaronjheng/mysql-shell
mysql-shell: 8.0.30 -> 8.0.31
This commit is contained in:
commit
a17cdadb7a
2 changed files with 21 additions and 17 deletions
|
@ -4,6 +4,11 @@
|
|||
, cmake
|
||||
, fetchurl
|
||||
, git
|
||||
, cctools
|
||||
, developer_cmds
|
||||
, DarwinTools
|
||||
, makeWrapper
|
||||
, CoreServices
|
||||
, bison
|
||||
, openssl
|
||||
, protobuf
|
||||
|
@ -26,30 +31,24 @@
|
|||
, python3
|
||||
, cyrus_sasl
|
||||
, openldap
|
||||
, numactl
|
||||
, cctools
|
||||
, CoreServices
|
||||
, developer_cmds
|
||||
, DarwinTools
|
||||
, makeWrapper
|
||||
, antlr
|
||||
}:
|
||||
|
||||
let
|
||||
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
|
||||
pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps;
|
||||
in
|
||||
stdenv.mkDerivation rec{
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-shell";
|
||||
version = "8.0.30";
|
||||
version = "8.0.31";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
|
||||
sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA=";
|
||||
sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
|
||||
sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q=";
|
||||
sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o=";
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -62,7 +61,9 @@ stdenv.mkDerivation rec{
|
|||
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]
|
||||
++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
|
@ -84,13 +85,15 @@ stdenv.mkDerivation rec{
|
|||
openldap
|
||||
v8
|
||||
python3
|
||||
] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
|
||||
numactl
|
||||
libtirpc
|
||||
] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ];
|
||||
antlr.runtime.cpp
|
||||
] ++ pythonDeps
|
||||
++ lib.optionals stdenv.isLinux [ libtirpc ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
preConfigure = ''
|
||||
# Build MySQL
|
||||
echo "Building mysqlclient mysqlxclient"
|
||||
|
||||
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
|
||||
|
||||
|
@ -114,7 +117,7 @@ stdenv.mkDerivation rec{
|
|||
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}"
|
||||
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -790,6 +790,7 @@ with pkgs;
|
|||
mysql-shell = callPackage ../development/tools/mysql-shell {
|
||||
inherit (darwin) cctools developer_cmds DarwinTools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
antlr = antlr4_10;
|
||||
boost = boost177; # Configure checks for specific version.
|
||||
protobuf = protobuf3_19;
|
||||
icu = icu69;
|
||||
|
|
Loading…
Reference in a new issue