about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2023-06-21 14:58:13 +0200
committerGitHub <noreply@github.com>2023-06-21 14:58:13 +0200
commit3cd360a2de66c1f17099b2edffdf1842c1266abd (patch)
tree9be967dc050329ebb06bf38c59ed6b4ad1dca6d6
parent13acdc21b762429b4c5c4bbe5a97bb5fa07a0175 (diff)
parentcf66aa9b55ce0fb9e3174c4089224cc12f046432 (diff)
downloadnixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar.gz
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar.bz2
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar.lz
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar.xz
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.tar.zst
nixlib-3cd360a2de66c1f17099b2edffdf1842c1266abd.zip
Merge pull request #223318 from dotlambda/borgbackup-1.2.4
borgbackup: 1.2.3 -> 1.2.4
-rw-r--r--pkgs/tools/backup/borgbackup/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix
index 5aaffabd9325..5104dfd37512 100644
--- a/pkgs/tools/backup/borgbackup/default.nix
+++ b/pkgs/tools/backup/borgbackup/default.nix
@@ -11,29 +11,19 @@
 , zstd
 , installShellFiles
 , nixosTests
-, fetchpatch
 , fetchPypi
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.2.3";
+  version = "1.2.4";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U=";
+    hash = "sha256-pL1U6UaegbejCmcRQjEVq8gY2c2ETsscoOYQS8U3Tag=";
   };
 
-  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/fe3775cf8078c18d8fe39a7f42e52e96d3ecd054.patch";
-      hash = "sha256-gdssHfhdkmRfSAOeXsq9Afg7xqGM3NLIq4QnzmPBhw4=";
-    })
-  ];
-
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \
@@ -125,6 +115,7 @@ python3.pkgs.buildPythonApplication rec {
   outputs = [ "out" "doc" "man" ];
 
   meta = with lib; {
+    changelog = "https://github.com/borgbackup/borg/blob/${version}/docs/changes.rst";
     description = "Deduplicating archiver with compression and encryption";
     homepage = "https://www.borgbackup.org";
     license = licenses.bsd3;