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

Merge pull request #122132 from helsinki-systems/upd/mariadb

Browse Source 
mariadb: 10.5.8 -> 10.5.10
This commit is contained in:
ajs124 2021-05-09 14:38:38 +02:00 committed by GitHub
commit e33448aec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,14 +22,14 @@ mariadb = server // {
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
version = "10.5.8"; version = "10.5.10";
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 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5";
name = "mariadb-${version}.tar.gz"; name = "mariadb-${version}.tar.gz";
}; };

39
pkgs/servers/sql/mariadb/galera/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, buildEnv { lib, stdenv, fetchFromGitHub, buildEnv
, asio, boost, check, openssl, scons , asio, boost, check, openssl, cmake
}: }:
let let
@ -10,50 +10,33 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "mariadb-galera"; pname = "mariadb-galera";
version = "26.4.7"; version = "26.4.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codership"; owner = "codership";
repo = "galera"; repo = "galera";
rev = "release_${version}"; rev = "release_${version}";
sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil"; sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ asio boost check openssl scons ]; buildInputs = [ asio boost check openssl cmake ];
postPatch = ''
substituteInPlace SConstruct \
--replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
'';
preConfigure = '' preConfigure = ''
export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" # make sure bundled asio cannot be used, but leave behind license, because it gets installed
export LIBPATH="${galeraLibs}/lib" rm -r asio/{asio,asio.hpp}
''; '';
sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; postInstall = ''
# for backwards compatibility
enableParallelBuilding = true; ln -s . $out/lib/galera
installPhase = ''
# copied with modifications from scripts/packages/freebsd.sh
GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
install -m 555 "garb/garbd" "$out/bin/garbd"
install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
''; '';
meta = with lib; { meta = with lib; {
description = "Galera 3 wsrep provider library"; description = "Galera 3 wsrep provider library";
homepage = "https://galeracluster.com/"; homepage = "https://galeracluster.com/";
license = licenses.lgpl2; license = licenses.lgpl2Only;
maintainers = with maintainers; [ izorkin ]; maintainers = with maintainers; [ ajs124 izorkin ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }