Skip to content

Commit 7ba807e

Browse files
authored
mysql-shell-innovation: 9.1.0 -> 9.2.0 (#378249)
1 parent 2592a2f commit 7ba807e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pkgs/development/tools/mysql-shell/innovation.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ let
3838
pyyaml
3939
];
4040

41-
mysqlShellVersion = "9.1.0";
42-
mysqlServerVersion = "9.1.0";
41+
mysqlShellVersion = "9.2.0";
42+
mysqlServerVersion = "9.2.0";
4343
in
4444
stdenv.mkDerivation (finalAttrs: {
4545
pname = "mysql-shell-innovation";
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
4848
srcs = [
4949
(fetchurl {
5050
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
51-
hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw=";
51+
hash = "sha256-o50R/fbPjRsDtwjVN6kTLeS5mp601hApOTfwaHzTehI=";
5252
})
5353
(fetchurl {
5454
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
55-
hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s=";
55+
hash = "sha256-xuKXV8YllhDo7+6i5UYHAH7m7Jn5E/k0YdeN5MZSzl8=";
5656
})
5757
];
5858

@@ -118,10 +118,11 @@ stdenv.mkDerivation (finalAttrs: {
118118
# Build MySQL
119119
echo "Building mysqlclient mysqlxclient"
120120
121-
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
121+
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=ON -DWITH_UNIT_TESTS=OFF \
122122
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
123123
124-
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
124+
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} \
125+
--target mysqlclient mysqlxclient mysqlbinlog mysql_binlog_event_standalone mysqlrouter_all
125126
126127
cmakeFlagsArray+=(
127128
"-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql"

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ with pkgs;
514514
antlr = antlr4_10;
515515
icu = icu73;
516516
protobuf = protobuf_24;
517+
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
517518
};
518519

519520
fetchpatch = callPackage ../build-support/fetchpatch {

0 commit comments

Comments
 (0)