Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5edd09c1fdb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 34dccda9fa66
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 4, 2018

  1. python.pkgs.pytest_xdist: add filelock to checkInputs

    Robert Schütz committed Nov 4, 2018
    Copy the full SHA
    34dccda View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/python-modules/pytest-xdist/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/pytest-xdist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }:
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock }:

buildPythonPackage rec {
pname = "pytest-xdist";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
};

nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ pytest pytest-forked ];
checkInputs = [ pytest pytest-forked filelock ];
propagatedBuildInputs = [ execnet ];

checkPhase = ''
@@ -26,5 +26,6 @@ buildPythonPackage rec {
description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
homepage = https://github.com/pytest-dev/pytest-xdist;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}