From ac898ef18e16af71ef936e7f1dfcaa97b985e910 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 18 Feb 2026 22:18:42 +0000
Subject: [PATCH 1/3] dovecot: add missing dependency libxcrypt

Fixes `nixpkgs` issue 483259.
---
 pkgs/by-name/do/dovecot/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index e223af418c3a..56b5ba4d9322 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -21,6 +21,7 @@
   icu75,
   libexttextcat,
   libsodium,
+  libxcrypt,
   libstemmer,
   cyrus_sasl,
   nixosTests,
@@ -67,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     icu75
     libexttextcat
     libsodium
+    libxcrypt
     libstemmer
     cyrus_sasl.dev
   ]

From eb3ec31cea8ea97d253e67ce10eb8b5e735cf8ae Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Thu, 19 Feb 2026 01:41:11 +0000
Subject: [PATCH 2/3] dovecot: set strictDeps to be true

---
 pkgs/by-name/do/dovecot/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 56b5ba4d9322..de811df59304 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -182,6 +182,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  strictDeps = true;
+
   meta = {
     homepage = "https://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";

From 83ca35a0ecb587750bde7248a371c90e56af6abc Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:00:21 +0000
Subject: [PATCH 3/3] nixos/tests/opensmtpd: update dovecot service name

The dovecot2 alias was dropped in PR 470461.
---
 nixos/tests/opensmtpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index e1c26a7c6775..f613c7241134 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -149,7 +149,7 @@ import ./make-test-python.nix {
     client.wait_for_unit("network-online.target")
     smtp1.wait_for_unit("opensmtpd")
     smtp2.wait_for_unit("opensmtpd")
-    smtp2.wait_for_unit("dovecot2")
+    smtp2.wait_for_unit("dovecot")
 
     # To prevent sporadic failures during daemon startup, make sure
     # services are listening on their ports before sending requests