1 files changed, 11 insertions, 14 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index 6dc4b666db54..cc58c5ab6bde 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.34.0";
+  version = "2.1.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il";
+    sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2";
   };
 
-  nativeBuildInputs = [ setuptools_scm pytest ];
-  checkInputs = [ pytest filelock ];
+  nativeBuildInputs = [ setuptools_scm pytest_6 ];
+  checkInputs = [ pytest_6 filelock ];
   propagatedBuildInputs = [ execnet pytest-forked psutil six ];
 
-  # Encountered a memory leak
-  # https://github.com/pytest-dev/pytest-xdist/issues/462
-  doCheck = !isPy3k;
-
+  # pytest6 doesn't allow for new lines
+  # capture_deprecated not compatible with latest pytest6
   checkPhase = ''
     # Excluded tests access file system
-    py.test testing -k "not test_distribution_rsyncdirs_example \
-                    and not test_rsync_popen_with_path \
-                    and not test_popen_rsync_subdir \
-                    and not test_init_rsync_roots \
-                    and not test_rsyncignore"
+    export HOME=$TMPDIR
+    pytest -n $NIX_BUILD_CORES \
+      -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)"
   '';
 
   meta = with stdenv.lib; {