summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--flake.lock15
-rw-r--r--flake.nix2
-rw-r--r--mail-server/dovecot.nix5
3 files changed, 10 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock
index 8b9ab6f..cab16a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,17 +34,18 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1709703039,
- "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
- "owner": "NixOS",
+ "lastModified": 1710270916,
+ "narHash": "sha256-LwXh1KBiIbZcQ97yaJDcDOCNHAPNCy8oAKKNnx/cZh8=",
+ "owner": "ntninja",
"repo": "nixpkgs",
- "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+ "rev": "3ce96b25629b5fcdd468ee88751d98736f4d2c24",
"type": "github"
},
"original": {
- "id": "nixpkgs",
- "ref": "nixos-unstable",
- "type": "indirect"
+ "owner": "ntninja",
+ "ref": "patch-dovecot-1",
+ "repo": "nixpkgs",
+ "type": "github"
}
},
"root": {
diff --git a/flake.nix b/flake.nix
index 4a8b52d..4573fe4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
flake = false;
};
utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "flake:nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:/ntninja/nixpkgs/patch-dovecot-1";
blobs = {
url = "gitlab:simple-nixos-mailserver/blobs";
flake = false;
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 6459846..7d3a2e8 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -179,13 +179,10 @@ in
sieve = "file:${cfg.sieveDirectory}/%u/scripts;active=${cfg.sieveDirectory}/%u/active.sieve";
sieve_default = "file:${cfg.sieveDirectory}/%u/default.sieve";
sieve_default_name = "default";
+ sieve_extensions = ["+fileinfo"];
};
sieve = {
- extensions = [
- "fileinto"
- ];
-
scripts.after = builtins.toFile "spam.sieve" ''
require "fileinto";