summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoredef <edef@edef.eu>2024-07-30 22:19:39 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-07-31 08:10:51 +0000
commitbcf2be31609e9cbdb5275bf6b6399de3208f60f9 (patch)
tree98350ddfdc0923591d816af9f51dd28e0b1d9866
parentMerge pull request #331132 from NixOS/backport-331114-to-release-24.05 (diff)
downloadnixpkgs-bcf2be31609e9cbdb5275bf6b6399de3208f60f9.tar.gz
flyctl: 0.2.94 -> 0.2.101
Change-Id: Ic02269f63c2b43af18e0bd432d31621bcaf0d10e (cherry picked from commit 0bb48f173217968b6640e2e2c5016312e7cbdd10)
-rw-r--r--pkgs/development/web/flyctl/default.nix6
-rw-r--r--pkgs/development/web/flyctl/disable-auto-update.patch12
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index bc1ca7484287..aeb4ee710079 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/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 = [ "." ];
diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/development/web/flyctl/disable-auto-update.patch
index d6c59755f881..3fe6048871e4 100644
--- a/pkgs/development/web/flyctl/disable-auto-update.patch
+++ b/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