From 428f9ad382d2f0911ff3c70e55f427d305002b3e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 30 Jul 2015 11:18:34 -0700 Subject: [PATCH] mongodb-tools: Use mongo-tools from goPackages --- pkgs/tools/misc/mongodb-tools/default.nix | 39 ----------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/tools/misc/mongodb-tools/default.nix diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix deleted file mode 100644 index 81e05a8790e..00000000000 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, goPackages, fetchurl, callPackage }: - -with goPackages; - -buildGoPackage rec { - version = "r3.1.2"; - name = "mongodb-tools"; - goPackagePath = "github.com/mongodb/mongo-tools"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz"; - sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s"; - }; - - buildInputs = [ gopass go-flags crypto mgo openssl spacelog - oglematchers goconvey tomb ]; - - subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main" - "mongoexport/main" "mongoimport/main" "mongorestore/main" - "mongodump/main" "mongotop/main" "mongooplog/main" ]; - - buildPhase = '' - for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do - echo Building $i - go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go - done - ''; - - dontInstallSrc = true; - - meta = with lib; { - description = "Tools for MongoDB"; - homepage = https://github.com/mongodb/mongo-tools; - license = licenses.asl20; - maintainers = with maintainers; [ mschristiansen ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cbedb66485..c9c953f49aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -948,7 +948,7 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mongodb-tools = goPackages.mongo-tools; mstflint = callPackage ../tools/misc/mstflint { };