From a09c800fc31f8dc89734bb197bd67e81f13ae60b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 29 Apr 2025 19:47:05 +0200
Subject: [PATCH 1/3] fleet: add myself to the maintainers

---
 pkgs/by-name/fl/fleet/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index 0b2c945d6801..5aee04b633e4 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -46,6 +46,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       asauzeau
+      lesuisse
     ];
     mainProgram = "fleet";
   };

From 4d3c001e7f990c77d518ccf363f430247e4d39a7 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 29 Apr 2025 20:09:11 +0200
Subject: [PATCH 2/3] fleet: 4.67.1 -> 4.67.2

https://github.com/fleetdm/fleet/releases/tag/fleet-v4.67.2

Also fixes gthe hash mismatch because the src hash of a
previous version was used.
---
 pkgs/by-name/fl/fleet/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index 5aee04b633e4..71338621fefd 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -1,23 +1,21 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   buildGoModule,
-  writableTmpDirAsHomeHook,
   versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.67.1";
+  version = "4.67.2";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM=";
+    hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8=";
   };
-  vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg=";
+  vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
 
   subPackages = [
     "cmd/fleet"
@@ -28,11 +26,6 @@ buildGoModule (finalAttrs: {
     "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
   ];
 
-  doCheck = true;
-  nativeCheckInputs = [
-    writableTmpDirAsHomeHook
-  ];
-
   doInstallCheck = true;
   versionCheckProgramArg = "version";
   nativeInstallCheckInputs = [

From e1b2c7837871f7599128647c5740150a95d00985 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 29 Apr 2025 20:18:44 +0200
Subject: [PATCH 3/3] fleetctl: keep in sync with fleet

Both tools are used together they should be kept in sync.
---
 pkgs/by-name/fl/fleetctl/package.nix | 29 +++++++++++++---------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fl/fleetctl/package.nix b/pkgs/by-name/fl/fleetctl/package.nix
index 8cb6bd248b26..e518e12f8047 100644
--- a/pkgs/by-name/fl/fleetctl/package.nix
+++ b/pkgs/by-name/fl/fleetctl/package.nix
@@ -1,44 +1,41 @@
 {
   lib,
   buildGoModule,
-  fetchFromGitHub,
+  fleet,
   writableTmpDirAsHomeHook,
   versionCheckHook,
   stdenv,
 }:
 
-buildGoModule rec {
-  pname = "fleectl";
-  version = "4.67.1";
+buildGoModule (finalAttrs: {
+  pname = "fleetctl";
 
-  src = fetchFromGitHub {
-    owner = "fleetdm";
-    repo = "fleet";
-    tag = "fleet-v${version}";
-    hash = "sha256-shaOPK7BbIDARopzGehlIA6aPdRiFRP9hrFRNO3kfGA=";
-  };
-  vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
+  inherit (fleet) version src vendorHash;
 
   subPackages = [
     "cmd/fleetctl"
   ];
 
   ldflags = [
-    "-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}"
-    "-X github.com/fleetdm/fleet/v4/server/version.version=${version}"
+    "-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl"
+    "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
   ];
 
   nativeCheckInputs = [
     writableTmpDirAsHomeHook
-    versionCheckHook
   ];
 
   # Try to access /var/empty/.goquery/history subfolders
   doCheck = !stdenv.hostPlatform.isDarwin;
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
 
   meta = {
     homepage = "https://github.com/fleetdm/fleet";
-    changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${version}";
+    changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}";
     description = "CLI tool for managing Fleet";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
@@ -46,4 +43,4 @@ buildGoModule rec {
     ];
     mainProgram = "fleetctl";
   };
-}
+})