diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-03-28 20:52:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 20:52:36 +0200 |
| commit | f7ccecfe39c4ffb339ef479661e9e1945b7bed15 (patch) | |
| tree | a18feaf8bddf75287d89e458b857955655ad9625 /pkgs | |
| parent | 9b6d194b269ab86fdd9c43a13de0ad1a027cf345 (diff) | |
| parent | 87c0118ab1873a48f584566daf05ce6d691e8e2b (diff) | |
| download | nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar.gz nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar.bz2 nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar.lz nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar.xz nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.tar.zst nixlib-f7ccecfe39c4ffb339ef479661e9e1945b7bed15.zip | |
Merge pull request #166061 from SuperSandro2000/sshuttle
sshuttle: 1.0.5 -> 1.1.0, add SuperSandro2000 as maintainer
Diffstat (limited to 'pkgs')
| -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 959712488a20..4b4bbd3788b3 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 6e8634bd4a1f..d00aab087948 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) + |