cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #109006 from totten/master-mysql-8022

Browse source 
mysql80: 8.0.17 -> 8.0.22
This commit is contained in:
Benjamin Hipple 2021-01-11 21:51:01 -05:00 committed by GitHub
commit 1e678a98d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/servers/sql/mysql/8.0.x.nix
View file

@ -1,27 +1,33 @@
{ lib, stdenv, fetchurl, bison, cmake, pkgconfig { lib, stdenv, fetchurl, bison, cmake, pkgconfig
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto
}: }:
let let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "mysql"; pname = "mysql";
version = "8.0.17"; version = "8.0.22";
src = fetchurl { src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a";
}; };
patches = [ patches = [
./abi-check.patch ./abi-check.patch
./libutils.patch
]; ];
nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ];
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
postPatch = ''
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
'';
buildInputs = [ buildInputs = [
boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
zstd
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
numactl libtirpc numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [

5
pkgs/servers/sql/mysql/libutils.patch
View file

@ -1,5 +0,0 @@
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
- COMMAND /usr/bin/libtool -static -o $<TARGET_FILE:${TARGET}>
+ COMMAND libtool -static -o $<TARGET_FILE:${TARGET}>

2
pkgs/top-level/all-packages.nix
View file

@ -17839,7 +17839,7 @@ in
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds; inherit (darwin) cctools developer_cmds;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost169; # Configure checks for specific version. boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_7; protobuf = protobuf3_7;
}; };