From 37cb24a318f1c54f2a84cbca84c9bfb1d500289c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 15 May 2017 14:36:30 +0200
Subject: [PATCH] python.pkgs.pytest_xdist: 1.14 -> 1.16.0

---
 .../python-modules/pytest-xdist/default.nix    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 05f4d5bd1f2..b3577908cf9 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchzip, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.14";
+  version = "1.16.0";
 
-  src = fetchzip {
-    url = "mirror://pypi/p/pytest-xdist/${name}.zip";
-    sha256 = "18j6jq4r47cbbgnci0bbp0kjr9w12hzw7fh4dmsbm072jmv8c0gx";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2";
   };
 
   buildInputs = [ pytest setuptools_scm ];
   propagatedBuildInputs = [ execnet ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = ''
     rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
   '';
 
   checkPhase = ''
-    py.test
+    py.test testing
   '';
 
+  # Only test on 3.x
+  # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'
+  doCheck = isPy3k;
+
   meta = with stdenv.lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = https://github.com/pytest-dev/pytest-xdist;