waypoint: 0.2.0 -> 0.2.1

- General cleanup
- Restructured so make bin succeeds
- No need to destribute waypoint-entrypoint
This commit is contained in:
06kellyjac 2021-02-07 17:00:41 +00:00
parent c858d0f63a
commit d4ed7e3d6c

View File

@ -2,45 +2,43 @@
buildGoModule rec { buildGoModule rec {
pname = "waypoint"; pname = "waypoint";
version = "0.2.0"; version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc=";
}; };
deleteVendor = true; deleteVendor = true;
vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY=";
subPackages = ["."];
nativeBuildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
# GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway
buildPhase = '' buildPhase = ''
CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY=""
cd internal/assets
go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb
cd ../../
CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint
CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin install -D waypoint $out/bin/waypoint
mv waypoint{,-entrypoint} $out/bin/
''; '';
dontPatchELF = true;
dontPatchShebangs = true;
meta = with lib; { meta = with lib; {
homepage = "https://waypointproject.io";
changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md";
description = "A tool to build, deploy, and release any application on any platform"; description = "A tool to build, deploy, and release any application on any platform";
longDescription = '' longDescription = ''
Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the Waypoint allows developers to define their application build, deploy, and
time to deliver deployments through a consistent and repeatable workflow. release lifecycle as code, reducing the time to deliver deployments
through a consistent and repeatable workflow.
''; '';
homepage = "https://waypointproject.io";
platforms = platforms.linux;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ winpat jk ]; maintainers = with maintainers; [ winpat jk ];
platforms = platforms.linux;
}; };
} }