diff options
author | Florian Klink <flokli@flokli.de> | 2020-08-16 20:32:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-16 20:32:57 +0200 |
commit | 431b08cafddd022f5e49ef3f46cf83d863a038ae (patch) | |
tree | 3d84cdba918afcecbc5181fb016c87a5c31d93f6 /pkgs/servers | |
parent | 36e0fa93854df5919112ab607beb702c0ca23fdf (diff) | |
parent | d35d990025534eca140f30323b3312e99728c8e3 (diff) | |
download | nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar.gz nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar.bz2 nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar.lz nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar.xz nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.tar.zst nixpkgs-431b08cafddd022f5e49ef3f46cf83d863a038ae.zip |
Merge pull request #95158 from Izorkin/mariadb
mariadb: 10.4.13 -> 10.4.14
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch | 12 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch deleted file mode 100644 index 173fa1e0c63..00000000000 --- a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch +++ /dev/null @@ -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) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d6e52134301..3ba4e367312 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.13"; + version = "10.4.14"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/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"; }; @@ -128,10 +128,10 @@ client = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-plugin-includedir.patch - ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" @@ -139,7 +139,7 @@ client = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' 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}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${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.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ - ./cmake-without-plugin-auth-pam.patch - ]; + patches = common.patches; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -190,6 +188,7 @@ server = stdenv.mkDerivation (common // { ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ "-DWITH_JEMALLOC=static" ] ++ optional stdenv.hostPlatform.isDarwin [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" ]; |