diff options
Diffstat (limited to 'pkgs/development/tools/continuous-integration/fly/default.nix')
-rw-r--r-- | pkgs/development/tools/continuous-integration/fly/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 483b8e6b30c4..3bf48084bbd8 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }: buildGoModule rec { pname = "fly"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; + sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x"; }; - modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; + vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm"; subPackages = [ "fly" ]; @@ -20,12 +20,10 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - # The fly.bash file included with this derivation can be replaced by a - # call to `fly completion bash` once the `completion` subcommand has - # made it into a release. Similarly, `fly completion zsh` will provide - # zsh completions. https://github.com/concourse/concourse/pull/4012 - postInstall = '' - install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + $out/bin/fly completion --shell bash > $out/share/bash-completion/completions/fly + $out/bin/fly completion --shell zsh > $out/share/zsh/site-functions/_fly ''; meta = with lib; { |