summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-04-10 17:57:07 -0400
committerGitHub <noreply@github.com>2020-04-10 17:57:07 -0400
commit5bca1a7664f1769678b2dd8ad0976581a86cda0a (patch)
tree1f04f33ad784f57eeeaca9f1a4307d60219d012c
parent17c682b7a2786accf53d5c4c8676f301e1861dfa (diff)
parentf9bc195430bac069d21ad0ae05aa253311c2f8c0 (diff)
downloadnixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar.gz
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar.bz2
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar.lz
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar.xz
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.tar.zst
nixpkgs-5bca1a7664f1769678b2dd8ad0976581a86cda0a.zip
Merge pull request #84268 from bhipple/u/nose2
python3Packages.nose2: 0.9.1 -> 0.9.2 and fix build for ZHF
-rw-r--r--pkgs/development/python-modules/nose2/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
index 9ba65a22259..300ed80ca40 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -3,21 +3,22 @@
 , fetchPypi
 , six
 , pythonOlder
-, mock
 , coverage
 }:
 
 buildPythonPackage rec {
   pname = "nose2";
-  version = "0.9.1";
+  version = "0.9.2";
+
+  # Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5.
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16drs4bc2wvgwwi1pf6pmk6c00pl16vs1v7djc4a8kwpsxpibphf";
+    sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7";
   };
 
-  propagatedBuildInputs = [ six coverage ]
-    ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ];
+  propagatedBuildInputs = [ six coverage ];
 
   # AttributeError: 'module' object has no attribute 'collector'
   doCheck = false;