Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de22967b5e7e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 224ad7d5b5f2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 6, 2019

  1. sshuttle: 0.78.4 -> 0.78.5

    @carlosdagos
    carlosdagos committed Mar 6, 2019
    Copy the full SHA
    5bcf9e2 View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56930 from carlosdagos/sshuttle-0.78.5 

    sshuttle: 0.78.4 -> 0.78.5
    @ryantm
    ryantm authored Mar 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    224ad7d View commit details
Showing with 10 additions and 10 deletions.
  1. +7 −7 pkgs/tools/security/sshuttle/default.nix
  2. +3 −3 pkgs/tools/security/sshuttle/sudo.patch
14 changes: 7 additions & 7 deletions pkgs/tools/security/sshuttle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
6 changes: 3 additions & 3 deletions pkgs/tools/security/sshuttle/sudo.patch
View file
Original file line number Diff line number Diff line change
@@ -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]] +