From ae34d2e1fd21944dbe184da7f6d2ecd011e5a32b Mon Sep 17 00:00:00 2001
From: "Wilson E. Husin" <wilsonehusin@gmail.com>
Date: Wed, 7 Oct 2020 14:39:43 -0700
Subject: [PATCH 1/2] Sonobuoy 0.16.1 -> 0.19.0

---
 .../networking/cluster/sonobuoy/default.nix    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index 32dbced0a461..c111f7eccfee 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -1,13 +1,13 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 # SHA of ${version} for the tool's help output
-let rev = "c9c2a461cd3397909fe6e45ff71836347ef89fd8";
+let rev = "e03f9ee353717ccc5f58c902633553e34b2fe46a";
 in
-buildGoPackage rec {
+buildGoModule rec {
   pname = "sonobuoy";
-  version = "0.16.1";
+  version = "0.19.0";
 
-  goPackagePath = "github.com/heptio/sonobuoy";
+  goPackagePath = "github.com/vmware-tanzu/sonobuoy";
 
   buildFlagsArray =
     let t = goPackagePath;
@@ -19,12 +19,16 @@ buildGoPackage rec {
     '';
 
   src = fetchFromGitHub {
-    sha256 = "14qc5a7jbr403wjpk6pgpb94i72yx647sg9srz07q6drq650kyfv";
+    sha256 = "1gw58a30akidk15wk8kk7f8lsyqr1q180j6fzr4462ahwxdbjgkr";
     rev = "v${version}";
     repo = "sonobuoy";
     owner = "vmware-tanzu";
   };
 
+  vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i";
+
+  subPackages = [ "." ];
+
   meta = with lib; {
     description = ''
       Diagnostic tool that makes it easier to understand the
@@ -38,6 +42,6 @@ buildGoPackage rec {
 
     homepage = "https://sonobuoy.io";
     license = licenses.asl20;
-    maintainers = with maintainers; [ carlosdagos saschagrunert ];
+    maintainers = with maintainers; [ carlosdagos saschagrunert wilsonehusin ];
   };
 }

From 6d49e357732ef8278a94477829261a6678b37582 Mon Sep 17 00:00:00 2001
From: "Wilson E. Husin" <wilsonehusin@gmail.com>
Date: Wed, 14 Oct 2020 18:06:43 -0700
Subject: [PATCH 2/2] Adding myself as maintainer

Might as well
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b95d2bfa8efe..504dbf4e9580 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9780,4 +9780,10 @@
     github = "hloeffler";
     githubId = 6627191;
   };
+  wilsonehusin = {
+    name = "Wilson E. Husin";
+    email = "wilsonehusin@gmail.com";
+    github = "wilsonehusin";
+    githubId = 14004487;
+  };
 }