diff options
| author | Robert Scott <code@humanleg.org.uk> | 2020-08-23 23:45:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-23 23:45:06 +0100 |
| commit | d57c5a876b465ce5773a57f7992f993e8ebac744 (patch) | |
| tree | f05ab534a99c87de95607c59f5054b2de8c6f596 /pkgs | |
| parent | 53e694576d0fb8c20ad4aa0d0d0d688fc2979834 (diff) | |
| parent | 399d855110384bd85dba2093f64885ac20adb91e (diff) | |
| download | nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar.gz nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar.bz2 nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar.lz nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar.xz nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.tar.zst nixpkgs-d57c5a876b465ce5773a57f7992f993e8ebac744.zip | |
Merge pull request #94030 from risicle/ris-cloudfoundry-cli-7.0.1
cloudfoundry-cli: 6.51.0 -> 7.0.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/cloudfoundry-cli/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 9d0c1ab92ff..642c42108aa 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; - version = "6.51.0"; + version = "7.0.1"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,14 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f"; + sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + }; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; }; nativeBuildInputs = [ installShellFiles ]; @@ -35,7 +42,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$out/bin/cf" - installShellCompletion --bash "$src/ci/installers/completion/cf" + installShellCompletion --bash $bashCompletionScript ''; meta = with stdenv.lib; { |