diff options
Diffstat (limited to 'pkgs/development/web/flyctl/default.nix')
-rw-r--r-- | pkgs/development/web/flyctl/default.nix | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 489a38efcf12f..6ff332b5a5cda 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles, gitUpdater }: -buildGo122Module rec { +buildGoModule rec { pname = "flyctl"; - version = "0.2.46"; + version = "0.2.58"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-x7ICqPm3c2bpNb18vNxZVlkxtgCL2GqLMv8TxI7cUfg="; + hash = "sha256-aXiBDPl/x/xeu+fNrxs+JejVtSZu8KZKbrSetJj4/Pk="; }; - vendorHash = "sha256-tLlWPKMRPFyMDZGkdjb/hF/7/OPpducGXyGlXExBG64="; + vendorHash = "sha256-NmogEh3xWQ/opMm9UarpfuH3MJzJ9+qb0KX/O+i/pcA="; subPackages = [ "." ]; @@ -34,8 +34,15 @@ buildGo122Module rec { HOME=$(mktemp -d) ''; - postCheck = '' - go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'" + # We override checkPhase to be able to test ./... while using subPackages + checkPhase = '' + runHook preCheck + # We do not set trimpath for tests, in case they reference test assets + export GOFLAGS=''${GOFLAGS//-trimpath/} + + buildGoDir test ./... + + runHook postCheck ''; postInstall = '' @@ -46,6 +53,14 @@ buildGo122Module rec { ln -s $out/bin/flyctl $out/bin/fly ''; + # Upstream tags every PR merged with release tags like + # v2024.5.20-pr3545.4. We ignore all revisions containing a '-' + # to skip these releases. + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "-"; + }; + passthru.tests.version = testers.testVersion { package = flyctl; command = "HOME=$(mktemp -d) flyctl version"; @@ -57,7 +72,7 @@ buildGo122Module rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adtya jsierles techknowlogick ]; + maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood ]; mainProgram = "flyctl"; }; } |