summary refs log tree commit diff
path: root/pkgs/tools/security/sshuttle
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-03-25 23:01:31 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-03-26 17:40:55 -0500
commitce8ce600ae41d3899e4a556fa9ff8a1a34374063 (patch)
tree3ea6538af9f648999a7a68cb44818c52f33963c6 /pkgs/tools/security/sshuttle
parent675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 (diff)
downloadnixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.gz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.bz2
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.lz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.xz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.zst
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.zip
unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
Diffstat (limited to 'pkgs/tools/security/sshuttle')
-rw-r--r--pkgs/tools/security/sshuttle/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index d344f95573d..c3bf4f69a46 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
   buildInputs =
-    [ coreutils openssh ] ++
-    stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
+    [ coreutils openssh procps nettools ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ iptables ];
 
   checkInputs = with python3Packages; [ mock pytest pytestrunner ];