Merge branch 'master' into staging-next

2020-08-04 21:37:39 +02:00
parent 26c481b435 6a617de2c4
commit 8bbc202208
19 changed files with 355 additions and 118 deletions
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  '';

  # https://github.com/Martiusweb/asynctest/issues/132
-  doCheck = pythonOlder "3.8";
+  doCheck = pythonOlder "3.7";

  checkPhase = ''
    ${python.interpreter} -m unittest test