mysql-shell-innovation: 8.2.1 -> 8.3.0

This commit is contained in:
Aaron Jheng 2024-01-16 16:11:45 +08:00
parent 0a4f48c0cc
commit 67d15b0c09
No known key found for this signature in database
GPG key ID: F6A547A869D050A3
2 changed files with 5 additions and 8 deletions

View file

@ -16,7 +16,6 @@
, libssh , libssh
, zstd , zstd
, lz4 , lz4
, boost
, readline , readline
, libtirpc , libtirpc
, rpcsvc-proto , rpcsvc-proto
@ -35,8 +34,8 @@
let let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
mysqlShellVersion = "8.2.1"; mysqlShellVersion = "8.3.0";
mysqlServerVersion = "8.2.0"; mysqlServerVersion = "8.3.0";
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell-innovation"; pname = "mysql-shell-innovation";
@ -45,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
srcs = [ srcs = [
(fetchurl { (fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk="; hash = "sha256-HyFJWgt6grJKRT1S4hU6gUs8pwTsz5mXZtVFvOUvOG4=";
}) })
(fetchurl { (fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
hash = "sha256-m6WdFow28bxW52q+m8PniZCU/1Ej4secdPQi8GKlziE="; hash = "sha256-O0j/gvS9fR/xp9plytjj249H7LY/+eyst1IsFpy318U=";
}) })
]; ];
@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];
buildInputs = [ buildInputs = [
boost
curl curl
libedit libedit
libssh libssh
@ -98,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
# Build MySQL # Build MySQL
echo "Building mysqlclient mysqlxclient" echo "Building mysqlclient mysqlxclient"
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient

View file

@ -1121,7 +1121,6 @@ with pkgs;
inherit (darwin) cctools DarwinTools; inherit (darwin) cctools DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
boost = boost177; # Configure checks for specific version.
icu = icu69; icu = icu69;
protobuf = protobuf_21; protobuf = protobuf_21;
}; };