From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 11 Apr 2020 18:54:31 +0000 (+0200)
Subject: Remove postgresql from global overlays
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=9dd3eb0b58d4c38910ba9dd6d1cce5a41168421a

Remove postgresql from global overlays
---

diff --git a/modules/private/system.nix b/modules/private/system.nix
index 57aeb4e..b4080ec 100644
--- 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 50d9496..9ada29c 100644
--- 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" ];