python.pkgs.django-haystack: move expression

2 files changed, 30 insertions, 25 deletions

diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
new file mode 100644
index 000000000000..827949ab7f8d
--- /dev/null
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi
+, django, dateutil, whoosh, pysolr, elasticsearch
+, coverage, mock, nose, geopy }:
+
+buildPythonPackage rec {
+  pname = "django-haystack";
+  version = "2.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f";
+  };
+
+  doCheck = false;  # no tests in source
+
+  checkInputs = [ elasticsearch pysolr whoosh dateutil geopy coverage nose mock coverage ];
+  propagatedBuildInputs = [ django ];
+
+  patchPhase = ''
+    sed -i 's/geopy==/geopy>=/' setup.py
+    sed -i 's/whoosh==/Whoosh>=/' setup.py
+  '';
+
+  meta = with lib; {
+    description = "Modular search for Django";
+    homepage = "http://haystacksearch.org/";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51da6c57433b..0ff3b643772f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12116,31 +12116,7 @@ in {
   };
 
 
-  django-haystack = buildPythonPackage rec {
-    name = "django-haystack-${version}";
-    version = "2.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz";
-      sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f";
-    };
-
-    doCheck = false;  # no tests in source
-
-    buildInputs = with self; [ coverage mock nose geopy ];
-    propagatedBuildInputs = with self; [
-      django dateutil_1_5 whoosh pysolr elasticsearch
-    ];
-
-    patchPhase = ''
-      sed -i 's/geopy==/geopy>=/' setup.py
-      sed -i 's/whoosh==/Whoosh>=/' setup.py
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = "http://haystacksearch.org/";
-    };
-  };
+  django-haystack = callPackage ../development/python-modules/django-haystack { };
 
   geoalchemy2 = buildPythonPackage rec {
     name = "GeoAlchemy2-${version}";