summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-10 01:22:16 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-25 00:04:55 +0200
commit421b0067dbeada035543fc1d1a886e8a76e049e9 (patch)
treef1169213edf2a7a4cdc200c895570a01d02b11f2
parentbb7756f9d795efbea16309976337f9da7b473c58 (diff)
downloadNUR-421b0067dbeada035543fc1d1a886e8a76e049e9.tar.gz
NUR-421b0067dbeada035543fc1d1a886e8a76e049e9.tar.zst
NUR-421b0067dbeada035543fc1d1a886e8a76e049e9.zip
Stop using overlays in the middle of modules
-rw-r--r--overlays/databases/postgresql/default.nix2
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/postfix/default.nix3
3 files changed, 5 insertions, 1 deletions
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 @@
1self: super: rec { 1self: 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 881083dd..b3bc8caf 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 00000000..55b83128
--- /dev/null
+++ b/overlays/postfix/default.nix
@@ -0,0 +1,3 @@
1self: super: {
2 postfix = super.postfix.override { withMySQL = true; };
3}