Merge master into staging-next

2022-02-28 00:02:07 +00:00
parent 0a79f47878 0a8007498f
commit 6787116890
301 changed files with 11913 additions and 449 deletions
@@ -26,7 +26,7 @@
 , testpath
 }:

-buildPythonPackage rec {
+buildPythonPackage (rec {
  pname = "ipython";
  version = "8.0.1";
  format = "pyproject";
@@ -87,4 +87,8 @@ buildPythonPackage rec {
    license = licenses.bsd3;
    maintainers = with maintainers; [ bjornfor fridh ];
  };
-}
+} // lib.optionalAttrs stdenv.isDarwin {
+  disabledTests = [
+    "test_clipboard_get" # uses pbpaste
+  ];
+})