Merge master into staging-next

pkgs/development/python-modules/httplib2/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
@@ -39,8 +40,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Don't run tests for Python 2.7
-  doCheck = !isPy27;
+  # Don't run tests for Python 2.7 or Darwin
+  # Nearly 50% of the test suite requires local network access
+  # which isn't allowed on sandboxed Darwin builds
+  doCheck = !(isPy27 || stdenv.isDarwin);
   pytestFlagsArray = [ "--ignore python2" ];
   pythonImportsCheck = [ "httplib2" ];