From 7aeffe56b0ebb903dfd2711dc47f4f581238d9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?= <tom@tomhoule.com>
Date: Sun, 14 Aug 2022 18:47:13 +0200
Subject: [PATCH 1/2] backblaze-b2: 3.2.0 -> 3.5.0

---
 .../tools/backblaze-b2/default.nix            | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 6df8edd02c96..d6b94391e6cb 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -2,17 +2,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "backblaze-b2";
-  version = "3.2.0";
+  version = "3.5.0";
 
   src = python3Packages.fetchPypi {
     inherit version;
     pname = "b2";
-    sha256 = "sha256-dE4eLTNU6O0DscwN8+m1UaG46dbI0DiWzeJK49GUvKA=";
+    sha256 = "sha256-vyqExulsV0wDijLotPO3RAOk9o4ne0Vq74KJKhSBrvo=";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace 'docutils==0.16' 'docutils'
+      --replace 'tabulate==0.8.10' 'tabulate'
     substituteInPlace setup.py \
       --replace 'setuptools_scm<6.0' 'setuptools_scm'
   '';
@@ -27,18 +27,27 @@ python3Packages.buildPythonApplication rec {
     setuptools
     docutils
     rst2ansi
+    tabulate
   ];
 
   checkInputs = with python3Packages; [
+    backoff
     pytestCheckHook
   ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   disabledTests = [
     # require network
     "test_files_headers"
-    "test_copy_file_by_id"
     "test_integration"
-    "test_get_account_info"
+  ];
+
+  disabledTestPaths = [
+    # requires network
+    "test/integration/test_b2_command_line.py"
   ];
 
   postInstall = ''

From 387f876b2d1db0beba775fa6ac917aaeda4edd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?= <tom@tomhoule.com>
Date: Sun, 14 Aug 2022 18:48:25 +0200
Subject: [PATCH 2/2] backblaze-b2: add tomhoule to maintainers

---
 pkgs/development/tools/backblaze-b2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index d6b94391e6cb..f8065c4f7b70 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -63,6 +63,6 @@ python3Packages.buildPythonApplication rec {
     description = "Command-line tool for accessing the Backblaze B2 storage service";
     homepage = "https://github.com/Backblaze/B2_Command_Line_Tool";
     license = licenses.mit;
-    maintainers = with maintainers; [ hrdinka kevincox ];
+    maintainers = with maintainers; [ hrdinka kevincox tomhoule ];
   };
 }