diff options
Diffstat (limited to 'pkgs/development/web/flyctl/default.nix')
-rw-r--r-- | pkgs/development/web/flyctl/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 489a38efcf12f..de2b1ab03e8c3 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 }: -buildGo122Module rec { +buildGoModule rec { pname = "flyctl"; - version = "0.2.46"; + version = "0.2.69"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-x7ICqPm3c2bpNb18vNxZVlkxtgCL2GqLMv8TxI7cUfg="; + hash = "sha256-6SPJt+az+C0amCnRScp85JqUfnWswHdS1OtOMa40Haw="; }; - vendorHash = "sha256-tLlWPKMRPFyMDZGkdjb/hF/7/OPpducGXyGlXExBG64="; + vendorHash = "sha256-O5lUw0XzQUoy3mAmSpeW6WfBgg0FLxXkk7hCUAS2+o8="; 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 = '' @@ -57,7 +64,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 teutat3s ]; mainProgram = "flyctl"; }; } |