diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-10 16:25:51 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-10 16:27:12 +0200 |
| commit | 4a810fb31d3828091ce29cbffb52cfdf96aa82ed (patch) | |
| tree | 0f777adfb32cf7a4a8d7366a422809c86c24e465 | |
| parent | 345e57092111c408935f5fdaf8dffc39efaadbbc (diff) | |
borgbackup: fix build with python36
cffi fails to build with python34.
| -rw-r--r-- | pkgs/tools/backup/borg/default.nix | 3 | ||||
| -rw-r--r-- | 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 dcea9c9435b99..19495b6e1df67 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 e772f08f6f19e..8b0cb6e77cd4c 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 { }; |