diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/by-name/fl/flyctl/disable-auto-update.patch similarity index 100% rename from pkgs/development/web/flyctl/disable-auto-update.patch rename to pkgs/by-name/fl/flyctl/disable-auto-update.patch diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/by-name/fl/flyctl/package.nix similarity index 78% rename from pkgs/development/web/flyctl/default.nix rename to pkgs/by-name/fl/flyctl/package.nix index 8faa35852e34..a820d6ac8f3d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -1,26 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + flyctl, + installShellFiles, +}: buildGoModule rec { pname = "flyctl"; - version = "0.3.15"; + version = "0.3.29"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-RM9R3o1NJYrw21SYx5whdR9kbopdOXUj3Uw5dVmo6Kk="; + hash = "sha256-gaDmgMJ87d8SosmXuO2arLS7w+3NBS8teKhdIRIXRnM="; }; - vendorHash = "sha256-0KVjg4gt0WOJgVaeugSGzJJE/MvKSPZP6MXCYIw0cxQ="; + vendorHash = "sha256-0GfbHCKzBE8dlf2ZtUZN5L6ZJK2/Jhd9HNnkCNTAgtk="; subPackages = [ "." ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z" "-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}" ]; - tags = ["production"]; + tags = [ "production" ]; nativeBuildInputs = [ installShellFiles ]; @@ -64,7 +72,13 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood teutat3s ]; + maintainers = with lib.maintainers; [ + adtya + jsierles + techknowlogick + RaghavSood + teutat3s + ]; mainProgram = "flyctl"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7d3dfb91154..dec8f5b6ee63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14501,8 +14501,6 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; - flyctl = callPackage ../development/web/flyctl { }; - fluidd = callPackage ../applications/misc/fluidd { }; flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });