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: 32326f5de361
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76aafbf4bf49
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 27, 2018

  1. python.pkgs.pytest_xdist: pytest-forked is needed during runtime, fixes 

    #45060

(cherry picked from commit 364c59d)
    @FRidh
    FRidh committed Dec 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    GPG key ID: EEDA44E02406AF79
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76aafbf View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/python-modules/pytest-xdist/default.nix
8 changes: 4 additions & 4 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, six }:

buildPythonPackage rec {
pname = "pytest-xdist";
@@ -9,9 +9,9 @@ buildPythonPackage rec {
sha256 = "28e25e79698b2662b648319d3971c0f9ae0e6500f88258ccb9b153c31110ba9b";
};

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

checkPhase = ''
# Excluded tests access file system