diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
deleted file mode 100644
index a7b77b8802a0..000000000000
--- a/pkgs/servers/nsq/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, goPackages, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.2.28";
-  name = "nsq-${version}";
-  goPackagePath = "github.com/bitly/nsq";
-  src = fetchFromGitHub {
-    owner = "bitly";
-    repo = "nsq";
-    rev = "v${version}";
-    sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx";
-  };
-
-  subPackages = [ "nsqadmin" ] ++
-                map (x: "apps/"+x) [ "nsq_pubsub" "nsq_stat" "nsq_tail"
-                                     "nsq_to_file" "nsq_to_http" "nsq_to_nsq"
-                                     "nsqd" "nsqlookupd" ];
-
-  buildInputs = [ go-nsq go-options toml perks go-hostpool ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A realtime distributed messaging platform";
-    homepage = http://nsq.io/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 018793fbe299..bdf365fa1ba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9108,7 +9108,7 @@ let
 
   nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
-  nsq = callPackage ../servers/nsq { };
+  nsq = pkgs.goPackages.nsq.bin // { outputs = [ "bin" ]; };
 
   openpts = callPackage ../servers/openpts { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1c53e986651b..1343bef2dec0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1075,10 +1075,11 @@ let
   };
 
   go-hostpool = buildFromGitHub {
-    rev    = "fed86fae5cacdc77e7399937e2f8836563620a2e";
+    rev    = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
+    date   = "2015-03-31";
     owner  = "bitly";
     repo   = "go-hostpool";
-    sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44";
+    sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
   };
 
   go-ini = buildFromGitHub {
@@ -1169,24 +1170,21 @@ let
     sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
   };
 
-  go-nsq = buildGoPackage rec {
-    rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0";
-    name = "go-nsq-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bitly/go-nsq";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bitly";
-      repo = "go-nsq";
-      sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p";
-    };
+  go-nsq = buildFromGitHub {
+    rev = "v1.0.4";
+    owner = "nsqio";
+    repo = "go-nsq";
+    sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46";
     propagatedBuildInputs = [ go-simplejson go-snappystream ];
+    goPackageAliases = [ "github.com/bitly/go-nsq" ];
   };
 
   go-options = buildFromGitHub {
-    rev    = "896a539cd709f4f39d787562d1583c016ce7517e";
+    rev    = "7c174072188d0cfbe6f01bb457626abb22bdff52";
+    date   = "2014-12-20";
     owner  = "mreiferson";
     repo   = "go-options";
-    sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17";
+    sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
   };
 
   go-querystring = buildFromGitHub {
@@ -1235,22 +1233,19 @@ let
   };
 
   go-simplejson = buildFromGitHub {
-    rev    = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5";
+    rev    = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
+    date   = "2015-03-31";
     owner  = "bitly";
     repo   = "go-simplejson";
-    sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi";
+    sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";
   };
 
-  go-snappystream = buildGoPackage rec {
+  go-snappystream = buildFromGitHub {
     rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
-    name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mreiferson/go-snappystream";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mreiferson";
-      repo = "go-snappystream";
-      sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
-    };
+    date = "2015-04-16";
+    owner = "mreiferson";
+    repo = "go-snappystream";
+    sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
   };
 
   go-sqlite3 = buildFromGitHub {
@@ -1822,6 +1817,15 @@ let
     buildFlags = [ "-tags release" ];
   };
 
+  nsq = buildFromGitHub {
+    rev = "v0.3.5";
+    owner = "bitly";
+    repo = "nsq";
+    sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
+
+    buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ];
+  };
+
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";
@@ -1931,13 +1935,6 @@ let
     propagatedBuildInputs = [ osext ];
   };
 
-  perks = buildFromGitHub {
-    rev    = "aac9e2eab5a334037057336897fd10b0289a5ae8";
-    owner  = "bmizerany";
-    repo   = "perks";
-    sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k";
-  };
-
   pb = buildFromGitHub {
     rev    = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
     owner  = "cheggaaa";
@@ -1945,13 +1942,20 @@ let
     sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
   };
 
+  perks = buildFromGitHub rec {
+    date   = "2014-07-16";
+    owner  = "bmizerany";
+    repo   = "perks";
+    rev    = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa";
+    sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n";
+  };
+
   beorn7.perks = buildFromGitHub rec {
     date   = "2015-02-23";
     owner  = "beorn7";
     repo   = "perks";
     rev    = "b965b613227fddccbfffe13eae360ed3fa822f8d";
     sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
-    goPackagePath = "github.com/beorn7/perks";
   };
 
   pflag = buildGoPackage rec {
@@ -2489,6 +2493,14 @@ let
     buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
   };
 
+  semver = buildFromGitHub {
+    rev = "31b736133b98f26d5e078ec9eb591666edfd091f";
+    date = "2015-07-20";
+    owner = "blang";
+    repo = "semver";
+    sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10";
+  };
+
   serf = buildFromGitHub {
     rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
     date = "2015-05-15";
@@ -2627,6 +2639,14 @@ let
     propagatedBuildInputs = [ pty ];
   };
 
+  timer_metrics = buildFromGitHub {
+    rev = "afad1794bb13e2a094720aeb27c088aa64564895";
+    date = "2015-02-02";
+    owner = "bitly";
+    repo = "timer_metrics";
+    sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c";
+  };
+
   tomb = buildFromGitHub {
     rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
     owner = "go-tomb";
@@ -2638,6 +2658,7 @@ let
 
   toml = buildFromGitHub {
     rev    = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
+    date   = "2015-05-01";
     owner  = "BurntSushi";
     repo   = "toml";
     sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";