alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #166061 from SuperSandro2000/sshuttle

Browse source 
sshuttle: 1.0.5 -> 1.1.0, add SuperSandro2000 as maintainer
This commit is contained in:
Fabian Affolter 2022-03-28 20:52:36 +02:00 committed by GitHub
parent 9b6d194b26 87c0118ab1
commit f7ccecfe39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/security/sshuttle/default.nix
View file

@ -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 ];
};
}

2
pkgs/tools/security/sshuttle/sudo.patch
View file

@ -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) +