Unverified Commit 3cd360a2 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #223318 from dotlambda/borgbackup-1.2.4 

borgbackup: 1.2.3 -> 1.2.4
parents 13acdc21 cf66aa9b

pkgs/tools/backup/borgbackup/default.nix

+3 −12
Original line number Diff line number Diff line
@@ -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;