Merge staging-next into staging

2020-09-22 18:31:56 +02:00
parent c24b9331e0 e3607652b6
commit 7bff759fac
142 changed files with 3478 additions and 882 deletions
@@ -46,9 +46,8 @@ pythonPackages.buildPythonApplication rec {
    librsync
  ];

-  propagatedBuildInputs = [
-    backblaze-b2
-  ] ++ (with pythonPackages; [
+  propagatedBuildInputs = with pythonPackages; [
+    b2sdk
    boto
    cffi
    cryptography
@@ -65,7 +64,7 @@ pythonPackages.buildPythonApplication rec {
    future
  ] ++ stdenv.lib.optionals (!isPy3k) [
    enum
-  ]);
+  ];

  checkInputs = [
    gnupg # Add 'gpg' to PATH.