From b57260da32c679cac7223cc323a655726b87a785 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Mon, 20 May 2024 22:53:09 +0800
Subject: [PATCH 1/3] flyctl: 0.2.52 -> 0.2.55

---
 pkgs/development/web/flyctl/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 8ca6eca5268b..2683203a79ca 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGo122Module rec {
   pname = "flyctl";
-  version = "0.2.52";
+  version = "0.2.55";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-BCnMXyS94tuD+Un1DLqs3mdGi7XrVBoZGJ/XkpACOQI";
+    hash = "sha256-yCRaF600UrDmazsgTRp/grWtkULeSQedE5m69K6h/4Q=";
   };
 
-  vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE=";
+  vendorHash = "sha256-1hlWyr41t8J4naN5QbEtfCv3npe/kvMH5NKKaxYvLYk=";
 
   subPackages = [ "." ];
 
@@ -34,8 +34,20 @@ buildGo122Module rec {
     HOME=$(mktemp -d)
   '';
 
-  postCheck = ''
-    go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'"
+  checkFlags = [
+    # these tests require network
+    "-skip=TestToTestMachineConfig"
+  ];
+
+  # We override checkPhase to be able to test ./... while using subPackages
+  checkPhase = ''
+    runHook preCheck
+    # We do not set trimpath for tests, in case they reference test assets
+    export GOFLAGS=''${GOFLAGS//-trimpath/}
+
+    buildGoDir test ./...
+
+    runHook postCheck
   '';
 
   postInstall = ''

From df4c4e9183aef86b7006f850efe9b75f0d2c6b61 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Mon, 20 May 2024 22:57:14 +0800
Subject: [PATCH 2/3] flyctl: add RaghavSood as maintainer

---
 pkgs/development/web/flyctl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 2683203a79ca..6ab6ad9057d2 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -69,7 +69,7 @@ buildGo122Module rec {
     downloadPage = "https://github.com/superfly/flyctl";
     homepage = "https://fly.io/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ adtya jsierles techknowlogick ];
+    maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood ];
     mainProgram = "flyctl";
   };
 }

From 54a85a69a597ab75ff30c9817a499673e5ea07a1 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Mon, 20 May 2024 23:01:20 +0800
Subject: [PATCH 3/3] flyctl: add updateScript

---
 pkgs/development/web/flyctl/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 6ab6ad9057d2..12483d4ef5b3 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles }:
+{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles, gitUpdater }:
 
 buildGo122Module rec {
   pname = "flyctl";
@@ -58,6 +58,14 @@ buildGo122Module rec {
     ln -s $out/bin/flyctl $out/bin/fly
   '';
 
+  # Upstream tags every PR merged with release tags like
+  # v2024.5.20-pr3545.4. We ignore all revisions containing a '-'
+  # to skip these releases.
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    ignoredVersions = "-";
+  };
+
   passthru.tests.version = testers.testVersion {
     package = flyctl;
     command = "HOME=$(mktemp -d) flyctl version";