diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/by-name/ma/mariadb-galera/package.nix similarity index 78% rename from pkgs/servers/sql/mariadb/galera/default.nix rename to pkgs/by-name/ma/mariadb-galera/package.nix index 2f0b4d0b2b5e..0d85c9f3d56b 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/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 index 812456c75c40..7532366a8dfd 100644 --- 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