mysql-shell: 8.0.28 -> 8.0.29
This commit is contained in:
parent
2a5f9fcde6
commit
cf5534a408
|
@ -31,14 +31,10 @@
|
||||||
, CoreServices
|
, CoreServices
|
||||||
, developer_cmds
|
, developer_cmds
|
||||||
, DarwinTools
|
, DarwinTools
|
||||||
, mysql-shell
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pythonDeps = [
|
pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ];
|
||||||
python3.pkgs.certifi
|
|
||||||
python3.pkgs.paramiko
|
|
||||||
];
|
|
||||||
site = ''
|
site = ''
|
||||||
|
|
||||||
import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
|
import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
|
||||||
|
@ -46,24 +42,22 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec{
|
stdenv.mkDerivation rec{
|
||||||
pname = "mysql-shell";
|
pname = "mysql-shell";
|
||||||
version = "8.0.28";
|
version = "8.0.29";
|
||||||
|
|
||||||
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";
|
||||||
sha256 = "sha256-xm2sepVgI0MPs25vu+BcRQeksaVhHcQlymreN1myu6c=";
|
sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA=";
|
||||||
})
|
})
|
||||||
(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";
|
||||||
sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
|
sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
sourceRoot = "mysql-shell-${version}-src";
|
sourceRoot = "mysql-shell-${version}-src";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patch ../mysql-${version}/cmake/fido2.cmake ${./fido2.cmake.patch}
|
|
||||||
|
|
||||||
substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool
|
substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool
|
||||||
substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
|
substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
|
||||||
|
|
||||||
|
@ -73,12 +67,7 @@ stdenv.mkDerivation rec{
|
||||||
echo '${site}' >> python/packages/mysqlsh/__init__.py
|
echo '${site}' >> python/packages/mysqlsh/__init__.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
||||||
pkg-config
|
|
||||||
cmake
|
|
||||||
git
|
|
||||||
bison
|
|
||||||
] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
|
@ -99,30 +88,21 @@ stdenv.mkDerivation rec{
|
||||||
cyrus_sasl
|
cyrus_sasl
|
||||||
openldap
|
openldap
|
||||||
v8
|
v8
|
||||||
|
python3
|
||||||
] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
|
] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
|
||||||
numactl
|
numactl
|
||||||
libtirpc
|
libtirpc
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ];
|
||||||
cctools
|
|
||||||
CoreServices
|
|
||||||
developer_cmds
|
|
||||||
DarwinTools
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# Build MySQL
|
# Build MySQL
|
||||||
cmake -DWITH_BOOST=system \
|
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
|
||||||
-DWITH_SYSTEM_LIBS=ON \
|
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build
|
||||||
-DWITH_ROUTER=OFF \
|
|
||||||
-DWITH_UNIT_TESTS=OFF \
|
|
||||||
-DFORCE_UNSUPPORTED_COMPILER=1 \
|
|
||||||
-S ../mysql-${version} -B ../mysql-${version}/build
|
|
||||||
|
|
||||||
cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
|
cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
|
||||||
|
|
||||||
# Get libv8_monolith
|
# Get libv8_monolith
|
||||||
mkdir -p ../v8/lib
|
mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
|
||||||
ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -139,10 +119,7 @@ stdenv.mkDerivation rec{
|
||||||
"-DHAVE_PYTHON=1"
|
"-DHAVE_PYTHON=1"
|
||||||
];
|
];
|
||||||
|
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
|
||||||
"-DV8_COMPRESS_POINTERS=1"
|
|
||||||
"-DV8_31BIT_SMIS_ON_64BIT_ARCH=1"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";
|
homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake
|
|
||||||
index c20e6e75c0d..f2d5cbd8430 100644
|
|
||||||
--- a/cmake/fido2.cmake
|
|
||||||
+++ b/cmake/fido2.cmake
|
|
||||||
@@ -30,19 +30,8 @@ MACRO(FIND_FIDO_VERSION)
|
|
||||||
IF(WITH_FIDO STREQUAL "bundled")
|
|
||||||
SET(FIDO_VERSION "1.7.0")
|
|
||||||
ELSE()
|
|
||||||
- # This does not set any version information:
|
|
||||||
- # PKG_CHECK_MODULES(SYSTEM_FIDO fido2)
|
|
||||||
-
|
|
||||||
MYSQL_CHECK_PKGCONFIG()
|
|
||||||
- EXECUTE_PROCESS(
|
|
||||||
- COMMAND ${MY_PKG_CONFIG_EXECUTABLE} --modversion libfido2
|
|
||||||
- OUTPUT_VARIABLE MY_FIDO_MODVERSION
|
|
||||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
- RESULT_VARIABLE MY_MODVERSION_RESULT
|
|
||||||
- )
|
|
||||||
- IF(MY_MODVERSION_RESULT EQUAL 0)
|
|
||||||
- SET(FIDO_VERSION ${MY_FIDO_MODVERSION})
|
|
||||||
- ENDIF()
|
|
||||||
+ PKG_CHECK_MODULES(FIDO libfido2)
|
|
||||||
ENDIF()
|
|
||||||
MESSAGE(STATUS "FIDO_VERSION (${WITH_FIDO}) is ${FIDO_VERSION}")
|
|
||||||
ENDMACRO(FIND_FIDO_VERSION)
|
|
|
@ -625,8 +625,8 @@ with pkgs;
|
||||||
mysql-shell = callPackage ../development/tools/mysql-shell {
|
mysql-shell = callPackage ../development/tools/mysql-shell {
|
||||||
inherit (darwin) cctools developer_cmds DarwinTools;
|
inherit (darwin) cctools developer_cmds DarwinTools;
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||||
boost = boost173; # Configure checks for specific version.
|
boost = boost177; # Configure checks for specific version.
|
||||||
protobuf = protobuf3_11;
|
protobuf = protobuf3_19;
|
||||||
icu = icu67;
|
icu = icu67;
|
||||||
v8 = v8_8_x;
|
v8 = v8_8_x;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue