From 387246080b2cd9675d7fcdab3ad528a4048842b5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:05:48 +0200
Subject: mongodb-tools: extracted from goPackages

---
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06a27fb52065..bbb0b59e3e07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -881,7 +881,7 @@ in
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; };
+  mongodb-tools = (callPackage ../tools/misc/mongodb-tools { }).bin;
 
   mstflint = callPackage ../tools/misc/mstflint { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3907f8339f3b..81db5296e9fa 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2536,27 +2536,6 @@ let
     buildInputs = [ toml ];
   };
 
-  mongo-tools = buildFromGitHub {
-    rev    = "4fcfd3e57415de95c0c016def07b95bca63cccb4";
-    owner  = "mongodb";
-    repo   = "mongo-tools";
-    sha256 = "0rm7bnb81hr0byxhvagwv8an1bky882nz68cmm2kbznzyprvhyaa";
-    buildInputs = [ gopass go-flags mgo openssl tomb ];
-    excludedPackages = "vendor";
-
-    # Mongodb incorrectly names all of their binaries main
-    # Let's work around this with our own installer
-    preInstall = ''
-      mkdir -p $bin/bin
-      while read b; do
-        rm -f go/bin/main
-        go install $goPackagePath/$b/main
-        cp go/bin/main $bin/bin/$b
-      done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
-      rm -r go/bin
-    '';
-  };
-
   motion = buildFromGitHub {
     rev = "e09baac69ad86bff1de868e8d6c4327eb0a918d7";
     owner = "fatih";
-- 
cgit 1.4.1