From 095321be4b2f296e70af5af06a886e1d8c34d9a3 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 7 Jan 2025 17:43:50 +0200
Subject: [PATCH 1/2] courier-unicode: init at 2.3.1

---
 pkgs/by-name/co/courier-unicode/package.nix | 32 +++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/co/courier-unicode/package.nix

diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix
new file mode 100644
index 000000000000..c9a8354d70c5
--- /dev/null
+++ b/pkgs/by-name/co/courier-unicode/package.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  fetchurl,
+  lib,
+  perl,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "courier-unicode";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2";
+    sha256 = "sha256-uD7mRqR8Kp1pL7bvuThWRmjDLsF51PrAwH6s6KG4/JE=";
+  };
+
+  nativeBuildInputs = [
+    perl
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  meta = {
+    homepage = "http://www.courier-mta.org/unicode/";
+    description = "The Courier Unicode Library is used by most other Courier packages";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+  };
+}

From 6f1400cbf7321ad612671be8afc1c74db16815ca Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 7 Jan 2025 17:44:55 +0200
Subject: [PATCH 2/2] maildrop: 2.6.0 -> 3.1.8

---
 .../ma/maildrop/maildrop.configure.hack.patch        |  6 +++---
 pkgs/by-name/ma/maildrop/package.nix                 | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
index 08988f6cde50..69874b17bc3e 100644
--- a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
+++ b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
@@ -1,6 +1,6 @@
---- a/maildrop/configure	2012-09-06 01:52:13.000000000 +0100
-+++ b/maildrop/configure	2013-01-04 03:00:57.095628327 +0000
-@@ -17562,8 +17562,8 @@
+--- a/libs/maildrop/configure	2012-09-06 01:52:13.000000000 +0100
++++ b/libs/maildrop/configure	2013-01-04 03:00:57.095628327 +0000
+@@ -19857,8 +19862,8 @@
  check_spooldir() {
    if test "$CHECKED_SPOOLDIR" != 1
    then
diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix
index 6e891e434513..3f222a427293 100644
--- a/pkgs/by-name/ma/maildrop/package.nix
+++ b/pkgs/by-name/ma/maildrop/package.nix
@@ -3,22 +3,26 @@
   lib,
   stdenv,
   pkg-config,
-  pcre,
+  courier-unicode,
+  pcre2,
+  libidn2,
   perl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "maildrop";
-  version = "2.6.0";
+  version = "3.1.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
-    sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
+    sha256 = "sha256-foJsAxkXRE8berccH82QODWVZEhG4rOyYONSsc4D6VA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    pcre
+    courier-unicode
+    libidn2
+    pcre2
     perl
   ];