diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-10 01:22:16 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-10 01:22:16 +0200 |
commit | 9f16e659f129dd8acab7d086ef9822673a01ba06 (patch) | |
tree | e457a3aa743bf31f67d09ee9569bbda3cd5bf152 /overlays | |
parent | a071d8a6af7b8130047b3997c34b15f71089a4e5 (diff) | |
download | Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.tar.gz Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.tar.zst Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.zip |
Stop using overlays in the middle of modules
Diffstat (limited to 'overlays')
-rw-r--r-- | overlays/databases/postgresql/default.nix | 2 | ||||
-rw-r--r-- | overlays/default.nix | 1 | ||||
-rw-r--r-- | overlays/postfix/default.nix | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix index ae58987..50d9496 100644 --- a/overlays/databases/postgresql/default.nix +++ b/overlays/databases/postgresql/default.nix | |||
@@ -1,5 +1,5 @@ | |||
1 | self: super: rec { | 1 | self: super: rec { |
2 | postgresql_11_custom = super.postgresql_11.overrideAttrs(old: { | 2 | postgresql = 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" ]; |
diff --git a/overlays/default.nix b/overlays/default.nix index 881083d..b3bc8ca 100644 --- a/overlays/default.nix +++ b/overlays/default.nix | |||
@@ -17,6 +17,7 @@ | |||
17 | nixops = import ./nixops; | 17 | nixops = import ./nixops; |
18 | pass = import ./pass; | 18 | pass = import ./pass; |
19 | pelican = import ./pelican; | 19 | pelican = import ./pelican; |
20 | postfix = import ./postfix; | ||
20 | postgresql = import ./databases/postgresql; | 21 | postgresql = import ./databases/postgresql; |
21 | s6 = import ./s6; | 22 | s6 = import ./s6; |
22 | sc-im = import ./sc-im; | 23 | sc-im = import ./sc-im; |
diff --git a/overlays/postfix/default.nix b/overlays/postfix/default.nix new file mode 100644 index 0000000..55b8312 --- /dev/null +++ b/overlays/postfix/default.nix | |||
@@ -0,0 +1,3 @@ | |||
1 | self: super: { | ||
2 | postfix = super.postfix.override { withMySQL = true; }; | ||
3 | } | ||