From a8e00acda7141de362ea84f12e2ddf1dd43ef733 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 28 Nov 2025 17:29:28 +0800 Subject: [PATCH 1/2] mysql-shell: 8.4.6 -> 8.4.8 --- pkgs/development/tools/mysql-shell/8.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 00065a42ac5f..2e909658bbde 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.6"; - mysqlServerVersion = "8.4.6"; + mysqlShellVersion = "8.4.8"; + mysqlServerVersion = "8.4.8"; 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-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c="; + hash = "sha256-vp2Wzfh/J2lSos3ZYPEGuWCohg5GwRXtOcG18uA4eiA="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-IUmWUW5rZcRvmolE+LjMaGPFa5abv1osIhTzm9BKt/w="; + hash = "sha256-0mNO/uJVvVHRSDalOIuvQOOsDR6OukfJuov8Uasr0tE="; }) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34237ab10c93..2e04c62f4c3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -503,7 +503,13 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; + stdenv = + if stdenv.cc.isClang then + llvmPackages_19.stdenv + else if stdenv.cc.isGNU then + gcc14Stdenv + else + stdenv; }; }) mysql-shell_8 From bdd88971af8a47f696b9f1319cc8636c59f5cc96 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 28 Nov 2025 17:41:57 +0800 Subject: [PATCH 2/2] mysql-shell-innovation: 9.4.0 -> 9.6.0 --- pkgs/development/tools/mysql-shell/innovation.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 9dd624e54263..8834c6d69ebd 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "9.4.0"; - mysqlServerVersion = "9.4.0"; + mysqlShellVersion = "9.6.0"; + mysqlServerVersion = "9.6.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-a7UJxU5YtUq776SeKW5yIPXnz+RGkUujYV9ZSWfPqSE="; + hash = "sha256-JABh2GnVrhiMmjM4RZKImenZY8y9Z4Zaii5Lb8tnF4w="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-BpiDGA3Lxf/MrKqtPSA+apFNZx9N805PYYVa+2vQxPE="; + hash = "sha256-WnCr/poMsxtaS9k7/6QZDkFPOZlf7WAELsqFGpnUwf4="; }) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e04c62f4c3c..ee14bb0331a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -521,7 +521,13 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; + stdenv = + if stdenv.cc.isClang then + llvmPackages_19.stdenv + else if stdenv.cc.isGNU then + gcc14Stdenv + else + stdenv; }; # this is used by most `fetch*` functions