Merge master into staging-next

2021-12-05 00:01:53 +00:00
parent d4c54e7f61 955bc9b5c2
commit 5a1288f93b
37 changed files with 787 additions and 208 deletions
@@ -73,6 +73,12 @@ buildPythonPackage rec {
    "test_checkpoints_follow_file"
  ];

+  disabledTestPaths = lib.optionals stdenv.isDarwin [
+    # requires local networking
+    "notebook/auth/tests/test_login.py"
+    "notebook/bundler/tests/test_bundler_api.py"
+  ];
+
  # Some of the tests use localhost networking.
  __darwinAllowLocalNetworking = true;