From 421b0067dbeada035543fc1d1a886e8a76e049e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 10 Apr 2020 01:22:16 +0200 Subject: Stop using overlays in the middle of modules --- overlays/databases/postgresql/default.nix | 2 +- overlays/default.nix | 1 + overlays/postfix/default.nix | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 overlays/postfix/default.nix diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix index ae589877..50d94967 100644 --- a/overlays/databases/postgresql/default.nix +++ b/overlays/databases/postgresql/default.nix @@ -1,5 +1,5 @@ self: super: rec { - postgresql_11_custom = super.postgresql_11.overrideAttrs(old: { + postgresql = 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" ]; diff --git a/overlays/default.nix b/overlays/default.nix index 881083dd..b3bc8caf 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -17,6 +17,7 @@ nixops = import ./nixops; pass = import ./pass; pelican = import ./pelican; + postfix = import ./postfix; postgresql = import ./databases/postgresql; s6 = import ./s6; sc-im = import ./sc-im; diff --git a/overlays/postfix/default.nix b/overlays/postfix/default.nix new file mode 100644 index 00000000..55b83128 --- /dev/null +++ b/overlays/postfix/default.nix @@ -0,0 +1,3 @@ +self: super: { + postfix = super.postfix.override { withMySQL = true; }; +} -- cgit v1.2.3