From adfeacc547d71e5033966ac658b6e18bb9000a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 1 Feb 2018 10:27:07 +0000
Subject: [PATCH] teleport: use fetchFromGitHub instead of fetchurl

---
 pkgs/servers/teleport/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index ae8ea3317162..0c6a197b1da5 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -1,10 +1,18 @@
 # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
-{ stdenv, buildGoPackage, zip, fetchurl }:
+{ stdenv, buildGoPackage, zip, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "teleport-${version}";
   version = "2.4.0";
 
+  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
+  src = fetchFromGitHub {
+    owner = "gravitational";
+    repo = "teleport";
+    rev = "v${version}";
+    sha256 = "1x4xnqjyb87pzmn2c59fwmzfx1f2k0xhqn2xgki3722qmj2ss846";
+  };
+
   goPackagePath = "github.com/gravitational/teleport";
   subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
   buildInputs = [ zip ];
@@ -23,13 +31,6 @@ buildGoPackage rec {
 
   dontStrip = true;
 
-  # This repo has a private submodule "e" which fetchgit cannot handle
-  # without failing. Using fetchurl instead on the latest tagged release.
-  src = fetchurl {
-    url = "https://github.com/gravitational/teleport/archive/v2.4.0.tar.gz";
-    sha256 = "01qcr6vml3ias3gbkqjnb5fmc6ap1fd5mi52ygn3agafy63jb5rd";
-  };
-
   meta = {
     description = "A SSH CA management suite";
     homepage = "https://gravitational.com/teleport/";