diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index eaa521f7a17..e54df39b8bc 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,45 +1,26 @@
-{ lib, buildGoModule, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gotools";
-  version = "0.1.10";
+  version = "0.7.0";
 
-  src = fetchgit {
+  # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "tools";
     rev = "v${version}";
-    url = "https://go.googlesource.com/tools";
-    sha256 = "sha256-r71+//VhayW18uvMl/ls/8KYNbZ7uDZw3SWoqPL3Xqk=";
+    # The gopls folder contains a Go submodule which causes a build failure
+    # and lives in its own package named gopls.
+    postFetch = ''
+      rm -r $out/gopls
+    '';
+    sha256 = "sha256-6Sdo6oKJHYXWkvJmbte7Wc7tov5AHzn70Bi1QdQ5HR4=";
   };
 
-  # The gopls folder contains a Go submodule which causes a build failure.
-  # Given that, we can't have the gopls binary be part of the gotools
-  # derivation.
-  #
-  # The attribute "gopls" provides the gopls binary.
-  #
-  # Related
-  #
-  # * https://github.com/NixOS/nixpkgs/pull/85868
-  # * https://github.com/NixOS/nixpkgs/issues/88716
-  postPatch = ''
-    rm -rf gopls
-  '';
-
-  vendorSha256 = "sha256-UJIXG8WKzazNTXoqEFlT/umC40F6z2Q5I8RfxnMbsPM=";
+  vendorSha256 = "sha256-fp0pb3EcGRDWlSpgel4pYRdsPJGk8/d57EjWJ+fzq7g=";
 
   doCheck = false;
 
-  postConfigure = ''
-    # Make the builtin tools available here
-    mkdir -p $out/bin
-    eval $(go env | grep GOTOOLDIR)
-    find $GOTOOLDIR -type f | while read x; do
-      ln -sv "$x" "$out/bin"
-    done
-    export GOTOOLDIR=$out/bin
-  '';
-
-  excludedPackages = [ "vet" "cover" ];
-
   # Set GOTOOLDIR for derivations adding this to buildInputs
   postInstall = ''
     mkdir -p $out/nix-support
@@ -47,14 +28,13 @@ buildGoModule rec {
       --subst-var-by bin $out
   '';
 
-  # Do not copy this without a good reason for enabling
-  # In this case tools is heavily coupled with go itself and embeds paths.
-  allowGoReference = true;
-
   meta = with lib; {
     description = "Additional tools for Go development";
-    homepage = "http://go.googlesource.com/tools";
+    longDescription = ''
+      This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash.
+    '';
+    homepage = "https://go.googlesource.com/tools";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ danderson ];
+    maintainers = with maintainers; [ danderson SuperSandro2000 ];
   };
 }