nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175213 from NixOS/backport-173501-to-release-22.05

Browse Source 
[Backport release-22.05] mysql: 8.0.28 -> 8.0.29
This commit is contained in:
Mario Rodas
2022-05-28 20:44:21 -05:00
committed by GitHub
parent 53d60246da 47e85c3a34
commit 1ae0feedfb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/sql/mysql/8.0.x.nix
View File

@@ -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 = [

6
pkgs/top-level/all-packages.nix
View File

@@ -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 { };