diff options
| author | Carlos D <carlos.dagostino@gmail.com> | 2019-03-06 11:37:33 +1100 |
|---|---|---|
| committer | Carlos D <carlos.dagostino@gmail.com> | 2019-03-06 11:37:33 +1100 |
| commit | 5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c (patch) | |
| tree | 3cd41e0abcb41b4195d1108d70a473518a247cbc /pkgs/tools/security/sshuttle | |
| parent | 7e8f04ab05d1cac402235c7ad33365262e8b74d8 (diff) | |
| download | nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar.gz nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar.bz2 nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar.lz nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar.xz nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.tar.zst nixpkgs-5bcf9e29ca2656ca67a95fbc368bb5dd8f65133c.zip | |
sshuttle: 0.78.4 -> 0.78.5
Diffstat (limited to 'pkgs/tools/security/sshuttle')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/security/sshuttle/sudo.patch | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index c701b9dba73..6a9bd05d820 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,23 +1,23 @@ -{ stdenv, python3Packages, fetchurl, makeWrapper, pandoc +{ stdenv, python3Packages, fetchurl, makeWrapper , coreutils, iptables, nettools, openssh, procps, fetchpatch }: python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.78.4"; + version = "0.78.5"; src = fetchurl { - sha256 = "0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h"; + sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"; url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; - nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.hostPlatform.system != "i686-linux") pandoc; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ]; buildInputs = [ coreutils openssh procps nettools ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables ]; - checkInputs = with python3Packages; [ mock pytest pytestrunner ]; + checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; postInstall = let mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); @@ -31,11 +31,11 @@ python3Packages.buildPythonApplication rec { description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the - target network (though it does require Python 2 at both ends). + target network (though it does require Python 2.7, Python 3.5 or later at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar carlosdagos ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/tools/security/sshuttle/sudo.patch index 761bfaef852..6e8634bd4a1 100644 --- a/pkgs/tools/security/sshuttle/sudo.patch +++ b/pkgs/tools/security/sshuttle/sudo.patch @@ -1,9 +1,9 @@ diff --git a/sshuttle/client.py b/sshuttle/client.py -index 7a7b6d7..8dde615 100644 +index cab5b1c..e89f8a6 100644 --- a/sshuttle/client.py +++ b/sshuttle/client.py -@@ -158,7 +158,7 @@ class FirewallClient: - def __init__(self, method_name): +@@ -192,7 +192,7 @@ class FirewallClient: + self.auto_nets = [] python_path = os.path.dirname(os.path.dirname(__file__)) - argvbase = ([sys.executable, sys.argv[0]] + |