diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 73abf6c555f9..9b94ae7048cb 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -57,7 +57,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera"; wsrep_node_address = "192.168.1.1"; @@ -104,7 +104,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera"; wsrep_node_address = "192.168.1.2"; @@ -151,7 +151,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera"; wsrep_node_address = "192.168.1.3"; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index cacae4569b57..a35a67e31d77 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -53,7 +53,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera-rsync"; wsrep_node_address = "192.168.2.1"; @@ -99,7 +99,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera-rsync"; wsrep_node_address = "192.168.2.2"; @@ -145,7 +145,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; 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_name = "galera-rsync"; wsrep_node_address = "192.168.2.3"; diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e398b..000000000000 --- a/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index a6ce8f4b0471..6c3a1af907dd 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons -, version, sha256, ... }: let - pname = "mariadb-galera"; galeraLibs = buildEnv { name = "galera-lib-inputs-united"; paths = [ openssl.out boost check ]; }; -in stdenv.mkDerivation { - inherit pname; - inherit version; +in stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "26.4.3"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - inherit sha256; + sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; fetchSubmodules = true; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # 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 -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd647e6295d..12b47de766b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15865,8 +15865,7 @@ in mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { + mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; };