Remove postgresql from global overlays

diff --git a/modules/private/system.nix b/modules/private/system.nix
index 57aeb4e1b569c21f18c766d4482f6553db6bcb1d..b4080ecf971ed5cce33c4a0b6c1196e45f218a4e 100644 (file)
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -12,7 +12,9 @@
         - /var/lib
         '';
     };
-    nixpkgs.overlays = builtins.attrValues (import ../../overlays);
+    nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [
+      (self: super: { postgresql = self.postgresql_pam; }) # don’t put it as generic overlay for home-manager
+    ];
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};

diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix
index 50d949675313dd255c3a0982d4b403b1e95c5225..9ada29c99343181160280ed697e8fcbd6a85d27d 100644 (file)
--- a/overlays/databases/postgresql/default.nix
+++ b/overlays/databases/postgresql/default.nix
@@ -1,5 +1,5 @@
 self: super: rec {
-  postgresql = super.postgresql_11.overrideAttrs(old: {
+  postgresql_pam = super.postgresql_11.overrideAttrs(old: {
     # datadir in /var/lib/postgresql is named after psqlSchema
     passthru = old.passthru // { psqlSchema = "11.0"; };
     configureFlags = old.configureFlags ++ [ "--with-pam" ];