diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-23 16:38:39 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-23 16:38:39 +0100 |
| commit | 35f5912db57a5102377d9687c69c6c7b0753979e (patch) | |
| tree | b0fe2b8fcb4cc69e25aa3376d912eac7f3148a9c /pkgs/development/python-modules/pytest | |
| parent | 6ad79678d49826e5bcac705949a4cd2241727172 (diff) | |
| parent | 59d82d889577bfbdeeb47912eb245846f33e0ae2 (diff) | |
| download | nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar.gz nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar.bz2 nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar.lz nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar.xz nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.tar.zst nixlib-35f5912db57a5102377d9687c69c6c7b0753979e.zip | |
Merge remote-tracking branch 'upstream/python-unstable' into HEAD
Diffstat (limited to 'pkgs/development/python-modules/pytest')
| -rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index bb2e19c5233d..8e280b8fd0d6 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,10 +1,9 @@ { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm +, setuptools_scm, setuptools }: buildPythonPackage rec { version = "3.2.5"; pname = "pytest"; - name = "${pname}-${version}"; preCheck = '' # don't test bash builtins @@ -16,8 +15,9 @@ buildPythonPackage rec { sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; }; - buildInputs = [ hypothesis setuptools_scm ]; - propagatedBuildInputs = [ py ] + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py setuptools ] ++ (stdenv.lib.optional isPy26 argparse); meta = with stdenv.lib; { |