aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2018-06-10 20:13:47 +0300
committerIgor Pashev <pashev.igor@gmail.com>2018-06-10 20:13:47 +0300
commit79617d32c14667bac08ed56faa20cd243c09682e (patch)
treeab69e9c2468439eb031da7b19b0fcd8a9287d413
parent0cad0928bd0f7f4ad877b95de7f65d229d70313a (diff)
downloadnixsap-79617d32c14667bac08ed56faa20cd243c09682e.tar.gz
Stop overriding pkgs.mariadb
Use specific default version for the current MariaDB application.
-rw-r--r--modules/apps/mariadb/default.nix2
-rw-r--r--modules/pkgs/mariadb_10_1/default.nix (renamed from modules/pkgs/mariadb/default.nix)0
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix
index b3701d1..81b8dd6 100644
--- a/modules/apps/mariadb/default.nix
+++ b/modules/apps/mariadb/default.nix
@@ -298,7 +298,7 @@ in {
package = mkOption {
description = "MariaDB Package (10.1.x)";
type = package;
- default = pkgs.mariadb;
+ default = pkgs.mariadb_10_1;
};
replicate = mkOption {
diff --git a/modules/pkgs/mariadb/default.nix b/modules/pkgs/mariadb_10_1/default.nix
index e4c595a..e4c595a 100644
--- a/modules/pkgs/mariadb/default.nix
+++ b/modules/pkgs/mariadb_10_1/default.nix