uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,48 @@
{ lib
, stdenv
, python3Packages
, makeWrapper
, coreutils
, iptables
, nettools
, openssh
, procps
}:
python3Packages.buildPythonApplication rec {
pname = "sshuttle";
version = "1.1.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-IfuRvfOStQ5422uNdelbc6ydr9Nh4mV+eE5nRWEhkxU=";
};
patches = [ ./sudo.patch ];
postPatch = ''
substituteInPlace setup.cfg \
--replace '--cov=sshuttle --cov-branch --cov-report=term-missing' ""
'';
nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];
checkInputs = with python3Packages; [ pytestCheckHook ];
postInstall = ''
wrapProgram $out/bin/sshuttle \
--prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \
'';
meta = with lib; {
homepage = "https://github.com/sshuttle/sshuttle/";
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.7, Python 3.5 or later at both ends).
Works with Linux and Mac OS and supports DNS tunneling.
'';
license = licenses.lgpl21;
maintainers = with maintainers; [ domenkozar carlosdagos SuperSandro2000 ];
};
}

View file

@ -0,0 +1,13 @@
diff --git a/sshuttle/client.py b/sshuttle/client.py
index cab5b1c..e89f8a6 100644
--- a/sshuttle/client.py
+++ b/sshuttle/client.py
@@ -192,7 +192,7 @@ class FirewallClient:
self.auto_nets = []
- argvbase = ([sys.executable, sys.argv[0]] +
+ argvbase = ([sys.argv[0]] +
['-v'] * (helpers.verbose or 0) +
['--method', method_name] +
['--firewall'])