From b6fabe24fd70917034180ed8c9c2f915c7485caa Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sun, 21 May 2017 13:54:09 +0200
Subject: [PATCH 1/2] google-cloud-sdk: 151.0.0 -> 155.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 67bbb510b13..0dda60ced33 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "151.0.0";
+  version = "155.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 = "1d1h6jiqs3grsb6c61v6dkb4l2qv6v8g7wbzgaqkmn09xdbaq40l";
+        sha256 = "1xh8xy9p3qqmirvhih7vf96i5xn0z0zr5mmbqr6vfzx16r47bi2z";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "05idf0g505s8diaz28ij9yqig2wwn43lyppfs483m7vnx5hk62j5";
+        sha256 = "19pr1pld6vdp5ig5i7zddfl1l5xjv9nx5sn00va4l1nnb410ac69";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "01hf7pp1v57dxx6f2pz7j13fjdnrfp7gjmzjdlhlx4rnvxrd6i3f";
+        sha256 = "18hnabhdlrprhg8micy2z63jxyah3qr3pv9pgb64i7lbv6lznr2b";
       };
 
   buildInputs = [python27 makeWrapper];

From b1a6442c24e2293cb301d9247a637da3081e2b60 Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sun, 21 May 2017 13:54:33 +0200
Subject: [PATCH 2/2] google-cloud-sdk: Fix calls to itself

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 0dda60ced33..b66c4c041f7 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -37,10 +37,13 @@ stdenv.mkDerivation rec {
     # create wrappers with correct env
     for program in gcloud bq gsutil git-credential-gcloud.sh; do
         programPath="$out/google-cloud-sdk/bin/$program"
-        wrapper="$out/bin/$program"
-        makeWrapper "$programPath" "$wrapper" \
+        binaryPath="$out/bin/$program"
+        wrapProgram "$programPath" \
             --set CLOUDSDK_PYTHON "${python27}/bin/python" \
             --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
+
+        mkdir -p $out/bin
+        ln -s $programPath $binaryPath
     done
 
     # install man pages