From af02f13e2572a2bdde5a6e94e78f4f3dcc6a05a3 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 16:23:28 +0700
Subject: [PATCH] python.pkgs.afew : move to separate expression

---
 .../python-modules/afew/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +----------------
 2 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/python-modules/afew/default.nix

diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix
new file mode 100644
index 000000000000..4a2d4a0f7224
--- /dev/null
+++ b/pkgs/development/python-modules/afew/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, isPy3k , dbacl, notmuch, chardet, subprocess32 }:
+
+buildPythonPackage rec {
+  pname = "afew";
+  version = "git-2017-02-08";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "afewmail";
+    repo = "afew";
+    rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
+    sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
+  };
+
+  buildInputs = [ dbacl ];
+
+  propagatedBuildInputs = [
+    notmuch
+    chardet
+  ] ++ stdenv.lib.optional (!isPy3k) subprocess32;
+
+  doCheck = false;
+
+  preConfigure = ''
+    substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'"
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/afew \
+      --prefix LD_LIBRARY_PATH : ${notmuch}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/teythoon/afew;
+    description = "An initial tagging script for notmuch mail";
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d81ec98a186..2a21ac792ae2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -276,40 +276,7 @@ in {
 
   adal = callPackage ../development/python-modules/adal { };
 
-  afew = buildPythonPackage rec {
-    name = "afew-git-2017-02-08";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "afewmail";
-      repo = "afew";
-      rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
-      sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
-    };
-
-    buildInputs = with self; [ pkgs.dbacl ];
-
-    propagatedBuildInputs = with self; [
-      self.notmuch
-      self.chardet
-    ] ++ optional (!isPy3k) self.subprocess32;
-
-    doCheck = false;
-
-    preConfigure = ''
-      substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'"
-    '';
-
-    postInstall = ''
-      wrapProgram $out/bin/afew \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
-    '';
-
-    meta = {
-      homepage = https://github.com/teythoon/afew;
-      description = "An initial tagging script for notmuch mail";
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  afew = callPackage ../development/python-modules/afew { };
 
   aiodns = buildPythonPackage rec {
     name = "aiodns-${version}";