From 919951b1e53db2fbe8611e106d6d78c254d16bde Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 30 Oct 2023 10:23:46 +0800 Subject: [PATCH] mysql-shell-innovation: 8.1.1 -> 8.2.0 --- pkgs/development/tools/mysql-shell/innovation.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index dda169be32da..e7a12deb3ee4 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -5,7 +5,6 @@ , fetchurl , git , cctools -, developer_cmds , DarwinTools , makeWrapper , CoreServices @@ -36,8 +35,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "8.1.1"; - mysqlServerVersion = "8.1.0"; + mysqlShellVersion = "8.2.0"; + mysqlServerVersion = "8.2.0"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -46,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-PdAXqUBzSqkHlqTGXhJeZxL2S7u+M4jTZGneqoe1mes="; + hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk="; }) (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-X7A2h9PWgQgNg7h64oD+Th/KsqP3UGpJ2etaP2B0VuY="; + hash = "sha256-kuRo+3vcDtc9aOgAuxJTy0e6E85iOFfCx/ZHtrNg08k="; }) ]; @@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; + ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; buildInputs = [ boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0150c6bca6d..4991d07e6927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1093,7 +1093,7 @@ with pkgs; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; boost = boost177; # Configure checks for specific version.