From a1cec555e8efe5ababd0bf122959e657cf300eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Wed, 8 Jul 2020 17:12:06 -0400
Subject: [PATCH 1/4] telepresence: 0.104 -> 0.105

---
 pkgs/tools/networking/telepresence/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 216a2863f84..be01cf5606e 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -17,10 +17,10 @@ let
   });
 in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
-  version = "0.104";
+  version = "0.105";
 
   src = fetchFromGitHub {
-    owner = "datawire";
+    owner = "telepresenceio";
     repo = "telepresence";
     rev = version;
     sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg";

From 196b90a3283b59087245f61f37fe1f4e3d281105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Wed, 8 Jul 2020 17:19:25 -0400
Subject: [PATCH 2/4] telepresence: fix build by setting a version for
 setuptools-scm

---
 .../tools/networking/telepresence/default.nix | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index be01cf5606e..4fe06e7f405 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -1,20 +1,29 @@
-{ lib, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git
+{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git
 , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils
 , iptables, bash }:
 
 let
-  sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
-    src = fetchgit {
-      url = "https://github.com/datawire/sshuttle.git";
-      rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
-      sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
-    };
+  sshuttle-telepresence = 
+    let
+      sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
+    in
+      lib.overrideDerivation sshuttle (p: {
+        src = fetchFromGitHub {
+          owner = "datawire";
+          repo = "sshuttle";
+          rev = sshuttleTelepresenceRev;
+          sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh";
+        };
 
-    nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
+        nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
 
-    postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
-    postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
-  });
+        preBuild = ''
+          export SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}"
+        '';
+
+        postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
+        postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
+      });
 in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
   version = "0.105";

From 1498bccbf08de9b94570325f9e461589fb2c2de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Wed, 8 Jul 2020 23:16:38 +0100
Subject: [PATCH 3/4] Update pkgs/tools/networking/telepresence/default.nix

---
 pkgs/tools/networking/telepresence/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 4fe06e7f405..e0118bf0bb8 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -15,8 +15,6 @@ let
           sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh";
         };
 
-        nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
-
         preBuild = ''
           export SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}"
         '';

From 258bebd31de6e6322ed7a1abeb879f57323c2471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Wed, 8 Jul 2020 23:30:04 +0100
Subject: [PATCH 4/4] Update pkgs/tools/networking/telepresence/default.nix

---
 pkgs/tools/networking/telepresence/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index e0118bf0bb8..285a3764e03 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -15,9 +15,7 @@ let
           sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh";
         };
 
-        preBuild = ''
-          export SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}"
-        '';
+        SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}";
 
         postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
         postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";