about summary refs log tree commit diff
path: root/pkgs/tools/backup
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-12-25 02:37:57 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-10 02:14:28 +0100
commitc64195df27f0585ab4306f4364fa4f08b70d0157 (patch)
tree6e23cbb7964f5d5bea688ae89e9319f7c912222f /pkgs/tools/backup
parentaa1d74709f5dac623adb4d48fdfb27cc2c92a4d4 (diff)
borgbackup: 1.2.2 -> 1.2.3
https://github.com/borgbackup/borg/blob/1.2.3/docs/changes.rst#version-123-2022-12-24
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r--pkgs/tools/backup/borgbackup/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix
index 9bc3dfefd4ae3..50efe7c5b7adc 100644
--- a/pkgs/tools/backup/borgbackup/default.nix
+++ b/pkgs/tools/backup/borgbackup/default.nix
@@ -10,18 +10,28 @@
 , zstd
 , installShellFiles
 , nixosTests
+, fetchpatch
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "pyproject";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1zBodEPxvrYCsdcrrjYxj2+WVIGPzcUEWFQOxXnlcmA=";
+    hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U=";
   };
 
+  patches = [
+    (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=";
+    })
+  ];
+
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \