mysql-shell-innovation: 9.1.0 -> 9.2.0 (#378249)
This commit is contained in:
@@ -38,8 +38,8 @@ let
|
||||
pyyaml
|
||||
];
|
||||
|
||||
mysqlShellVersion = "9.1.0";
|
||||
mysqlServerVersion = "9.1.0";
|
||||
mysqlShellVersion = "9.2.0";
|
||||
mysqlServerVersion = "9.2.0";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mysql-shell-innovation";
|
||||
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
|
||||
hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw=";
|
||||
hash = "sha256-o50R/fbPjRsDtwjVN6kTLeS5mp601hApOTfwaHzTehI=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s=";
|
||||
hash = "sha256-xuKXV8YllhDo7+6i5UYHAH7m7Jn5E/k0YdeN5MZSzl8=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -118,10 +118,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Build MySQL
|
||||
echo "Building mysqlclient mysqlxclient"
|
||||
|
||||
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
|
||||
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=ON -DWITH_UNIT_TESTS=OFF \
|
||||
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
|
||||
|
||||
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
|
||||
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} \
|
||||
--target mysqlclient mysqlxclient mysqlbinlog mysql_binlog_event_standalone mysqlrouter_all
|
||||
|
||||
cmakeFlagsArray+=(
|
||||
"-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql"
|
||||
|
||||
@@ -514,6 +514,7 @@ with pkgs;
|
||||
antlr = antlr4_10;
|
||||
icu = icu73;
|
||||
protobuf = protobuf_24;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
|
||||
};
|
||||
|
||||
fetchpatch = callPackage ../build-support/fetchpatch {
|
||||
|
||||
Reference in New Issue
Block a user