aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-11 20:54:31 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-11 20:54:31 +0200
commit9dd3eb0b58d4c38910ba9dd6d1cce5a41168421a (patch)
tree6854ad09e4bffb45c4f932b2a83fcd6e91233e9c
parent0b3f9cb9fde5929f361e91f6ed5b43958665f3d5 (diff)
downloadNix-9dd3eb0b58d4c38910ba9dd6d1cce5a41168421a.tar.gz
Nix-9dd3eb0b58d4c38910ba9dd6d1cce5a41168421a.tar.zst
Nix-9dd3eb0b58d4c38910ba9dd6d1cce5a41168421a.zip
Remove postgresql from global overlays
-rw-r--r--modules/private/system.nix4
-rw-r--r--overlays/databases/postgresql/default.nix2
2 files changed, 4 insertions, 2 deletions
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 @@
12 - /var/lib 12 - /var/lib
13 ''; 13 '';
14 }; 14 };
15 nixpkgs.overlays = builtins.attrValues (import ../../overlays); 15 nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [
16 (self: super: { postgresql = self.postgresql_pam; }) # don’t put it as generic overlay for home-manager
17 ];
16 _module.args = { 18 _module.args = {
17 pkgsNext = import <nixpkgsNext> {}; 19 pkgsNext = import <nixpkgsNext> {};
18 pkgsPrevious = import <nixpkgsPrevious> {}; 20 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 @@
1self: super: rec { 1self: super: rec {
2 postgresql = super.postgresql_11.overrideAttrs(old: { 2 postgresql_pam = super.postgresql_11.overrideAttrs(old: {
3 # datadir in /var/lib/postgresql is named after psqlSchema 3 # datadir in /var/lib/postgresql is named after psqlSchema
4 passthru = old.passthru // { psqlSchema = "11.0"; }; 4 passthru = old.passthru // { psqlSchema = "11.0"; };
5 configureFlags = old.configureFlags ++ [ "--with-pam" ]; 5 configureFlags = old.configureFlags ++ [ "--with-pam" ];