Merge branch 'staging' into staging-next

A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
@@ -7,6 +7,7 @@
 , glib
 , gtk3
 , libnotify
+, scandir ? null
 }:

 python3Packages.buildPythonApplication rec {
@@ -23,7 +23,7 @@ buildPythonApplication rec {
    dateutil gflags httplib2 parsedatetime six vobject
    google-api-python-client oauth2client uritemplate
    libnotify
-  ] ++ lib.optional (!isPy3k) futures;
+  ];

  # There are no tests as of 4.0.0a4
  doCheck = false;