diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 33a3420d5b6..3d54517796c 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -493,5 +493,14 @@
       "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
       "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
     }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/iochan",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/iochan",
+      "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
+      "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
new file mode 100644
index 00000000000..7b58bafcd62
--- /dev/null
+++ b/pkgs/development/tools/gox/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gox-${version}";
+  version = "20140904-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
+
+  
+  goPackagePath = "github.com/mitchellh/gox";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mitchellh/gox";
+    sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json
new file mode 100644
index 00000000000..288b2d9f714
--- /dev/null
+++ b/pkgs/development/tools/gox/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mitchellh/iochan"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36a20ff3ac6..9406c7120b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4553,7 +4553,7 @@ in
 
   go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
 
-  gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
+  gox = (callPackage ../development/tools/gox { }).bin;
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1d19bb945da..a435283abeb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1336,19 +1336,6 @@ let
     buildInputs = [ opencontainers.runc ];
   };
 
-  gox = buildGoPackage rec {
-    rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
-    name = "gox-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/gox";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "mitchellh";
-      repo   = "gox";
-      sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
-    };
-    buildInputs = [ iochan ];
-  };
-
   gozim = buildFromGitHub {
     rev    = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14";
     version = "2016-01-15";
@@ -2152,13 +2139,6 @@ let
     sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
   };
 
-  iochan = buildFromGitHub {
-    rev    = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-    owner  = "mitchellh";
-    repo   = "iochan";
-    sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
-  };
-
   ipfs = buildFromGitHub{
     rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
     version = "2016-01-12";