diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-03-28 12:29:40 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-03-28 12:35:51 +0200 |
| commit | 87c0118ab1873a48f584566daf05ce6d691e8e2b (patch) | |
| tree | cd315af76fde4b4cf74c1382213b94cc846e1bf1 /pkgs/tools/security/sshuttle | |
| parent | a692bd698dc6eb6755aab2c181dc91f3f4d36d3b (diff) | |
sshuttle: 1.0.5 -> 1.1.0, add SuperSandro2000 as maintainer
Diffstat (limited to 'pkgs/tools/security/sshuttle')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/security/sshuttle/sudo.patch | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 959712488a207..4b4bbd3788b3e 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -11,11 +11,11 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "1.0.5"; + version = "1.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd"; + sha256 = "sha256-IfuRvfOStQ5422uNdelbc6ydr9Nh4mV+eE5nRWEhkxU="; }; patches = [ ./sudo.patch ]; @@ -27,9 +27,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - propagatedBuildInputs = [ python3Packages.psutil ]; - - checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; postInstall = '' wrapProgram $out/bin/sshuttle \ @@ -45,6 +43,6 @@ python3Packages.buildPythonApplication rec { Works with Linux and Mac OS and supports DNS tunneling. ''; license = licenses.lgpl21; - maintainers = with maintainers; [ domenkozar carlosdagos ]; + maintainers = with maintainers; [ domenkozar carlosdagos SuperSandro2000 ]; }; } diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/tools/security/sshuttle/sudo.patch index 6e8634bd4a1f8..d00aab087948d 100644 --- a/pkgs/tools/security/sshuttle/sudo.patch +++ b/pkgs/tools/security/sshuttle/sudo.patch @@ -5,7 +5,7 @@ index cab5b1c..e89f8a6 100644 @@ -192,7 +192,7 @@ class FirewallClient: self.auto_nets = [] - python_path = os.path.dirname(os.path.dirname(__file__)) + - argvbase = ([sys.executable, sys.argv[0]] + + argvbase = ([sys.argv[0]] + ['-v'] * (helpers.verbose or 0) + |