Merge master into staging-next

2021-04-22 06:05:51 +00:00
parent 77694c34c6 093b406afc
commit 8248f4db36
88 changed files with 1432 additions and 356 deletions
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchpatch
 , fetchPypi
@@ -48,6 +49,14 @@ buildPythonPackage rec {
    "google.oauth2"
  ];

+  disabledTests = lib.optionals stdenv.isDarwin [
+    "test_request_with_timeout_success"
+    "test_request_with_timeout_failure"
+    "test_request_headers"
+    "test_request_error"
+    "test_request_basic"
+  ];
+
  meta = with lib; {
    description = "Google Auth Python Library";
    longDescription = ''