public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sshuttle: upstream fixed tests

Browse Source
This commit is contained in:
Jörg Thalheim 2018-03-16 09:58:03 +00:00
parent 7f4b879f12
commit 01014713bf
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/security/sshuttle/default.nix
View File

@ -16,6 +16,11 @@ python3Packages.buildPythonApplication rec {
url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch"; url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch";
sha256 = "0sqcc6kj53wlas2d3klbyilhns6vakzwbbp8y7j9wlmbnc530pks"; 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; 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 ]; 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 postInstall = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
in '' in ''