Merge pull request #331225 from NixOS/backport-331172-to-release-24.05

[Backport release-24.05] flyctl: 0.2.94 -> 0.2.101

pkgs/development/web/flyctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.2.94";
+  version = "0.2.101";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-yw8c3afGmriEoewSA8gIcuVDfRUwXqG46fi36GCGQBM=";
+    hash = "sha256-Ceep71qyQXX+UQzI7VP64WRk5wMF7QADxs3on75cBic=";
   };
 
-  vendorHash = "sha256-L5tQ45Dujnef31Fs05mK5u+6zaGyJi1HkipOvkmra/0=";
+  vendorHash = "sha256-l1Pt1eMgj/ZlOhV/yOVnJek9qm86n3iTKIQi3B3Kweo=";
 
   subPackages = [ "." ];
 

pkgs/development/web/flyctl/disable-auto-update.patch

@@ -1,4 +1,4 @@
-From 9c76dbff982b0fd8beaffae42a6e98bc1e67f089 Mon Sep 17 00:00:00 2001
+From a46bc88829282032ab1d68ef6d67d25421ab8d32 Mon Sep 17 00:00:00 2001
 From: Gabriel Simmer <g@gmem.ca>
 Date: Fri, 21 Jul 2023 08:16:52 +0100
 Subject: [PATCH] Disable auto update
@@ -8,18 +8,18 @@ Subject: [PATCH] Disable auto update
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/internal/config/config.go b/internal/config/config.go
-index 1914f8e0..958baf27 100644
+index 04583ca5..1b085b55 100644
 --- a/internal/config/config.go
 +++ b/internal/config/config.go
-@@ -141,7 +141,7 @@ func (cfg *Config) ApplyFile(path string) (err error) {
- 		AutoUpdate   bool   `yaml:"auto_update"`
+@@ -173,7 +173,7 @@ func (cfg *Config) applyFile(path string) (err error) {
+ 		SyntheticsAgent bool   `yaml:"synthetics_agent"`
  	}
  	w.SendMetrics = true
 -	w.AutoUpdate = true
 +	w.AutoUpdate = false
+ 	w.SyntheticsAgent = true
  
  	if err = unmarshal(path, &w); err == nil {
- 		cfg.AccessToken = w.AccessToken
 -- 
-2.41.0
+2.45.2