JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31709 from ilya-kolpakov/google-cloud-sdk-fix

Browse Source 
google-cloud-sdk: disable gce as a dependency by default (fixes #31369)
This commit is contained in:
zimbatm 2017-11-16 14:36:35 +00:00 committed by GitHub
commit 2d95a6ab22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -1,23 +1,34 @@
{ stdenv, lib, fetchurl, python, cffi, cryptography, pyopenssl, crcmod, google-compute-engine, makeWrapper }:
# Make sure that the "with-gce" flag is set when building `google-cloud-sdk`
# for GCE hosts. This flag prevents "google-compute-engine" from being a
# default dependency which is undesirable because this package is
#
# 1) available only on GNU/Linux (requires `systemd` in particular)
# 2) intended only for GCE guests (and is useless elsewhere)
# 3) used by `google-cloud-sdk` only on GCE guests
#
{ stdenv, lib, fetchurl, makeWrapper, python, cffi, cryptography, pyopenssl,
crcmod, google-compute-engine, with-gce ? false }:
# other systems not supported yet
let
pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ];
pythonInputs = [ cffi cryptography pyopenssl crcmod ]
++ lib.optional (with-gce) google-compute-engine;
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
sources = name: system: {
i686-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
url = "${baseUrl}/${name}-linux-x86.tar.gz";
sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp";
};
x86_64-darwin = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g";
};
x86_64-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc";
};
}.${system};

1
pkgs/top-level/all-packages.nix
View File

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

1
pkgs/top-level/python-packages.nix
View File

@ -5445,6 +5445,7 @@ in {
};
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
google-cloud-sdk-gce = callPackage ../tools/admin/google-cloud-sdk { with-gce=true; };
google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };