mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
Code Issues Wiki Activity

Merge pull request #25961 from selaux/google-cloud-sdk

Browse source 
google-cloud-sdk: Upgrade to 155.0.0 and fix calling itself
This commit is contained in:
Jörg Thalheim 2017-05-21 14:29:12 +01:00 committed by GitHub
parent 5e9430acef b1a6442c24
commit 2f46a9cbc9
1 changed files with 9 additions and 6 deletions

15
pkgs/tools/admin/google-cloud-sdk/default.nix
View file

@ -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];
@ -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