alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

google-cloud-sdk: 161.0.0 -> 171.0.0

Browse source
This commit is contained in:
Nikolay Amiantov 2017-09-17 08:21:02 +03:00
parent 67bbe467a4
commit b241bcf388
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,33 +1,33 @@
{stdenv, fetchurl, python27, python27Packages, makeWrapper}:
with python27Packages;
{ stdenv, lib, fetchurl, python, cffi, cryptography, pyopenssl, crcmod, google-compute-engine, makeWrapper }:
# other systems not supported yet
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
let
pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ];
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
name = "google-cloud-sdk-${version}";
version = "161.0.0";
version = "171.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 = "43a78a9d2c3ee9d9e50200b1e90512cd53ded40b56e05effe31fe9847b1bdd4c";
sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb";
}
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 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323";
sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298";
}
else
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e";
sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5";
};
buildInputs = [python27 makeWrapper];
buildInputs = [ python makeWrapper ];
phases = [ "installPhase" "fixupPhase" ];
@ -46,16 +46,13 @@ stdenv.mkDerivation rec {
programPath="$out/google-cloud-sdk/bin/$program"
binaryPath="$out/bin/$program"
wrapProgram "$programPath" \
--set CLOUDSDK_PYTHON "${python27}/bin/python" \
--prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
--set CLOUDSDK_PYTHON "${python}/bin/python" \
--prefix PYTHONPATH : "${pythonPath}"
mkdir -p $out/bin
ln -s $programPath $binaryPath
done
# install man pages
mv "$out/google-cloud-sdk/help/man" "$out"
# setup bash completion
mkdir -p "$out/etc/bash_completion.d/"
mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc"
@ -68,11 +65,10 @@ stdenv.mkDerivation rec {
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 = licenses.free;
homepage = https://cloud.google.com/sdk/;
maintainers = with maintainers; [stephenmw zimbatm];
platforms = with platforms; linux ++ darwin;
homepage = "https://cloud.google.com/sdk/";
maintainers = with maintainers; [ stephenmw zimbatm ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -2301,7 +2301,7 @@ with pkgs;
google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
google-cloud-sdk = python2.pkgs.google-cloud-sdk;
google-fonts = callPackage ../data/fonts/google-fonts { };

2
pkgs/top-level/python-packages.nix
View file

@ -5849,6 +5849,8 @@ in {
};
};
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
googlecl = buildPythonPackage rec {