From 9a5d1d85afa137393593624c25a341d0d2571e3e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:16:56 -0700
Subject: [PATCH] goimports: Move to go-packages

---
 pkgs/development/tools/goimports/default.nix | 29 --------------------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/goimports/default.nix

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
deleted file mode 100644
index 2a8c897ce5b..00000000000
--- a/pkgs/development/tools/goimports/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "7534f4943d94a318edde90212439e538ed54cdde";
-  version = "git-2015-04-26";
-  name = "goimports-${version}";
-  goPackagePath = "golang.org/x/tools";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "tools";
-    sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
-  };
-
-  subPackages = [ "cmd/goimports" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Import management tool for go";
-    homepage = https://godoc.org/golang.org/x/tools/cmd/goimports;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jzellner ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 415fa8540dc..6a2da0fdd7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10111,7 +10111,7 @@ let
 
   godep = callPackage ../development/tools/godep { };
 
-  goimports = callPackage ../development/tools/goimports { };
+  goimports = goPackages.tools.bin // { outputs = [ "bin" ]; };
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };