From 3d025ed3f27d347659e03b6ba2f630c93034a289 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:06:28 -0300
Subject: [PATCH 1/5] vcluster: add update script

---
 pkgs/applications/networking/cluster/vcluster/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix
index f3a7ccccf5df..92665d9f8b59 100644
--- a/pkgs/applications/networking/cluster/vcluster/default.nix
+++ b/pkgs/applications/networking/cluster/vcluster/default.nix
@@ -1,4 +1,4 @@
-{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }:
+{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, nix-update-script, testers, vcluster }:
 
 buildGoModule rec {
   pname = "vcluster";
@@ -45,6 +45,8 @@ buildGoModule rec {
     command = "vcluster --version";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://github.com/loft-sh/vcluster/releases/tag/v${version}";
     description = "Create fully functional virtual Kubernetes clusters";

From c39d4d950b14bd63b649b996da86829bbd8f823d Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:08:38 -0300
Subject: [PATCH 2/5] vcluster: 0.19.6 -> 0.19.7

Release: https://github.com/loft-sh/vcluster/releases/tag/v0.19.7
---
 pkgs/applications/networking/cluster/vcluster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix
index 92665d9f8b59..367956070f86 100644
--- a/pkgs/applications/networking/cluster/vcluster/default.nix
+++ b/pkgs/applications/networking/cluster/vcluster/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vcluster";
-  version = "0.19.6";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = "vcluster";
     rev = "v${version}";
-    hash = "sha256-yW+GaMEfgkeBEGHG7heo8gZcFQuAXmn3rlBPBrlbyvM=";
+    hash = "sha256-sO/kpbzoAy4ohmLZ3Q7+HzoC0NoK2y0qkJ6Ib8TlEns=";
   };
 
   vendorHash = null;

From f75dda59e7ac4d1ce8f6bb4e2571dace3590cf36 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:11:52 -0300
Subject: [PATCH 3/5] vcluster: move to by-name

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

diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/by-name/vc/vcluster/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/vcluster/default.nix
rename to pkgs/by-name/vc/vcluster/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 343d36b57e36..ea1161992f7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39585,8 +39585,6 @@ with pkgs;
 
   tewi-font = callPackage ../data/fonts/tewi { };
 
-  vcluster = callPackage ../applications/networking/cluster/vcluster { };
-
   sshportal = callPackage ../servers/sshportal { };
 
   ssh-audit = callPackage ../tools/security/ssh-audit { };

From b7060f93685e38cd192994cbdcaccb1462748167 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:15:04 -0300
Subject: [PATCH 4/5] vcluster: prefer alphabetical order

---
 pkgs/by-name/vc/vcluster/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix
index 367956070f86..8b84f35198c6 100644
--- a/pkgs/by-name/vc/vcluster/package.nix
+++ b/pkgs/by-name/vc/vcluster/package.nix
@@ -1,4 +1,4 @@
-{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, nix-update-script, testers, vcluster }:
+{ buildGoModule, fetchFromGitHub, go, installShellFiles, lib, nix-update-script, testers, vcluster }:
 
 buildGoModule rec {
   pname = "vcluster";

From 8b1dd121b0c3f298a06eb324153b81010fa4f9f6 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:15:30 -0300
Subject: [PATCH 5/5] vcluster: nixfmt format

---
 pkgs/by-name/vc/vcluster/package.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix
index 8b84f35198c6..bee814c8a0ca 100644
--- a/pkgs/by-name/vc/vcluster/package.nix
+++ b/pkgs/by-name/vc/vcluster/package.nix
@@ -1,4 +1,13 @@
-{ buildGoModule, fetchFromGitHub, go, installShellFiles, lib, nix-update-script, testers, vcluster }:
+{
+  buildGoModule,
+  fetchFromGitHub,
+  go,
+  installShellFiles,
+  lib,
+  nix-update-script,
+  testers,
+  vcluster,
+}:
 
 buildGoModule rec {
   pname = "vcluster";
@@ -16,7 +25,8 @@ buildGoModule rec {
   subPackages = [ "cmd/vclusterctl" ];
 
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X main.version=${version}"
     "-X main.goVersion=${lib.getVersion go}"
   ];
@@ -54,6 +64,11 @@ buildGoModule rec {
     homepage = "https://www.vcluster.com/";
     license = lib.licenses.asl20;
     mainProgram = "vcluster";
-    maintainers = with lib.maintainers; [ berryp peterromfeldhk qjoly superherointj ];
+    maintainers = with lib.maintainers; [
+      berryp
+      peterromfeldhk
+      qjoly
+      superherointj
+    ];
   };
 }