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

sshuttle: 0.74 -> 0.76

Browse Source 
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.”
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-17 21:45:43 +01:00
parent 9e8eba48ab
commit 0ef8fa011f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,19 @@
{ stdenv, pythonPackages, fetchFromGitHub, makeWrapper, pandoc { stdenv, pythonPackages, fetchurl, makeWrapper, pandoc
, coreutils, iptables, nettools, openssh, procps }: , coreutils, iptables, nettools, openssh, procps }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
version = "0.74"; version = "0.76";
name = "sshuttle-${version}"; name = "sshuttle-${version}";
src = fetchFromGitHub { src = fetchurl {
sha256 = "1mx440wb1clis97nvgx67am9qssa3v11nb9irjzhnx44ygadhfcp"; sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
rev = "v${version}"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
repo = "sshuttle";
owner = "sshuttle";
}; };
patches = [ ./sudo.patch ]; patches = [ ./sudo.patch ];
propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ];
nativeBuildInputs = [ makeWrapper pandoc ]; nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ];
buildInputs = buildInputs =
[ coreutils openssh ] ++ [ coreutils openssh ] ++
stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
@ -29,7 +27,7 @@ pythonPackages.buildPythonPackage rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit version; inherit version;
inherit (src.meta) homepage; homepage = https://github.com/sshuttle/sshuttle/;
description = "Transparent proxy server that works as a poor man's VPN"; description = "Transparent proxy server that works as a poor man's VPN";
longDescription = '' longDescription = ''
Forward connections over SSH, without requiring administrator access to the Forward connections over SSH, without requiring administrator access to the