From 6ee0d3604e67c81f33aae94b19f979208202302c Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 8 Mar 2019 15:14:33 -0800
Subject: [PATCH] gotools: use buildGoModule instead of buildGoPackage

---
 pkgs/development/tools/gotools/default.nix | 31 ++++++++++------------
 pkgs/development/tools/gotools/deps.nix    | 11 --------
 2 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/tools/gotools/deps.nix

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 6740f07846de..44d45e480b3a 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,44 +1,41 @@
-{ stdenv, go, buildGoPackage, fetchgit }:
+{ stdenv, go, buildGoModule, fetchgit }:
 
-buildGoPackage rec {
+buildGoModule rec {
   name = "gotools-unstable-${version}";
   version = "2019-03-05";
   rev = "00c44ba9c14f88ffdd4fb5bfae57fe8dd6d6afb1";
 
-  goPackagePath = "golang.org/x/tools";
-  goPackageAliases = [ "code.google.com/p/go.tools" ];
-
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
     sha256 = "04rpdi52j26szx5kiyfmwad1sg7lfplxrkbwkr3b1kfafh1whgw5";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "12klgqm2px878lzh05yzj6lr83v7vg0vv2k69pmg6nv1wlsxdlzf";
 
   preConfigure = ''
     # Make the builtin tools available here
-    mkdir -p $bin/bin
+    mkdir -p $out/bin
     eval $(go env | grep GOTOOLDIR)
     find $GOTOOLDIR -type f | while read x; do
-      ln -sv "$x" "$bin/bin"
+      ln -sv "$x" "$out/bin"
     done
-    export GOTOOLDIR=$bin/bin
+    export GOTOOLDIR=$out/bin
   '';
 
   excludedPackages = "\\("
     + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
     + "\\)";
 
+  # Set GOTOOLDIR for derivations adding this to buildInputs
+  postInstall = ''
+    mkdir -p $out/nix-support
+    substituteAll ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook.tmp
+    cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
+    rm $out/nix-support/setup-hook.tmp
+  '';
+
   # 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;
-
-  # Set GOTOOLDIR for derivations adding this to buildInputs
-  postInstall = ''
-    mkdir -p $bin/nix-support
-    substituteAll ${../../go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp
-    cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook
-    rm $bin/nix-support/setup-hook.tmp
-  '';
 }
diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix
deleted file mode 100644
index 1cac56f3ac40..000000000000
--- a/pkgs/development/tools/gotools/deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "65e2d4e15006aab9813ff8769e768bbf4bb667a0";
-      sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7";
-    };
-  }
-]