Merge pull request #332445 from helsinki-systems/upd/galera

mariadb-galera: 26.4.19 -> 26.4.20
NixOS · Aug 14, 2024 · 67d0a62 · 67d0a62
2 parents 53e62be + 564236b
commit 67d0a62
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix → pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/servers/sql/mariadb/galera/default.nix → pkgs/by-name/ma/mariadb-galera/package.nix
@@ -1,23 +1,35 @@
-{ lib, stdenv, fetchFromGitHub, buildEnv
-, asio, boost, check, openssl, cmake
-, nixosTests
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  asio,
+  boost,
+  check,
+  openssl,
+  cmake,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mariadb-galera";
-  version = "26.4.19";
+  version = "26.4.20";
 
   src = fetchFromGitHub {
     owner = "codership";
     repo = "galera";
     rev = "release_${version}";
-    hash = "sha256-DSYwOMBs7kxskTjEIO1AqXw+oAUeDXzX+qLNBuob0Jg=";
+    hash = "sha256-R2YQtAuqPkOtcvjS5PPcqAqu153N2+0/WjZt96ZSI1A=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ asio boost.dev check openssl ];
+  buildInputs = [
+    asio
+    boost.dev
+    check
+    openssl
+  ];
 
   preConfigure = ''
     # make sure bundled asio cannot be used, but leave behind license, because it gets installed

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -25536,8 +25536,6 @@ with pkgs;
   mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { };
   mariadb-connector-c_3_3 = callPackage ../servers/sql/mariadb/connector-c/3_3.nix { };
 
-  mariadb-galera = callPackage ../servers/sql/mariadb/galera { };
-
   inherit (import ../servers/sql/mariadb pkgs)
     mariadb_105
     mariadb_106