From f161fe06b86508f5ac31b9cce768394efc421db5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 14 Mar 2018 09:13:38 +0000 Subject: [PATCH 1/2] sshuttle: fix build on i686-linux --- pkgs/tools/security/sshuttle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 8674de1fcee..f01a1f00a6d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { }) ]; - nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc; buildInputs = [ coreutils openssh ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; From ca1921eb5bd8edc941be6abc7e971baf3a24fba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 14 Mar 2018 09:32:17 +0000 Subject: [PATCH 2/2] shuttle: disable buggy test on darwin --- pkgs/tools/security/sshuttle/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index f01a1f00a6d..d2c194308e1 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec { # 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 ''