python.pkgs.pysolr: move expression

2 files changed, 23 insertions, 21 deletions

diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix
new file mode 100644
index 000000000000..5a444fe1b52e
--- /dev/null
+++ b/pkgs/development/python-modules/pysolr/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "pysolr";
+  version = "3.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  doCheck = false; # no tests in PyPI tarball
+
+  meta = with lib; {
+    description = "Lightweight Python wrapper for Apache Solr";
+    homepage = "http://github.com/toastdriven/pysolr/";
+    license = licenses.bsd3;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ff3b643772f..3d374f41455b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12094,27 +12094,7 @@ in {
 
   rjsmin = callPackage ../development/python-modules/rjsmin { };
 
-  pysolr = buildPythonPackage rec {
-    name = "pysolr-${version}";
-    version = "3.3.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz";
-      sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6";
-    };
-
-    propagatedBuildInputs = with self; [
-      requests
-    ];
-    buildInputs = with self; [
-
-    ];
-
-    meta = with stdenv.lib; {
-      homepage = "http://github.com/toastdriven/pysolr/";
-    };
-  };
-
+  pysolr = callPackage ../development/python-modules/pysolr { };
 
   django-haystack = callPackage ../development/python-modules/django-haystack { };