From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 7 May 2020 23:34:59 +0000 (+0200)
Subject: Remove mariadb with pam overlay
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=4e3e4761c8566cbc47c64d66bfc21bb6dee32860;hp=7ff0f7be4890ffd5d6af614fcade3d64eaa66ffc;p=perso%2FImmae%2FConfig%2FNix.git

Remove mariadb with pam overlay
---

diff --git a/modules/private/system.nix b/modules/private/system.nix
index b4080ec..9161738 100644
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -13,7 +13,10 @@
         '';
     };
     nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [
-      (self: super: { postgresql = self.postgresql_pam; }) # don’t put it as generic overlay for home-manager
+      (self: super: {
+        postgresql = self.postgresql_pam;
+        mariadb = self.mariadb_pam;
+      }) # don’t put them as generic overlay because of home-manager
     ];
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 24bad1b..4302cd1 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -1,6 +1,5 @@
 self: super: rec {
-  mariadb = mariadbPAM;
-  mariadbPAM = super.mariadb.overrideAttrs(old: {
+  mariadb_pam = super.mariadb.overrideAttrs(old: {
     cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
     buildInputs = old.buildInputs ++ [ self.pam ];
   });