From e2e42a4e9fe164ea81b73139825f4815b8df941b Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:21:22 +0100 Subject: [PATCH 1/3] maintainers: add SchahinRohani --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 689b137da2f2..f1950d6b1a3d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23249,6 +23249,12 @@ github = "scd31"; githubId = 57571338; }; + SchahinRohani = { + email = "schahin@rouhanizadeh.de"; + github = "SchahinRohani"; + githubId = 24507823; + name = "Schahin Rouhanizadeh"; + }; schinmai-akamai = { email = "schinmai@akamai.com"; github = "tchinmai7"; From 01b0c2aab8839254667b89769c2dd9e07f589233 Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:22:41 +0100 Subject: [PATCH 2/3] flyctl: add SchahinRohani as maintainer --- pkgs/by-name/fl/flyctl/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 109016e70fb4..31d17695f3fe 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -78,6 +78,7 @@ buildGoModule rec { jsierles techknowlogick RaghavSood + SchahinRohani ]; mainProgram = "flyctl"; }; From e707a4eb7f23b3ae54494e2a566ef52c6cf5a798 Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:24:33 +0100 Subject: [PATCH 3/3] flyctl: 0.3.172 -> 0.3.209 --- pkgs/by-name/fl/flyctl/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 31d17695f3fe..4f6a45b2b426 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -6,20 +6,23 @@ testers, flyctl, installShellFiles, + git, }: buildGoModule rec { pname = "flyctl"; - version = "0.3.172"; + version = "0.3.209"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-jKzlKOdE+SrCzY81ciI9sKN0iiFZMsKp04A+1TV1+i0="; + leaveDotGit = true; + hash = "sha256-D1MSlg6oFmdyiEaq10DUwzADzleilFIQ22oQd8LGfRk="; }; - vendorHash = "sha256-D6b+dLoE4IdhsmnWILe7Thkggq3p0ur4C3BOz7Cuk98="; + proxyVendor = true; + vendorHash = "sha256-ezGA1LGwQVFMzV/Ogj26pooD06O7FNTXMrYWkv6AwWM="; subPackages = [ "." ]; @@ -31,11 +34,17 @@ buildGoModule rec { ]; tags = [ "production" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + git + ]; patches = [ ./disable-auto-update.patch ]; preBuild = '' + # Embed VCS Infos + export GOFLAGS="$GOFLAGS -buildvcs=true" + GOOS= GOARCH= CGO_ENABLED=0 go generate ./... '';