colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #313157 from RaghavSood/flyctl/0.2.55

Browse Source 
flyctl: 0.2.52 -> 0.2.55
This commit is contained in:
Raghav Sood 2024-05-21 10:34:53 +08:00 committed by GitHub
commit bd2da78e5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/web/flyctl/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles }:
{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles, gitUpdater }:
buildGo122Module rec {
pname = "flyctl";
version = "0.2.52";
version = "0.2.55";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-BCnMXyS94tuD+Un1DLqs3mdGi7XrVBoZGJ/XkpACOQI";
hash = "sha256-yCRaF600UrDmazsgTRp/grWtkULeSQedE5m69K6h/4Q=";
};
vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE=";
vendorHash = "sha256-1hlWyr41t8J4naN5QbEtfCv3npe/kvMH5NKKaxYvLYk=";
subPackages = [ "." ];
@ -34,8 +34,20 @@ buildGo122Module rec {
HOME=$(mktemp -d)
'';
postCheck = ''
go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'"
checkFlags = [
# these tests require network
"-skip=TestToTestMachineConfig"
];
# 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 +58,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 +77,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";
};
}