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 86% rename from pkgs/development/web/flyctl/default.nix rename to pkgs/by-name/fl/flyctl/package.nix index 312230df0f20..a820d6ac8f3d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -1,4 +1,11 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + flyctl, + installShellFiles, +}: buildGoModule rec { pname = "flyctl"; @@ -16,11 +23,12 @@ buildGoModule rec { 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 a83767058ee7..7aab57b85c99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14504,8 +14504,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 { });