From 003b067baf2d8b4ac99a6b21cf7033d5330d2d2b Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 5 Mar 2021 00:30:56 +0100
Subject: [PATCH 1/3] dovecot: add myself as maintainer

---
 pkgs/servers/mail/dovecot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 2c44094d0f7..60c9f9a7837 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
-    maintainers = with lib.maintainers; [ peti fpletz globin ];
+    maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ];
     platforms = lib.platforms.unix;
   };
   passthru.tests = {

From 0b6c9a4c38d5a55ad52ac08488298e3b1023d0e4 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 5 Mar 2021 00:33:21 +0100
Subject: [PATCH 2/3] dovecot: 2.3.13 -> 2.3.14

---
 pkgs/servers/mail/dovecot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 60c9f9a7837..337405ff672 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dovecot";
-  version = "2.3.13";
+  version = "2.3.14";
 
   nativeBuildInputs = [ perl pkg-config ];
   buildInputs =
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional withSQLite sqlite;
 
   src = fetchurl {
-    url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
-    sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53";
+    url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
+    sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8";
   };
 
   enableParallelBuilding = true;

From c543f4d8842cd2ce6f1dea80e7265bb9eb0b64fe Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 5 Mar 2021 00:34:35 +0100
Subject: [PATCH 3/3] dovecot_pigeonhole: 0.5.13 -> 0.5.14

---
 .../mail/dovecot/plugins/pigeonhole/default.nix       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index e5a07aa3c27..6cdb2ee06f2 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchurl, dovecot, openssl }:
-
-stdenv.mkDerivation rec {
+let
+  dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
+in stdenv.mkDerivation rec {
   pname = "dovecot-pigeonhole";
-  version = "0.5.13";
+  version = "0.5.14";
 
   src = fetchurl {
-    url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi";
+    url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
+    sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8";
   };
 
   buildInputs = [ dovecot openssl ];