Skip to content

Commit 67d0a62

Browse files
authored
Merge pull request #332445 from helsinki-systems/upd/galera
mariadb-galera: 26.4.19 -> 26.4.20
2 parents 53e62be + 564236b commit 67d0a62

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

pkgs/servers/sql/mariadb/galera/default.nix renamed to pkgs/by-name/ma/mariadb-galera/package.nix

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
1-
{ lib, stdenv, fetchFromGitHub, buildEnv
2-
, asio, boost, check, openssl, cmake
3-
, nixosTests
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
asio,
6+
boost,
7+
check,
8+
openssl,
9+
cmake,
10+
nixosTests,
411
}:
512

613
stdenv.mkDerivation rec {
714
pname = "mariadb-galera";
8-
version = "26.4.19";
15+
version = "26.4.20";
916

1017
src = fetchFromGitHub {
1118
owner = "codership";
1219
repo = "galera";
1320
rev = "release_${version}";
14-
hash = "sha256-DSYwOMBs7kxskTjEIO1AqXw+oAUeDXzX+qLNBuob0Jg=";
21+
hash = "sha256-R2YQtAuqPkOtcvjS5PPcqAqu153N2+0/WjZt96ZSI1A=";
1522
fetchSubmodules = true;
1623
};
1724

1825
nativeBuildInputs = [ cmake ];
1926

20-
buildInputs = [ asio boost.dev check openssl ];
27+
buildInputs = [
28+
asio
29+
boost.dev
30+
check
31+
openssl
32+
];
2133

2234
preConfigure = ''
2335
# make sure bundled asio cannot be used, but leave behind license, because it gets installed

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25536,8 +25536,6 @@ with pkgs;
2553625536
mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { };
2553725537
mariadb-connector-c_3_3 = callPackage ../servers/sql/mariadb/connector-c/3_3.nix { };
2553825538

25539-
mariadb-galera = callPackage ../servers/sql/mariadb/galera { };
25540-
2554125539
inherit (import ../servers/sql/mariadb pkgs)
2554225540
mariadb_105
2554325541
mariadb_106

0 commit comments

Comments
 (0)