From 0ef8fa011f6a16ee1bf33ed5b7ce386290ec91df Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 Jan 2016 21:45:43 +0100
Subject: [PATCH] sshuttle: 0.74 -> 0.76
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.”
---
 pkgs/tools/security/sshuttle/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 831a815e787b..62d3d2613cc1 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