about summary refs log tree commit diff
path: root/pkgs/tools/backup/borg
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-12-31 20:44:47 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-12-31 21:58:41 +0100
commit5195e0d70fd648e4d3e2c33dbe95537b4b480b81 (patch)
treeea50dbc6484da8928587a42c8da73a6649098481 /pkgs/tools/backup/borg
parent61027b7fcea9aef25b5a61700ccb21788365645f (diff)
downloadnixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar.gz
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar.bz2
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar.lz
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar.xz
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.tar.zst
nixlib-5195e0d70fd648e4d3e2c33dbe95537b4b480b81.zip
borgbackup: cleanup inputs
tox/detox are removed; they are used to test multiple python
implementations in parallel, which isn't really appropriate for a Nix
install check.  Also, because these were added to the propagated build
inputs, lots of unnecessary stuff ended up in the resulting closure.
Note that removing tox does not imply tests are not run; they never were
to begin with; this is a separate issue.

This fixes https://github.com/NixOS/nixpkgs/issues/16171

Also, for "correctness" ordinary build-time dependencies are added to
`buildInputs`; only inputs that are to be added to the python path are
added to `propagatedBuildInputs`.
Diffstat (limited to 'pkgs/tools/backup/borg')
-rw-r--r--pkgs/tools/backup/borg/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 09c2dddd5159..b27d5c834b1b 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -15,11 +15,12 @@ python3Packages.buildPythonApplication rec {
     # For building documentation:
     sphinx sphinx_rtd_theme
   ];
-  propagatedBuildInputs = [
-    acl lz4 openssl
-  ] ++ (with python3Packages; [
-    cython msgpack llfuse tox detox setuptools_scm
-  ]);
+  buildInputs = [
+    acl lz4 openssl python3Packages.setuptools_scm
+  ];
+  propagatedBuildInputs = with python3Packages; [
+    cython llfuse msgpack
+  ];
 
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl.dev}"