From 32493e4e7cffbc6a68467d14ed016d5bcaba5c37 Mon Sep 17 00:00:00 2001
From: Marcelo Giles <marcelogiles@gmail.com>
Date: Thu, 24 Oct 2024 16:08:53 -0700
Subject: [PATCH 1/2] k8sgpt: move to by-name

---
 .../k8sgpt/default.nix => by-name/k8/k8sgpt/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster/k8sgpt/default.nix => by-name/k8/k8sgpt/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/by-name/k8/k8sgpt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/k8sgpt/default.nix
rename to pkgs/by-name/k8/k8sgpt/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 489fe0a38e1a..593c677aa8aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30562,8 +30562,6 @@ with pkgs;
 
   kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
 
-  k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { };
-
   k9s = callPackage ../applications/networking/cluster/k9s { };
 
   kubecm = callPackage ../applications/networking/cluster/kubecm { };

From abbf712c7718acc15a5ad244cf523e91701a9e1f Mon Sep 17 00:00:00 2001
From: Marcelo Giles <marcelogiles@gmail.com>
Date: Thu, 24 Oct 2024 17:10:23 -0700
Subject: [PATCH 2/2] k8sgpt: 0.3.30 -> 0.3.41

---
 pkgs/by-name/k8/k8sgpt/package.nix | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix
index 46fe219868ef..ba4707ff77b5 100644
--- a/pkgs/by-name/k8/k8sgpt/package.nix
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@@ -1,22 +1,34 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   pname = "k8sgpt";
-  version = "0.3.30";
+  version = "0.3.41";
 
   src = fetchFromGitHub {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
     rev = "v${version}";
-    hash = "sha256-iseyvGo9fitt8bAlbU3wF7bBLz66fijb8h35aank+0k=";
+    hash = "sha256-p53gVpFhxr60OEZSASRU5KX7TkWzYCDAvG9aQj2NFHI=";
   };
 
-  vendorHash = "sha256-YpCn7hZkMj3/dIC/ZMslTjXcumCH3LH/A7pjfJ0pUd4=";
+  vendorHash = "sha256-9H6E1JUbxfcx3Baithu9Jr6MpxfuKE+XWz7HrTCdxA8=";
 
+  # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
   CGO_ENABLED = 0;
 
+  # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
+  checkFlags = [
+    "-skip=TestActivate/trivy"
+  ];
+
+  # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X main.version=v${version}"
     "-X main.commit=${src.rev}"
     "-X main.date=1970-01-01-00:00:01"
@@ -28,6 +40,10 @@ buildGoModule rec {
     homepage = "https://k8sgpt.ai";
     changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ developer-guy kranurag7 ];
+    maintainers = with lib.maintainers; [
+      developer-guy
+      kranurag7
+      mrgiles
+    ];
   };
 }