diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-03-16 09:58:03 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-03-16 09:59:24 +0000 |
| commit | 01014713bfab184ab031b735dc636172db0142ca (patch) | |
| tree | ed4f9b01c8ffa34415ff6cb3100a1935c222a028 /pkgs/tools/security/sshuttle | |
| parent | 7f4b879f125c23317206f79e7933586182f78276 (diff) | |
| download | nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar.gz nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar.bz2 nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar.lz nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar.xz nixpkgs-01014713bfab184ab031b735dc636172db0142ca.tar.zst nixpkgs-01014713bfab184ab031b735dc636172db0142ca.zip | |
sshuttle: upstream fixed tests
Diffstat (limited to 'pkgs/tools/security/sshuttle')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index d2c194308e1..d344f95573d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -16,6 +16,11 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch"; sha256 = "0sqcc6kj53wlas2d3klbyilhns6vakzwbbp8y7j9wlmbnc530pks"; }) + # fix macos patch + (fetchpatch { + url = "https://github.com/sshuttle/sshuttle/commit/884bd6deb0b699a5648bb1c7bdfbc7be8ea0e7df.patch"; + sha256 = "1nn0wx0rckxl9yzw9dxjji44zw4xqz7ws4qwjdvfn48w1f786lmz"; + }) ]; nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc; @@ -25,14 +30,6 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ mock pytest pytestrunner ]; - # Tests only run with Python 3. Server-side Python 2 still works if client - # uses Python 3, so it should be fine. - doCheck = true; - - checkPhase = '' - py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}" - ''; - postInstall = let mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); in '' |