Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e9430acef4e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f46a9cbc930
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 21, 2017

  1. google-cloud-sdk: 151.0.0 -> 155.0.0

    @selaux
    selaux committed May 21, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b6fabe2 View commit details

  2. google-cloud-sdk: Fix calls to itself

    @selaux
    selaux committed May 21, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b1a6442 View commit details

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

    google-cloud-sdk: Upgrade to 155.0.0 and fix calling itself
    @Mic92
    Mic92 authored May 21, 2017
    Copy the full SHA
    2f46a9c View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/tools/admin/google-cloud-sdk/default.nix
15 changes: 9 additions & 6 deletions pkgs/tools/admin/google-cloud-sdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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