summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2017-01-24 20:08:17 +0100
committerLancelot SIX <lsix@lancelotsix.com>2017-01-24 22:13:40 +0100
commit86a26322e8d38d096ecf77756e4f60ebad1c0fd1 (patch)
treeb246af1400127cbd04eb97433bc25773269c7ef9 /pkgs/development
parent18b2c31eaad696f87566164bedb01e64bc33c9e3 (diff)
downloadnixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar.gz
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar.bz2
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar.lz
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar.xz
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.tar.zst
nixpkgs-86a26322e8d38d096ecf77756e4f60ebad1c0fd1.zip
pythonPackages.pytest_30: 3.0.5 -> 3.0.6
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/pytest/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 76e2b67e65a..d3fea5a3b43 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, buildPythonPackage, fetchurl, hypothesis, py }:
+{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
 buildPythonPackage rec {
   name = "pytest-${version}";
-  version = "3.0.5";
+  version = "3.0.6";
 
   preCheck = ''
     # don't test bash builtins
@@ -10,13 +10,15 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
+    sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34";
   };
 
-  propagatedBuildInputs = [ hypothesis py ];
+  buildInputs = [ hypothesis ];
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse);
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
     platforms = platforms.unix;
   };
 }