Remove mariadb with pam overlay

diff --git a/modules/private/system.nix b/modules/private/system.nix
index b4080ecf971ed5cce33c4a0b6c1196e45f218a4e..916173883aa49548d8b7aeb9e87dcfcc2c82b472 100644 (file)
--- 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 24bad1b6e551faf6336f0dac612397ced10aef9a..4302cd107dffefe4e4e479b5b83ab94b06b416dd 100644 (file)
--- 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 ];
   });