pyrox.dev
Merge pull request #122132 from helsinki-systems/upd/mariadb
mariadb: 10.5.8 -> 10.5.10
+2
-2
pkgs/servers/sql/mariadb/default.nix
+2
-2
pkgs/servers/sql/mariadb/default.nix
···
22
22
};
23
23
24
24
common = rec { # attributes common to both builds
25
-
version = "10.5.8";
25
+
version = "10.5.10";
26
26
27
27
src = fetchurl {
28
28
urls = [
29
29
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
30
30
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
31
31
];
32
-
sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b";
32
+
sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5";
33
33
name = "mariadb-${version}.tar.gz";
34
34
};
35
35
+11
-28
pkgs/servers/sql/mariadb/galera/default.nix
+11
-28
pkgs/servers/sql/mariadb/galera/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, buildEnv
2
-
, asio, boost, check, openssl, scons
2
+
, asio, boost, check, openssl, cmake
3
3
}:
4
4
5
5
let
···
10
10
11
11
in stdenv.mkDerivation rec {
12
12
pname = "mariadb-galera";
13
-
version = "26.4.7";
13
+
version = "26.4.8";
14
14
15
15
src = fetchFromGitHub {
16
16
owner = "codership";
17
17
repo = "galera";
18
18
rev = "release_${version}";
19
-
sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil";
19
+
sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369";
20
20
fetchSubmodules = true;
21
21
};
22
22
23
-
buildInputs = [ asio boost check openssl scons ];
24
-
25
-
postPatch = ''
26
-
substituteInPlace SConstruct \
27
-
--replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
28
-
'';
23
+
buildInputs = [ asio boost check openssl cmake ];
29
24
30
25
preConfigure = ''
31
-
export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
32
-
export LIBPATH="${galeraLibs}/lib"
26
+
# make sure bundled asio cannot be used, but leave behind license, because it gets installed
27
+
rm -r asio/{asio,asio.hpp}
33
28
'';
34
29
35
-
sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
36
-
37
-
enableParallelBuilding = true;
38
-
39
-
installPhase = ''
40
-
# copied with modifications from scripts/packages/freebsd.sh
41
-
GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
42
-
install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
43
-
install -m 555 "garb/garbd" "$out/bin/garbd"
44
-
install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
45
-
install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
46
-
install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
47
-
install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
48
-
install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
49
-
install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
30
+
postInstall = ''
31
+
# for backwards compatibility
32
+
ln -s . $out/lib/galera
50
33
'';
51
34
52
35
meta = with lib; {
53
36
description = "Galera 3 wsrep provider library";
54
37
homepage = "https://galeracluster.com/";
55
-
license = licenses.lgpl2;
56
-
maintainers = with maintainers; [ izorkin ];
38
+
license = licenses.lgpl2Only;
39
+
maintainers = with maintainers; [ ajs124 izorkin ];
57
40
platforms = platforms.all;
58
41
};
59
42
}