From 4a810fb31d3828091ce29cbffb52cfdf96aa82ed Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 10 Sep 2017 16:25:51 +0200
Subject: [PATCH] borgbackup: fix build with python36

cffi fails to build with python34.
---
 pkgs/tools/backup/borg/default.nix | 3 +++
 pkgs/top-level/all-packages.nix    | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index dcea9c9435b..19495b6e1df 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -37,6 +37,9 @@ python3Packages.buildPythonApplication rec {
     cp -R docs/_build/man $out/share/man/man1
   '';
 
+  # tests fail due to missing test command in nix_run_setup.py
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
     homepage = https://borgbackup.github.io/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e772f08f6f1..8b0cb6e77cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -740,9 +740,7 @@ with pkgs;
 
   bubblewrap = callPackage ../tools/admin/bubblewrap { };
 
-  borgbackup = callPackage ../tools/backup/borg {
-    python3Packages = python34Packages;
-  };
+  borgbackup = callPackage ../tools/backup/borg { };
 
   boomerang = callPackage ../development/tools/boomerang { };