From 256d14793111bee1184cbc82d7774d8ed50d6c2b Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Sun, 14 Jan 2018 03:04:08 -0500
Subject: [PATCH 1/2] teleport: init at v2.4.0

---
 pkgs/servers/teleport/default.nix | 40 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/servers/teleport/default.nix

diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
new file mode 100644
index 00000000000..ae8ea331716
--- /dev/null
+++ b/pkgs/servers/teleport/default.nix
@@ -0,0 +1,40 @@
+# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
+{ stdenv, buildGoPackage, zip, fetchurl }:
+
+buildGoPackage rec {
+  name = "teleport-${version}";
+  version = "2.4.0";
+
+  goPackagePath = "github.com/gravitational/teleport";
+  subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
+  buildInputs = [ zip ];
+  postBuild = ''
+    pushd .
+    cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
+    mkdir -p build
+    echo "making webassets"
+    make build/webassets.zip
+    cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport
+    rm -fr build/webassets.zip
+    cd $NIX_BUILD_TOP/go/bin
+    zip -q -A teleport
+    popd
+    '';
+
+  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/";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.tomberek ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2d5bb5d22e..d8ea449d773 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4783,6 +4783,8 @@ with pkgs;
 
   telegraf = callPackage ../servers/monitoring/telegraf { };
 
+  teleport = callPackage ../servers/teleport {};
+
   telepresence = callPackage ../tools/networking/telepresence { };
 
   texmacs = callPackage ../applications/editors/texmacs {

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 2/2] 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 ae8ea331716..0c6a197b1da 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/";