diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 5ef12d88c06..585f1033656 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
+{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
   fetchFromGitHub }:
 
 buildGoPackage rec {
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
-  buildInputs = [ go-bindata goimports makeWrapper ];
+  buildInputs = [ go-bindata gotools makeWrapper ];
   preBuild = ''go generate ./...'';
 
   postInstall = ''
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 3227ed8eec2..497c765b5b1 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "godef-${version}";
-  version = "20170920-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "b692db1de5229d4248e23c41736b431eb665615d";
+  version = "1.0.0";
+  rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5";
 
   goPackagePath = "github.com/rogpeppe/godef";
   excludedPackages = "go/printer/testdata";
@@ -11,13 +11,13 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/rogpeppe/godef";
-    sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15";
+    sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg";
   };
 
   meta = {
     description = "Print where symbols are defined in Go source code";
     homepage = https://github.com/rogpeppe/godef/;
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
     license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
deleted file mode 100644
index 14c319320d0..00000000000
--- a/pkgs/development/tools/goimports/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, buildGoPackage, fetchgit }:
-
-buildGoPackage rec {
-  name = "goimports-${version}";
-  version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
-
-  goPackagePath = "golang.org/x/tools";
-  subPackages = [ "cmd/goimports" ];
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://go.googlesource.com/tools";
-    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
-  };
-}
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 05e87d08460..76023faf320 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "gotools-unstable-${version}";
-  version = "2018-07-20";
-  rev = "be728107ea8275e6f58ba07e246b94181acaab24";
+  version = "2018-09-11";
+  rev = "677d2ff680c188ddb7dcd2bfa6bc7d3f2f2f75b2";
 
   goPackagePath = "golang.org/x/tools";
   goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw";
+    sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b8298b76d77..26bc7ebc6f1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -106,6 +106,7 @@ mapAliases ({
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   gnustep-make = gnustep.make; # added 2016-7-6
   go-pup = pup; # added 2017-12-19
+  goimports = gotools; # added 2018-09-16
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 814c5e9d607..23537a11e54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14506,8 +14506,6 @@ with pkgs;
 
   godef = callPackage ../development/tools/godef { };
 
-  goimports = callPackage ../development/tools/goimports { };
-
   gopkgs = callPackage ../development/tools/gopkgs { };
 
   govers = callPackage ../development/tools/govers { };