diff options
| author | Izorkin <izorkin@elven.pw> | 2020-08-11 12:47:07 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2020-08-15 10:42:13 +0300 |
| commit | 8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3 (patch) | |
| tree | 654a8e962cbc568877c2ea384fe3e3f1abf2a803 /pkgs/servers | |
| parent | d4e530412d0d23e3e453051a58ce74e312b3e398 (diff) | |
| download | nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar.gz nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar.bz2 nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar.lz nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar.xz nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.tar.zst nixpkgs-8e4ecf17db15461a89f8fc1a97e46ce03fe5dca3.zip | |
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" ]; |