mysql-shell: 8.0.32 -> 8.0.33
This commit is contained in:
parent
297ff712f3
commit
baf549a9a1
|
@ -27,7 +27,6 @@
|
||||||
, re2
|
, re2
|
||||||
, ncurses
|
, ncurses
|
||||||
, libfido2
|
, libfido2
|
||||||
, v8
|
|
||||||
, python3
|
, python3
|
||||||
, cyrus_sasl
|
, cyrus_sasl
|
||||||
, openldap
|
, openldap
|
||||||
|
@ -39,16 +38,16 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mysql-shell";
|
pname = "mysql-shell";
|
||||||
version = "8.0.32";
|
version = "8.0.33";
|
||||||
|
|
||||||
srcs = [
|
srcs = [
|
||||||
(fetchurl {
|
(fetchurl {
|
||||||
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
|
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
|
||||||
hash = "sha256-GUkeZ856/olOssiqkb3qc8ddnianVGXwrcW6hrIG3wE=";
|
hash = "sha256-ElcAOvyQjXNns35p4J+jnGu8orZR81Itz/fxYh7Usbs=";
|
||||||
})
|
})
|
||||||
(fetchurl {
|
(fetchurl {
|
||||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
|
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
|
||||||
hash = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig=";
|
hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -83,7 +82,6 @@ stdenv.mkDerivation rec {
|
||||||
libfido2
|
libfido2
|
||||||
cyrus_sasl
|
cyrus_sasl
|
||||||
openldap
|
openldap
|
||||||
v8
|
|
||||||
python3
|
python3
|
||||||
antlr.runtime.cpp
|
antlr.runtime.cpp
|
||||||
] ++ pythonDeps
|
] ++ pythonDeps
|
||||||
|
@ -108,14 +106,10 @@ stdenv.mkDerivation rec {
|
||||||
"-DWITH_LZ4=system"
|
"-DWITH_LZ4=system"
|
||||||
"-DWITH_ZLIB=system"
|
"-DWITH_ZLIB=system"
|
||||||
"-DWITH_PROTOBUF=${protobuf}"
|
"-DWITH_PROTOBUF=${protobuf}"
|
||||||
"-DHAVE_V8=1"
|
"-DHAVE_V8=0" # V8 10.x required.
|
||||||
"-DV8_INCLUDE_DIR=${v8}/include"
|
|
||||||
"-DV8_LIB_DIR=${v8}/lib"
|
|
||||||
"-DHAVE_PYTHON=1"
|
"-DHAVE_PYTHON=1"
|
||||||
];
|
];
|
||||||
|
|
||||||
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
|
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
|
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -881,7 +881,6 @@ with pkgs;
|
||||||
boost = boost177; # Configure checks for specific version.
|
boost = boost177; # Configure checks for specific version.
|
||||||
protobuf = protobuf3_19;
|
protobuf = protobuf3_19;
|
||||||
icu = icu69;
|
icu = icu69;
|
||||||
v8 = v8_8_x;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
broadlink-cli = callPackage ../tools/misc/broadlink-cli { };
|
broadlink-cli = callPackage ../tools/misc/broadlink-cli { };
|
||||||
|
|
Loading…
Reference in a new issue