diff options
author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-18 19:09:52 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-18 19:09:52 +0200 |
commit | 488de719218cca01506a818ad8fee6fe875f4398 (patch) | |
tree | aede1db7bce742d7e692d6562728252fffbba5e4 /pkgs | |
parent | 10348ecd4682f421a17e83bf8f0d46d427245a6e (diff) | |
parent | 0208e92577aa23088a657642a2cf362dde79a084 (diff) |
Merge pull request #15433 from zimbatm/google-gloud-sdk-109
google-cloud-sdk: 106.0.0 -> 109.0.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 5d314b7320219..fa3655fb21cff 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -3,13 +3,20 @@ with python27Packages; stdenv.mkDerivation rec { - version = "106.0.0"; name = "google-cloud-sdk-${version}"; - - src = fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-106.0.0-linux-x86_64.tar.gz"; - sha256 = "00jhpx32sfxcgl404plmb8122bs0ijl2rv25h17mnjn067nhz7nn"; - }; + version = "109.0.0"; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; + sha256 = "0jcg4pzqmkmpcp86rdi9hcqvvm61rqvl8spl2r1n4658w48h61x7"; + } + else + fetchurl { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; + sha256 = "1ii2ivh2na9933fhqrzsicihs6mpr10jgmml1fkdjmhmmp92zshd"; + }; buildInputs = [python27 makeWrapper]; @@ -40,14 +47,14 @@ stdenv.mkDerivation rec { rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod ''; - meta = { + meta = with stdenv.lib; { description = "Tools for the google cloud platform"; longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq"; version = version; # This package contains vendored dependencies. All have free licenses. - license = stdenv.lib.licenses.free; + license = licenses.free; homepage = "https://cloud.google.com/sdk/"; - maintainers = with stdenv.lib.maintainers; [stephenmw]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [stephenmw zimbatm]; + platforms = platforms.linux; }; } |