Merge pull request #281482 from aaronjheng/mysql-shell

mysql-shell: 8.0.35 -> 8.0.36
This commit is contained in:
Mario Rodas 2024-01-23 22:11:58 -05:00 committed by GitHub
commit a7fd93a95f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -37,16 +37,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell";
version = "8.0.35";
version = "8.0.36";
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI=";
hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0=";
})
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
hash = "sha256-2Dn/RR5BWHMsD/QzKYPo8tqyAQGmHCGwVl2+bzNfy5I=";
hash = "sha256-s0+7dbcLcgS8u/6p7vpVAV9sR2gf2j9VDnSCJvw77fQ=";
})
];
@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
# Build MySQL
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_BOOST=system -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

View File

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