Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a3bf0c2e4005
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dae42566dbee
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Aug 13, 2019

  1. mysql80: init at 8.0.17 (#65221) 

    MySQL 8.0 is a significant iteration after MySQL 5.7.  This patch adds it as
a parallel build alongside mysql57 (similar to mysql56 and mysql55 before).
    @totten @orivej-nixos
    totten authored and orivej-nixos committed Aug 13, 2019
    Copy the full SHA
    dae4256 View commit details
Showing with 102 additions and 0 deletions.
  1. +73 −0 pkgs/servers/sql/mysql/8.0.x.nix
  2. +18 −0 pkgs/servers/sql/mysql/abi-check.patch
  3. +5 −0 pkgs/servers/sql/mysql/libutils.patch
  4. +6 −0 pkgs/top-level/all-packages.nix
73 changes: 73 additions & 0 deletions pkgs/servers/sql/mysql/8.0.x.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{ lib, stdenv, fetchurl, bison, cmake, pkgconfig
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib
, numactl, perl, cctools, CoreServices, developer_cmds
}:

let
self = stdenv.mkDerivation rec {
name = "mysql-8.0.17";

src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz";
sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6";
};

patches = [
./abi-check.patch
./libutils.patch
];

nativeBuildInputs = [ bison cmake pkgconfig ];

buildInputs = [
boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
] ++ lib.optionals stdenv.isLinux [
numactl
] ++ lib.optionals stdenv.isDarwin [
cctools CoreServices developer_cmds
];

outputs = [ "out" "static" ];

cmakeFlags = [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" # For std::shared_timed_mutex.
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
"-DWITH_ROUTER=OFF" # It may be packaged separately.
"-DWITH_SYSTEM_LIBS=ON"
"-DWITH_UNIT_TESTS=OFF"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DINSTALL_INFODIR=share/mysql/docs"
"-DINSTALL_MANDIR=share/man"
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
"-DINSTALL_INCLUDEDIR=include/mysql"
"-DINSTALL_DOCREADMEDIR=share/mysql"
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
"-DINSTALL_MYSQLTESTDIR="
"-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share/mysql"
];

postInstall = ''
moveToOutput "lib/*.a" $static
so=${stdenv.hostPlatform.extensions.sharedLibrary}
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
'';

passthru = {
client = self;
connector-c = self;
server = self;
mysqlVersion = "8.0";
};

meta = with lib; {
homepage = "https://www.mysql.com/";
description = "The world's most popular open source database";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
};
}; in self
18 changes: 18 additions & 0 deletions pkgs/servers/sql/mysql/abi-check.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
MySQL ABI check assumes that with -nostdinc any standard #include terminates
preprocessing, but we do not provide that:
https://github.com/NixOS/nixpkgs/issues/44530

"#error" does not terminate preprocessing, so we #include a non-existent file instead.

--- a/cmake/do_abi_check.cmake
+++ b/cmake/do_abi_check.cmake
@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS})
- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
+ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include
@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS})
- COMMAND sed -e "/^# /d"
+ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d"
--- /dev/null
+++ b/include/nostdinc/stdint.h
@@ -0,0 +1,1 @@
+#include <-nostdinc>
5 changes: 5 additions & 0 deletions pkgs/servers/sql/mysql/libutils.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--- 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}>
6 changes: 6 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14790,6 +14790,12 @@ in
boost = boost159;
};

mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost169; # Configure checks for specific version.
};

mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };

mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };