Merge branch 'master' into costrouc/dask-distributed

2018-09-05 23:53:23 -04:00
parent 4f70170f8a f89d6d92b7
commit ed130935c8
2787 changed files with 95087 additions and 94417 deletions
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "pytest-timeout";
-  version = "1.3.1";
+  version = "1.3.2";

  # remove after version 1.3.1
  patches = [
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23";
+    sha256 = "1117fc0536e1638862917efbdc0895e6b62fa61e6cf4f39bb655686af7af9627";
  };

  buildInputs = [ pytest ];