From 6c509c3eb173edabb69ff963dd144b1bf3c66c16 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Wed, 30 Dec 2020 06:39:34 +0000
Subject: [PATCH 1/4] maintainers: add ninjin

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4b2dc491476..5ce46ff6436 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6441,6 +6441,16 @@
     githubId = 1219785;
     name = "Félix Baylac-Jacqué";
   };
+  ninjin = {
+    email = "pontus@stenetorp.se";
+    github = "ninjin";
+    githubId = 354934;
+    name = "Pontus Stenetorp";
+    keys = [{
+      longkeyid = "rsa4096/0xD430287500E6483C";
+      fingerprint = "0966 2F9F 3FDA C22B C22E  4CE1 D430 2875 00E6 483C";
+    }];
+  };
   nioncode = {
     email = "nioncode+github@gmail.com";
     github = "nioncode";

From 326f94c05989e23c9cb081c217165393eacb9510 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Wed, 30 Dec 2020 06:52:33 +0000
Subject: [PATCH 2/4] fdm: add ninjin as a maintainer

---
 pkgs/tools/networking/fdm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index fb125b486d7..f83b2fb2fe2 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ ninjin raskin ];
     platforms = with platforms; linux;
     homepage = "https://github.com/nicm/fdm";
     downloadPage = "https://github.com/nicm/fdm/releases";

From 3fa4f4718f6310a32a96bf2f0db141ad850d3efc Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Wed, 30 Dec 2020 06:53:04 +0000
Subject: [PATCH 3/4] fdm: 1.9.0.20170124 -> 2.0

---
 pkgs/tools/networking/fdm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index f83b2fb2fe2..1c3d69f9cb4 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -3,7 +3,7 @@
 let
 
   baseName = "fdm";
-  version = "1.9.0.20170124";
+  version = "2.0";
 
 in
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "nicm";
     repo = baseName;
-    rev = "cae4ea37b6b296d1b2e48f62934ea3a7f6085e33";
-    sha256 = "048191wdv1yprwinipmx2152gvd2iq1ssv7xfb1bzh6zirh1ya3n";
+    rev = "370b04f165b0bb2989be378bb7e66b14f042d3f9";
+    sha256 = "0j2n271ni5wslgjq1f4zgz1nsvqjf895dxy3ij5c904bbp8ckcwq";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From a4e95b70f21c685597f7b753394fed78bf35bf40 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Wed, 30 Dec 2020 13:16:42 +0000
Subject: [PATCH 4/4] fdm: modernised syntax

---
 pkgs/tools/networking/fdm/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 1c3d69f9cb4..cb5a781f5ef 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -1,19 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }:
 
-let
-
-  baseName = "fdm";
+stdenv.mkDerivation rec {
+  pname = "fdm";
   version = "2.0";
 
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
-
   src = fetchFromGitHub {
     owner = "nicm";
-    repo = baseName;
-    rev = "370b04f165b0bb2989be378bb7e66b14f042d3f9";
+    repo = pname;
+    rev = version;
     sha256 = "0j2n271ni5wslgjq1f4zgz1nsvqjf895dxy3ij5c904bbp8ckcwq";
   };