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

mariadb-galera: 25.3.27 -> 26.4.3

This commit is contained in:
Izorkin 2020-05-05 09:30:54 +03:00
parent 7ef8639163
commit a40a811b17
5 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/mysql/mariadb-galera-mariabackup.nix
View File

@ -57,7 +57,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://"; wsrep_cluster_address = "gcomm://";
wsrep_cluster_name = "galera"; wsrep_cluster_name = "galera";
wsrep_node_address = "192.168.1.1"; wsrep_node_address = "192.168.1.1";
@ -104,7 +104,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03";
wsrep_cluster_name = "galera"; wsrep_cluster_name = "galera";
wsrep_node_address = "192.168.1.2"; wsrep_node_address = "192.168.1.2";
@ -151,7 +151,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03";
wsrep_cluster_name = "galera"; wsrep_cluster_name = "galera";
wsrep_node_address = "192.168.1.3"; wsrep_node_address = "192.168.1.3";

6
nixos/tests/mysql/mariadb-galera-rsync.nix
View File

@ -53,7 +53,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://"; wsrep_cluster_address = "gcomm://";
wsrep_cluster_name = "galera-rsync"; wsrep_cluster_name = "galera-rsync";
wsrep_node_address = "192.168.2.1"; wsrep_node_address = "192.168.2.1";
@ -99,7 +99,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06";
wsrep_cluster_name = "galera-rsync"; wsrep_cluster_name = "galera-rsync";
wsrep_node_address = "192.168.2.2"; wsrep_node_address = "192.168.2.2";
@ -145,7 +145,7 @@ in {
wsrep_on = "ON"; wsrep_on = "ON";
wsrep_debug = "OFF"; wsrep_debug = "OFF";
wsrep_retry_autocommit = "3"; wsrep_retry_autocommit = "3";
wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so";
wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06";
wsrep_cluster_name = "galera-rsync"; wsrep_cluster_name = "galera-rsync";
wsrep_node_address = "192.168.2.3"; wsrep_node_address = "192.168.2.3";

6
pkgs/servers/sql/mariadb/galera/25.nix
View File

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "25.3.27";
sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
})

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

@ -1,24 +1,22 @@
{ stdenv, fetchFromGitHub, buildEnv { stdenv, fetchFromGitHub, buildEnv
, asio, boost, check, openssl, scons , asio, boost, check, openssl, scons
, version, sha256, ...
}: }:
let let
pname = "mariadb-galera";
galeraLibs = buildEnv { galeraLibs = buildEnv {
name = "galera-lib-inputs-united"; name = "galera-lib-inputs-united";
paths = [ openssl.out boost check ]; paths = [ openssl.out boost check ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
inherit pname; pname = "mariadb-galera";
inherit version; version = "26.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codership"; owner = "codership";
repo = "galera"; repo = "galera";
rev = "release_${version}"; rev = "release_${version}";
inherit sha256; sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -40,7 +38,7 @@ in stdenv.mkDerivation {
installPhase = '' installPhase = ''
# copied with modifications from scripts/packages/freebsd.sh # copied with modifications from scripts/packages/freebsd.sh
GALERA_LICENSE_DIR="$share/licenses/${pname}" GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
install -m 555 "garb/garbd" "$out/bin/garbd" install -m 555 "garb/garbd" "$out/bin/garbd"
install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"

3
pkgs/top-level/all-packages.nix
View File

@ -15865,8 +15865,7 @@ in
mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c = mariadb-connector-c_3_1;
mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
mariadb-galera = mariadb-galera_25; mariadb-galera = callPackage ../servers/sql/mariadb/galera {
mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
asio = asio_1_10; asio = asio_1_10;
}; };