diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-17 21:45:43 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-17 21:52:36 +0100 |
| commit | 0ef8fa011f6a16ee1bf33ed5b7ce386290ec91df (patch) | |
| tree | 0fa0917073bb0139b4515275e31c2f3c9a874a87 /pkgs/tools/security/sshuttle | |
| parent | 9e8eba48ab46ecff67dfb27571b9adb0e2602f15 (diff) | |
sshuttle: 0.74 -> 0.76
And back to fetchurl we go: “LookupError: setuptools-scm was unable to detect version for '/tmp/nix-build-.../sshuttle-v0.76-src'. Make sure you're not using GitHub's tarballs (or similar ones), as those don't contain the necessary metadata. Use PyPI's tarballs instead.”
Diffstat (limited to 'pkgs/tools/security/sshuttle')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 831a815e787b0..62d3d2613cc16 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,21 +1,19 @@ -{ stdenv, pythonPackages, fetchFromGitHub, makeWrapper, pandoc +{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: pythonPackages.buildPythonPackage rec { - version = "0.74"; + version = "0.76"; name = "sshuttle-${version}"; - src = fetchFromGitHub { - sha256 = "1mx440wb1clis97nvgx67am9qssa3v11nb9irjzhnx44ygadhfcp"; - rev = "v${version}"; - repo = "sshuttle"; - owner = "sshuttle"; + src = fetchurl { + sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b"; + url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; - nativeBuildInputs = [ makeWrapper pandoc ]; + nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ]; buildInputs = [ coreutils openssh ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; @@ -29,7 +27,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { inherit version; - inherit (src.meta) homepage; + homepage = https://github.com/sshuttle/sshuttle/; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the |