diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
new file mode 100644
index 00000000000..c80861b2fd7
--- /dev/null
+++ b/pkgs/development/tools/leaps/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "leaps-${version}";
+  version = "20160626-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "5cf7328a8c498041d2a887e89f22f138498f4621";
+
+  goPackagePath = "github.com/jeffail/leaps";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/jeffail/leaps";
+    sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7";
+    fetchSubmodules = false;  
+  };
+
+  goDeps = ./deps.json;
+  meta = {
+    description = "A pair programming tool and library written in Golang";
+    homepage = "https://github.com/jeffail/leaps/";
+    license = "MIT";
+    maintainers = with stdenv.lib.maintainers; [ qknight ];
+    meta.platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json
new file mode 100644
index 00000000000..60141d5eeee
--- /dev/null
+++ b/pkgs/development/tools/leaps/deps.json
@@ -0,0 +1,11 @@
+[
+  {
+   "goPackagePath": "golang.org/x/net",
+    "fetch": {
+      "type": "git",
+       "url": "https://go.googlesource.com/net",
+       "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf",
+       "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b0cec8654..be823f2dfbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9987,6 +9987,8 @@ in
 
   go2nix = callPackage ../development/tools/go2nix { };
 
+  leaps = callPackage ../development/tools/leaps { };
+
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {