Unverified Commit dd4baeff authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #207631 from mweinelt/borgbackup-1.2.3

parents 40818471 e7fb320d

pkgs/development/libraries/libb2/default.nix

+14 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:

{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, libtool

, pkg-config

}:



stdenv.mkDerivation rec {

  pname = "libb2";
@@ -7,18 +13,19 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "BLAKE2";

    repo = "libb2";

    rev = "v${version}";

    rev = "refs/tags/v${version}";

    sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya";

  };



  preConfigure = ''

    patchShebangs autogen.sh

    ./autogen.sh

  '';

  nativeBuildInputs = [

    autoreconfHook

    libtool

    pkg-config

  ];



  configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";



  nativeBuildInputs = [ autoconf automake libtool pkg-config ];

  enableParallelBuilding = true;



  doCheck = true;

pkgs/tools/backup/borgbackup/default.nix

+15 −9
Original line number Diff line number Diff line
@@ -7,21 +7,32 @@ 
, openssh

, openssl

, python3

, xxHash

, 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 \
@@ -31,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { 
  nativeBuildInputs = with python3.pkgs; [

    cython

    setuptools-scm

    pkgconfig



    # docs

    sphinxHook
@@ -45,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { 
  buildInputs = [

    libb2

    lz4

    xxHash

    zstd

    openssl

  ] ++ lib.optionals stdenv.isLinux [
@@ -57,13 +70,6 @@ python3.pkgs.buildPythonApplication rec { 
    (if stdenv.isLinux then pyfuse3 else llfuse)

  ];



  preConfigure = ''

    export BORG_OPENSSL_PREFIX="${openssl.dev}"

    export BORG_LZ4_PREFIX="${lz4.dev}"

    export BORG_LIBB2_PREFIX="${libb2}"

    export BORG_LIBZSTD_PREFIX="${zstd.dev}"

  '';



  makeWrapperArgs = [

    ''--prefix PATH ':' "${openssh}/bin"''

  ];