From 131a40cf1ba9091b449ef630bbee1b1b68314d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Jun 2022 14:43:31 +0200 Subject: [PATCH] fly: 7.7.1 -> 7.8.0, adopt --- .../continuous-integration/fly/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index ad9752872738..0efeb6dccf55 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,36 +1,39 @@ -{ buildGoModule, fetchFromGitHub, stdenv, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, lib, installShellFiles }: buildGoModule rec { pname = "fly"; - version = "7.7.1"; + version = "7.8.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-AJvD9re4jj+ixvZKWHDJM0QEv5EPFv3VFJus3lnm2LI="; + sha256 = "sha256-CYQQ44Yx97PvhFHrTzUM2RooNCh5Sdg8SXsV4BOzzPE="; }; - vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c="; - - doCheck = false; + vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs="; subPackages = [ "fly" ]; ldflags = [ - "-X github.com/concourse/concourse.Version=${version}" + "-s" "-w" "-X github.com/concourse/concourse.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; + 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 + installShellCompletion --cmd fly \ + --bash <($out/bin/fly completion --shell bash) \ + --fish <($out/bin/fly completion --shell fish) \ + --zsh <($out/bin/fly completion --shell zsh) ''; meta = with lib; { - description = "A command line interface to Concourse CI"; + description = "Command line interface to Concourse CI"; homepage = "https://concourse-ci.org"; license = licenses.asl20; - maintainers = with maintainers; [ ivanbrennan ]; + maintainers = with maintainers; [ ivanbrennan SuperSandro2000 ]; }; }