Merge pull request #281321 from aaronjheng/mysql-shell-innovation

mysql-shell-innovation: 8.2.1 -> 8.3.0

Changed files
+5 -8
pkgs
development
tools
mysql-shell
top-level
+5 -7
pkgs/development/tools/mysql-shell/innovation.nix
···
, libssh
, zstd
, lz4
-
, boost
, readline
, libtirpc
, rpcsvc-proto
···
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
-
mysqlShellVersion = "8.2.1";
-
mysqlServerVersion = "8.2.0";
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell-innovation";
···
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-
hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk=";
})
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-
hash = "sha256-m6WdFow28bxW52q+m8PniZCU/1Ej4secdPQi8GKlziE=";
})
];
···
++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];
buildInputs = [
-
boost
curl
libedit
libssh
···
# Build MySQL
echo "Building mysqlclient mysqlxclient"
-
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -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
···
, libssh
, zstd
, lz4
, readline
, libtirpc
, rpcsvc-proto
···
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
+
mysqlShellVersion = "8.3.0";
+
mysqlServerVersion = "8.3.0";
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell-innovation";
···
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
+
hash = "sha256-HyFJWgt6grJKRT1S4hU6gUs8pwTsz5mXZtVFvOUvOG4=";
})
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
+
hash = "sha256-O0j/gvS9fR/xp9plytjj249H7LY/+eyst1IsFpy318U=";
})
];
···
++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];
buildInputs = [
curl
libedit
libssh
···
# Build MySQL
echo "Building mysqlclient mysqlxclient"
+
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -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
-1
pkgs/top-level/all-packages.nix
···
inherit (darwin) cctools DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10;
-
boost = boost177; # Configure checks for specific version.
icu = icu69;
protobuf = protobuf_21;
};
···
inherit (darwin) cctools DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10;
icu = icu69;
protobuf = protobuf_21;
};