diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-26 23:09:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 23:09:57 +0200 |
| commit | 3ad8cc1300d88f16baa3671cf8c0711407bc8fbb (patch) | |
| tree | 5b2e10c7e389b3d44d27e56488af1d20580cad4e /pkgs | |
| parent | 10c732319300f851ca7af5eda02ef943d84ebef7 (diff) | |
| parent | 08d05f1ef5fff39c89e1a53b53e83bfc119cc18b (diff) | |
| download | nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar.gz nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar.bz2 nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar.lz nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar.xz nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.tar.zst nixlib-3ad8cc1300d88f16baa3671cf8c0711407bc8fbb.zip | |
Merge pull request #29757 from berdario/sshuttle-darwin
Fix tests for Sshuttle on Darwin.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 2d663175ec9d..960d11521a74 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,6 +1,6 @@ { stdenv, python3Packages, fetchurl, makeWrapper, pandoc -, coreutils, iptables, nettools, openssh, procps }: - +, coreutils, iptables, nettools, openssh, procps, fetchpatch }: + python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; version = "0.78.3"; @@ -10,7 +10,13 @@ python3Packages.buildPythonApplication rec { url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; - patches = [ ./sudo.patch ]; + patches = [ + ./sudo.patch + (fetchpatch { + url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch"; + sha256 = "0sqcc6kj53wlas2d3klbyilhns6vakzwbbp8y7j9wlmbnc530pks"; + }) + ]; nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; buildInputs = @@ -29,7 +35,7 @@ python3Packages.buildPythonApplication rec { wrapProgram $out/bin/sshuttle \ --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \ ''; - + meta = with stdenv.lib; { homepage = https://github.com/sshuttle/sshuttle/; description = "Transparent proxy server that works as a poor man's VPN"; |