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

sshuttle: 0.78.0 -> 0.78.3, use py3 for tests to succeed

This commit is contained in:
Aristid Breitkreuz 2017-07-09 09:59:08 +02:00
parent ee5a17514c
commit 19dfb63036
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,29 @@
{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc { stdenv, python3Packages, fetchurl, makeWrapper, pandoc
, coreutils, iptables, nettools, openssh, procps }: , coreutils, iptables, nettools, openssh, procps }:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "sshuttle-${version}"; name = "sshuttle-${version}";
version = "0.78.0"; version = "0.78.3";
src = fetchurl { src = fetchurl {
sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; sha256 = "12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa";
url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
}; };
patches = [ ./sudo.patch ]; patches = [ ./sudo.patch ];
propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; propagatedBuildInputs = with python3Packages; [ mock pytest ];
nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ]; nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
buildInputs = buildInputs =
[ coreutils openssh ] ++ [ coreutils openssh ] ++
stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
checkInputs = with python3Packages; [ 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;
postInstall = let postInstall = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
in '' in ''