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

mariadb: 10.6.3 -> 10.6.5

Browse source 
https://mariadb.com/kb/en/mariadb-1064-release-notes/
https://mariadb.com/kb/en/mariadb-1065-release-notes/
This commit is contained in:
ajs124 2021-11-08 23:33:16 +01:00
parent 217ea11ebc
commit 09d3d7fe36
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/servers/sql/mariadb/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests { lib, stdenv, fetchzip, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests
, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
, libaio, libevent, jemalloc, cracklib, systemd, perl , libaio, libevent, jemalloc, cracklib, systemd, perl
, bzip2, lz4, lzo, snappy, xz, zlib, zstd , bzip2, lz4, lzo, snappy, xz, zlib, zstd
@ -22,15 +22,11 @@ mariadb = server // {
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
version = "10.6.3"; version = "10.6.5";
src = fetchurl { src = fetchzip {
urls = [ url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz";
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" sha256 = "0rvcllbplgn92kr5n3qxfasnsqc8cn9ijm01fb7i7j2p9zxnfhig";
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav";
name = "mariadb-${version}.tar.gz";
}; };
nativeBuildInputs = [ cmake pkg-config ] nativeBuildInputs = [ cmake pkg-config ]
@ -95,7 +91,6 @@ common = rec { # attributes common to both builds
rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config} rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config}
rm -r $out/include rm -r $out/include
rm -r $out/lib/pkgconfig rm -r $out/lib/pkgconfig
rm -rf "$out"/share/aclocal
''; '';
passthru.mysqlVersion = "5.7"; passthru.mysqlVersion = "5.7";
@ -135,8 +130,7 @@ client = stdenv.mkDerivation (common // {
]; ];
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
rm -rf "$out"/share/doc rm "$out"/bin/{mariadb-test,mysqltest}
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}
@ -199,6 +193,7 @@ server = stdenv.mkDerivation (common // {
''; '';
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
rm -rf "$out"/share/aclocal
chmod +x "$out"/bin/wsrep_sst_common chmod +x "$out"/bin/wsrep_sst_common
rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
'' + optionalString withStorageMroonga '' '' + optionalString withStorageMroonga ''