From 49cb112d99d71b468d8f01d770ed05cb2e021b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 22 Jun 2018 11:06:43 +0200 Subject: [PATCH] python.pkgs.django-haystack: 2.4.1 -> 2.8.1 --- .../django-haystack/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 827949ab7f8d..905ce92e5177 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,26 +1,27 @@ { lib, buildPythonPackage, fetchPypi -, django, dateutil, whoosh, pysolr, elasticsearch -, coverage, mock, nose, geopy }: +, setuptools_scm, django, dateutil, whoosh, pysolr +, coverage, mock, nose, geopy, requests }: buildPythonPackage rec { pname = "django-haystack"; - version = "2.4.1"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f"; + sha256 = "8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c"; }; - doCheck = false; # no tests in source - - checkInputs = [ elasticsearch pysolr whoosh dateutil geopy coverage nose mock coverage ]; + checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django ]; + nativeBuildInputs = [ setuptools_scm ]; - patchPhase = '' + postPatch = '' sed -i 's/geopy==/geopy>=/' setup.py - sed -i 's/whoosh==/Whoosh>=/' setup.py ''; + # ImportError: cannot import name django.contrib.gis.geos.prototypes + doCheck = false; + meta = with lib; { description = "Modular search for Django"; homepage = "http://haystacksearch.org/";