public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mariadb: 10.4.13 -> 10.4.14

Browse Source
This commit is contained in:
Izorkin 2020-08-11 12:47:07 +03:00
parent d4e530412d
commit 8e4ecf17db
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
View File

@ -1,12 +0,0 @@
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index f7790748..995621e0 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -121,7 +121,6 @@ ENDIF()
IF(UNIX)
SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
- SET(PLUGIN_AUTH_PAM YES)
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
IF(NOT IGNORE_AIO_CHECK)

13
pkgs/servers/sql/mariadb/default.nix
View File

@ -23,14 +23,14 @@ mariadb = server // {
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
version = "10.4.13"; version = "10.4.14";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
]; ];
sha256 = "1pwibmm52sc04qxp832pc3ylxw9wq90fjc7nxpcyp3yys49bpfs5"; sha256 = "1z469j39chq7d3dp39cljjbzcz0wl1g7rii85x46290jw1cwsbzr";
name = "mariadb-${version}.tar.gz"; name = "mariadb-${version}.tar.gz";
}; };
@ -128,10 +128,10 @@ client = stdenv.mkDerivation (common // {
patches = common.patches ++ [ patches = common.patches ++ [
./cmake-plugin-includedir.patch ./cmake-plugin-includedir.patch
./cmake-without-plugin-auth-pam.patch
]; ];
cmakeFlags = common.cmakeFlags ++ [ cmakeFlags = common.cmakeFlags ++ [
"-DPLUGIN_AUTH_PAM=OFF"
"-DWITHOUT_SERVER=ON" "-DWITHOUT_SERVER=ON"
"-DWITH_WSREP=OFF" "-DWITH_WSREP=OFF"
"-DINSTALL_MYSQLSHAREDIR=share/mysql-client" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client"
@ -139,7 +139,7 @@ client = stdenv.mkDerivation (common // {
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
rm -r "$out"/share/doc rm -r "$out"/share/doc
rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} rm "$out"/bin/{mysqltest,mytop}
libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
@ -162,9 +162,7 @@ server = stdenv.mkDerivation (common // {
++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional stdenv.hostPlatform.isLinux linux-pam
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ patches = common.patches;
./cmake-without-plugin-auth-pam.patch
];
cmakeFlags = common.cmakeFlags ++ [ cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_DATADIR=/var/lib/mysql"
@ -190,6 +188,7 @@ server = stdenv.mkDerivation (common // {
] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [
"-DWITH_JEMALLOC=static" "-DWITH_JEMALLOC=static"
] ++ optional stdenv.hostPlatform.isDarwin [ ] ++ optional stdenv.hostPlatform.isDarwin [
"-DPLUGIN_AUTH_PAM=OFF"
"-DWITHOUT_OQGRAPH=1" "-DWITHOUT_OQGRAPH=1"
]; ];