diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-05-28 20:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 20:44:21 -0500 |
| commit | 1ae0feedfb4805a1fabbe0950030d73fa5924e28 (patch) | |
| tree | dd7fa5cb2ca884bc86937a7908d94fa4ae20d136 | |
| parent | Merge pull request #175115 from NixOS/backport-172849-to-release-22.05 (diff) | |
| parent | mysql: 8.0.28 -> 8.0.29 (diff) | |
| download | nixpkgs-1ae0feedfb4805a1fabbe0950030d73fa5924e28.tar.gz | |
Merge pull request #175213 from NixOS/backport-173501-to-release-22.05
[Backport release-22.05] mysql: 8.0.28 -> 8.0.29
| -rw-r--r-- | pkgs/servers/sql/mysql/8.0.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index f897e018d693..f7611d253e5b 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.28"; + version = "8.0.29"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI="; + sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY="; }; nativeBuildInputs = [ bison cmake pkg-config ] @@ -20,8 +20,6 @@ self = stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/fido2.cmake \ - --replace ''$\{MY_PKG_CONFIG_EXECUTABLE\} "${pkg-config}/bin/pkg-config" ''; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db76ad4c493..35d4419217db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22233,9 +22233,9 @@ with pkgs; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost173; # Configure checks for specific version. - protobuf = protobuf3_11; - icu = icu67; + boost = boost177; # Configure checks for specific version. + protobuf = protobuf3_19; + icu = icu69; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; |