From ee7e9da5b98bf4cf32a28baebca8852fd1f0d18a Mon Sep 17 00:00:00 2001
From: Kevin Puetz <puetzk@puetzk.org>
Date: Thu, 12 Jan 2023 17:58:14 -0600
Subject: [PATCH] borgbackup: cherry-pick patch to fix tests

borgbackup/borg#7250 is now fixed in 1.2-maint (pending for borg 1.2.4)
but borgbackup/borg#7252 was amended to a different approach before
being apporoved. Replace the original workaround with upstream's fix.
---
 pkgs/tools/backup/borgbackup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix
index 89642b33a726..28fcf8bc90fa 100644
--- a/pkgs/tools/backup/borgbackup/default.nix
+++ b/pkgs/tools/backup/borgbackup/default.nix
@@ -28,8 +28,8 @@ python3.pkgs.buildPythonApplication rec {
     (fetchpatch {
       # Fix HashIndexSizeTestCase.test_size_on_disk_accurate problems on ZFS,
       # see https://github.com/borgbackup/borg/issues/7250
-      url = "https://github.com/borgbackup/borg/pull/7252/commits/537a814e53e20013a041faa7192da005f137cf5b.patch";
-      hash = "sha256-dnF/FW8pS4Ub9aAL4b7zf6ZNjMZaiMqdtl5R+DlAZTM=";
+      url = "https://github.com/borgbackup/borg/pull/7252/commits/fe3775cf8078c18d8fe39a7f42e52e96d3ecd054.patch";
+      hash = "sha256-gdssHfhdkmRfSAOeXsq9Afg7xqGM3NLIq4QnzmPBhw4=";
     })
   ];