From e7f884730cad5026a0713b4d5930ccd4e797306a Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 5 Apr 2022 03:19:53 +0000
Subject: [PATCH] delve: Switch to buildGoModule

---
 pkgs/development/tools/delve/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index f42046c284e..7ad5472f5b6 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,12 +1,9 @@
-{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "delve";
   version = "1.8.2";
 
-  goPackagePath = "github.com/go-delve/delve";
-  excludedPackages = [ "_fixtures" "scripts" "service/test" ];
-
   src = fetchFromGitHub {
     owner = "go-delve";
     repo = "delve";
@@ -14,10 +11,14 @@ buildGoPackage rec {
     sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";
   };
 
+  vendorSha256 = null;
+
   subPackages = [ "cmd/dlv" ];
 
   nativeBuildInputs = [ makeWrapper ];
 
+  checkFlags = [ "-short" ];
+
   postInstall = ''
     # fortify source breaks build since delve compiles with -O0
     wrapProgram $out/bin/dlv \