diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 8e6d3d51e7a..32044808f86 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -13,8 +13,8 @@
     "fetch": {
       "type": "git",
       "url": "https://gopkg.in/fsnotify.v1",
-      "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
-      "sha256": "1ljkdzbj9ll3jx1dggslzpm475prvsg22hdpxnb6kxqyk3z8dqdj"
+      "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0",
+      "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"
     }
   },
   {
@@ -670,8 +670,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/bitly/go-simplejson",
-      "rev": "fc395a5db941cf38922b1ccbc083640cd76fe4bc",
-      "sha256": "14lhdmzlc1pza10q8g957zqnc4kfqvamw90mj1ndj6s285h80m54"
+      "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a",
+      "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"
     }
   },
   {
@@ -727,5 +727,41 @@
       "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52",
       "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"
     }
+  },
+  {
+    "goPackagePath": "google.golang.org/api",
+    "fetch": {
+      "type": "git",
+      "url": "https://code.googlesource.com/google-api-go-client",
+      "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80",
+      "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"
+    }
+  },
+  {
+    "goPackagePath": "google.golang.org/cloud",
+    "fetch": {
+      "type": "git",
+      "url": "https://code.googlesource.com/gocloud",
+      "rev": "6335269abf9002cf5a84613c13cda6010842b834",
+      "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/oauth2",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/oauth2",
+      "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a",
+      "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/18F/hmacauth",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/18F/hmacauth",
+      "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd",
+      "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"
+    }
   }
 ]
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
new file mode 100644
index 00000000000..9381db95d77
--- /dev/null
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "oauth2_proxy-${version}";
+  version = "20160120-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
+  
+  goPackagePath = "github.com/bitly/oauth2_proxy";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/bitly/oauth2_proxy";
+    sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json
new file mode 100644
index 00000000000..ac8ac3d8ca2
--- /dev/null
+++ b/pkgs/servers/oauth2_proxy/deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "google.golang.org/api",
+      "google.golang.org/cloud",
+      "golang.org/x/oauth2",
+      "github.com/18F/hmacauth",
+      "github.com/mreiferson/go-options",
+      "github.com/BurntSushi/toml",
+      "github.com/bitly/go-simplejson",
+      "golang.org/x/net",
+      "gopkg.in/fsnotify.v1"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5464e581794..ea012bbc933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10033,7 +10033,7 @@ in
 
   nsq = callPackage ../servers/nsq { };
 
-  oauth2_proxy = goPackages.oauth2_proxy.bin // { outputs = [ "bin" ]; };
+  oauth2_proxy = callPackage ../servers/oauth2_proxy { };
 
   openpts = callPackage ../servers/openpts { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 63e67a9c972..fe3cc14926b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2496,21 +2496,6 @@ let
     sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
   };
 
-  oauth2_proxy = buildGoPackage {
-    name = "oauth2_proxy";
-    goPackagePath = "github.com/bitly/oauth2_proxy";
-    src = fetchFromGitHub {
-      rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
-      owner = "bitly";
-      repo = "oauth2_proxy";
-      sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
-    };
-    buildInputs = [
-      go-assert go-options go-simplejson toml fsnotify.v1 oauth2
-      google-api-go-client hmacauth
-    ];
-  };
-
   objx = buildFromGitHub {
     rev    = "cbeaeb16a013161a98496fad62933b1d21786672";
     owner  = "stretchr";