From f0513967563d72eaead12999cd70634ef5d66e4d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 9 Jul 2026 13:50:38 +0800 Subject: [PATCH 1/3] mysql-shell_8: 8.4.9 -> 8.4.10 --- pkgs/development/tools/mysql-shell/8.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 196d6c009d50..238742bd3ebf 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "8.4.9"; - mysqlServerVersion = "8.4.9"; + mysqlShellVersion = "8.4.10"; + mysqlServerVersion = "8.4.10"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -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-5KqLOeQtH+B48zu9c2lfrCtU28e7E38L2+Y/e+GgLWs="; + hash = "sha256-1XpnMLrvFK4Rj39KbgKEW1tQkzdY32H7BuEE8nzMj5Y="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-btYUh/akFRCSOXDL1C5xuXLysHS1lm4H74kqY+4zyiQ="; + hash = "sha256-2pOMjkr8y1lCuh5EC34kI9V8vcQpAotJPHWHkMbgET4="; }) ]; From 194e2e5e46652c2f0b553244243298b22c412a07 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 9 Jul 2026 13:50:43 +0800 Subject: [PATCH 2/3] mysql-shell_9: 9.7.0 -> 9.7.1 --- pkgs/development/tools/mysql-shell/9.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/9.nix b/pkgs/development/tools/mysql-shell/9.nix index 54ec76ca3c3b..14843a23f189 100644 --- a/pkgs/development/tools/mysql-shell/9.nix +++ b/pkgs/development/tools/mysql-shell/9.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "9.7.0"; - mysqlServerVersion = "9.7.0"; + mysqlShellVersion = "9.7.1"; + mysqlServerVersion = "9.7.1"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -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-dLV0urxWsOy2MqvTWdITxnlOz0Qq5Ekov8WB+z1iMG0="; + hash = "sha256-2r/yYwIr5qCRUcIYEjIoc0N+DXeuyMTMc4GILD6hrq4="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-s/omxSFTC/n3B8OtYddDqXzCd4GE4b5O8NUKbLdvwRI="; + hash = "sha256-7bRgb3CBu3oQiZm5xe6U6DvX5xd9iWqqeNPDwI+BYRQ="; }) ]; From 8c948a0d0769d97f9c361b0e22d3167e81b3be37 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 9 Jul 2026 13:50:48 +0800 Subject: [PATCH 3/3] mysql-shell-innovation: alias to mysql-shell_9 Remove the separate innovation.nix derivation and point mysql-shell-innovation to mysql-shell_9 instead. --- .../tools/mysql-shell/innovation.nix | 157 ------------------ pkgs/top-level/all-packages.nix | 8 +- 2 files changed, 1 insertion(+), 164 deletions(-) delete mode 100644 pkgs/development/tools/mysql-shell/innovation.nix diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix deleted file mode 100644 index 0417d36a1527..000000000000 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - lib, - stdenv, - pkg-config, - cmake, - fetchurl, - git, - cctools, - darwin, - makeWrapper, - bison, - openssl, - protobuf, - curl, - zlib, - libssh, - zstd, - lz4, - readline, - libtirpc, - rpcsvc-proto, - libedit, - libevent, - icu, - re2, - ncurses, - libfido2, - python3, - cyrus_sasl, - openldap, - antlr, -}: - -let - pythonDeps = with python3.pkgs; [ - certifi - paramiko - pyyaml - ]; - - mysqlShellVersion = "9.7.0"; - mysqlServerVersion = "9.7.0"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "mysql-shell-innovation"; - version = mysqlShellVersion; - - srcs = [ - (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-dLV0urxWsOy2MqvTWdITxnlOz0Qq5Ekov8WB+z1iMG0="; - }) - (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-s/omxSFTC/n3B8OtYddDqXzCd4GE4b5O8NUKbLdvwRI="; - }) - ]; - - sourceRoot = "mysql-shell-${finalAttrs.version}-src"; - - postUnpack = '' - mv mysql-${mysqlServerVersion} mysql - ''; - - patches = [ - # No openssl bundling on macOS. It's not working. - # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 - ./no-openssl-bundling.patch - ]; - - postPatch = '' - substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool - substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool - - substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool - - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - patch -d .. -p1 < ${./mysql-server-libcxx-21.patch} - ''} - ''; - - nativeBuildInputs = [ - pkg-config - cmake - git - bison - makeWrapper - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - darwin.DarwinTools - ]; - - buildInputs = [ - curl - libedit - libssh - lz4 - openssl - protobuf - readline - zlib - zstd - libevent - icu - re2 - ncurses - libfido2 - cyrus_sasl - openldap - python3 - antlr.runtime.cpp - ] - ++ pythonDeps - ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; - - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=array-bounds"; - }; - - preConfigure = '' - # Build MySQL - echo "Building mysqlclient mysqlxclient" - - 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 mysqlbinlog mysql_binlog_event_standalone mysqlrouter_all - - cmakeFlagsArray+=( - "-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql" - "-DMYSQL_BUILD_DIR=''${NIX_BUILD_TOP}/mysql/build" - "-DMYSQL_CONFIG_EXECUTABLE=''${NIX_BUILD_TOP}/mysql/build/scripts/mysql_config" - "-DWITH_ZSTD=system" - "-DWITH_LZ4=system" - "-DWITH_ZLIB=system" - "-DWITH_PROTOBUF=system" - "-DHAVE_PYTHON=1" - ) - ''; - - postFixup = '' - wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" - ''; - - meta = { - homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/"; - description = "New command line scriptable shell for MySQL"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ aaronjheng ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "mysqlsh"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07a3a5087eec..361a4481591f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -505,13 +505,7 @@ with pkgs; mysql-shell_9 ; - mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - antlr = antlr4_10; - icu = icu77; - protobuf = protobuf_25.override { - abseil-cpp = abseil-cpp_202407; - }; - }; + mysql-shell-innovation = mysql-shell_9; # this is used by most `fetch*` functions repoRevToNameMaybe = lib.repoRevToName config.fetchedSourceNameDefault;