diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-18 00:23:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 00:23:12 +0200 |
commit | 3411632976f087a4348b21d2e7e6b87efe8708ab (patch) | |
tree | a75ac2cc7b60076b99d0adfd3129e4939c9deda0 /pkgs | |
parent | ab65de76bf3a6d31bc5e98ad6286d1c955c2a607 (diff) | |
parent | 0e4f71d8a8c130f1f49dc1776aed1252a6425a94 (diff) | |
download | nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar.gz nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar.bz2 nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar.lz nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar.xz nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.tar.zst nixpkgs-3411632976f087a4348b21d2e7e6b87efe8708ab.zip |
Merge pull request #130496 from SuperSandro2000/sshuttle
sshuttle: format, cleanup, remove extra test dependencies
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 9fd57c82e88..eec82712c8c 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , python3Packages , makeWrapper , coreutils @@ -19,15 +20,18 @@ python3Packages.buildPythonApplication rec { patches = [ ./sudo.patch ]; - nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace '--cov=sshuttle --cov-branch --cov-report=term-missing' "" + ''; - checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { @@ -40,6 +44,5 @@ python3Packages.buildPythonApplication rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar carlosdagos ]; - platforms = platforms.unix; }; } |