mysql-shell-innovation: 9.6.0 -> 9.7.0
This commit is contained in:
@@ -38,8 +38,8 @@ let
|
||||
pyyaml
|
||||
];
|
||||
|
||||
mysqlShellVersion = "9.6.0";
|
||||
mysqlServerVersion = "9.6.0";
|
||||
mysqlShellVersion = "9.7.0";
|
||||
mysqlServerVersion = "9.7.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-JABh2GnVrhiMmjM4RZKImenZY8y9Z4Zaii5Lb8tnF4w=";
|
||||
hash = "sha256-dLV0urxWsOy2MqvTWdITxnlOz0Qq5Ekov8WB+z1iMG0=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-WnCr/poMsxtaS9k7/6QZDkFPOZlf7WAELsqFGpnUwf4=";
|
||||
hash = "sha256-s/omxSFTC/n3B8OtYddDqXzCd4GE4b5O8NUKbLdvwRI=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -570,13 +570,7 @@ with pkgs;
|
||||
protobuf = protobuf_25.override {
|
||||
abseil-cpp = abseil-cpp_202407;
|
||||
};
|
||||
stdenv =
|
||||
if stdenv.cc.isClang then
|
||||
llvmPackages_19.stdenv
|
||||
else if stdenv.cc.isGNU then
|
||||
gcc14Stdenv
|
||||
else
|
||||
stdenv;
|
||||
stdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv;
|
||||
};
|
||||
|
||||
# this is used by most `fetch*` functions
|
||||
|
||||
Reference in New Issue
Block a user