From 1024394c664e8dfb21adad89052c07470113ea62 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 29 Oct 2018 14:57:17 -0400
Subject: [PATCH] pythonPackages.maildir-deduplicate: refactor move to
 python-modules

---
 .../maildir-deduplicate/default.nix           | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +--------------
 2 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/maildir-deduplicate/default.nix

diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix
new file mode 100644
index 00000000000..a0a4e52ea27
--- /dev/null
+++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "maildir-deduplicate";
+  version = "1.0.2";
+  disabled = !isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
+  };
+
+  propagatedBuildInputs = [ click ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line tool to deduplicate mails from a set of maildir folders";
+    homepage = "https://github.com/kdeldycke/maildir-deduplicate";
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64a0bf0414b..e8f3c5eb910 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4469,26 +4469,7 @@ in {
 
   mailcap-fix = callPackage ../development/python-modules/mailcap-fix { };
 
-  maildir-deduplicate = buildPythonPackage rec {
-    name = "maildir-deduplicate-${version}";
-    version = "1.0.2";
-
-    disabled = !isPy27;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/maildir-deduplicate/${name}.tar.gz";
-      sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
-    };
-
-    propagatedBuildInputs = with self; [ click ];
-
-    meta = with stdenv.lib; {
-      description = "Command-line tool to deduplicate mails from a set of maildir folders";
-      homepage = "https://github.com/kdeldycke/maildir-deduplicate";
-      license = licenses.gpl2;
-    };
-  };
-
+  maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { };
 
   mps-youtube = buildPythonPackage rec {
     name = "mps-youtube-${version}";