From 08e06e7d223d89a9dee247daab7c505b0e0513ee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 16:30:48 +0200 Subject: [PATCH 1/2] borgbackup: add flokli as maintainer --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac95..acd75941524 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -45,6 +45,6 @@ python3Packages.buildPythonApplication rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx flokli ]; }; } From f3b311af44bee935912f58a38a2344011e3ce78c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 14:13:48 +0200 Subject: [PATCH 2/2] borgbackup: fix ssh binary location Otherwise, borg might be unable to find its location --- pkgs/tools/backup/borg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index acd75941524..7dc6299ef47 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: +{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }: python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; @@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec { export BORG_LZ4_PREFIX="${lz4.dev}" ''; + makeWrapperArgs = [ + ''--prefix PATH ':' "${openssh}/bin"'' + ]; + postInstall = '' make -C docs singlehtml mkdir -p $out/share/doc/borg