4 files changed, 145 insertions, 2 deletions
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 4ad8eb0dc219..f478b92eec8d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -286,5 +286,95 @@
       "rev": "305f360aee30243660f32600b87c3c1eaa947187",
       "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
     }
+  },
+  {
+    "goPackagePath": "github.com/rcrowley/go-metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/rcrowley/go-metrics",
+      "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+      "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/inconshreveable/go-vhost",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/go-vhost",
+      "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c",
+      "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"
+    }
+  },
+  {
+    "goPackagePath": "code.google.com/p/log4go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ccpaging/log4go",
+      "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8",
+      "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/daviddengcn/go-colortext",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/daviddengcn/go-colortext",
+      "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57",
+      "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/yaml.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-yaml/yaml",
+      "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a",
+      "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/inconshreveable/mousetrap",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/mousetrap",
+      "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa",
+      "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nsf/termbox-go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/nsf/termbox-go",
+      "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b",
+      "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/inconshreveable/go-update.v0",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/go-update",
+      "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066",
+      "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kardianos/osext",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kardianos/osext",
+      "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+      "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kr/binarydist",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/binarydist",
+      "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
+      "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix
new file mode 100644
index 000000000000..5344a4ec46bc
--- /dev/null
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -0,0 +1,34 @@
+# This file was generated by go2nix.
+{ stdenv, lib, pkgconfig, goPackages, fetchFromGitHub }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "ngrok-${version}";
+  version = "1.7.1";
+  rev = "${version}";
+
+  goPackagePath = "ngrok";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "inconshreveable";
+    repo = "ngrok";
+    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ go-bindata ];
+
+  preConfigure = ''
+    sed -e '/jteeuwen\/go-bindata/d' \
+        -e '/export GOPATH/d' \
+        -e 's/go get/#go get/' \
+        -e 's|bin/go-bindata|go-bindata|' -i Makefile
+    make assets BUILDTAGS=release
+    export sourceRoot=$sourceRoot/src/ngrok
+  '';
+
+  buildFlags = [ "-tags release" ];
+}
diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json
new file mode 100644
index 000000000000..61dfbf337266
--- /dev/null
+++ b/pkgs/tools/networking/ngrok/deps.json
@@ -0,0 +1,19 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "gopkg.in/yaml.v1",
+      "github.com/gorilla/websocket",
+      "github.com/rcrowley/go-metrics",
+      "github.com/inconshreveable/go-vhost",
+      "code.google.com/p/log4go",
+      "github.com/daviddengcn/go-colortext",
+      "gopkg.in/yaml.v1",
+      "github.com/inconshreveable/mousetrap",
+      "github.com/nsf/termbox-go",
+      "gopkg.in/inconshreveable/go-update.v0",
+      "github.com/kardianos/osext",
+      "github.com/kr/binarydist"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4482e11e3de4..3d5b68057d03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2607,7 +2607,7 @@ in
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; };
+  ngrok = (callPackage ../tools/networking/ngrok { }).bin;
 
   noip = callPackage ../tools/networking/noip { };