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: 10c732319300
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ad8cc1300d8
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Sep 24, 2017

  1. Fix tests for Sshuttle on Darwin.

    @berdario
    berdario committed Sep 24, 2017
    Copy the full SHA
    7055b4a View commit details

Commits on Sep 26, 2017

  1. Fetch sshuttle-darwin patch from github

    @berdario
    berdario committed Sep 26, 2017
    Copy the full SHA
    08d05f1 View commit details

  2. Merge pull request #29757 from berdario/sshuttle-darwin 

    Fix tests for Sshuttle on Darwin.
    @LnL7
    LnL7 authored Sep 26, 2017
    Copy the full SHA
    3ad8cc1 View commit details
Showing with 10 additions and 4 deletions.
  1. +10 −4 pkgs/tools/security/sshuttle/default.nix
14 changes: 10 additions & 4 deletions pkgs/tools/security/sshuttle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";