pyrox.dev
Merge pull request #31709 from ilya-kolpakov/google-cloud-sdk-fix
google-cloud-sdk: disable gce as a dependency by default (fixes #31369)
authored by
+17
-6
pkgs/tools/admin/google-cloud-sdk/default.nix
+17
-6
pkgs/tools/admin/google-cloud-sdk/default.nix
···
1
-
{ stdenv, lib, fetchurl, python, cffi, cryptography, pyopenssl, crcmod, google-compute-engine, makeWrapper }:
2
3
-
# other systems not supported yet
4
let
5
-
pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ];
6
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
7
8
sources = name: system: {
9
i686-linux = {
10
-
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
11
sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp";
12
};
13
14
x86_64-darwin = {
15
-
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
16
sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g";
17
};
18
19
x86_64-linux = {
20
-
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
21
sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc";
22
};
23
}.${system};
···
1
+
# Make sure that the "with-gce" flag is set when building `google-cloud-sdk`
2
+
# for GCE hosts. This flag prevents "google-compute-engine" from being a
3
+
# default dependency which is undesirable because this package is
4
+
#
5
+
# 1) available only on GNU/Linux (requires `systemd` in particular)
6
+
# 2) intended only for GCE guests (and is useless elsewhere)
7
+
# 3) used by `google-cloud-sdk` only on GCE guests
8
+
#
9
+
10
+
{ stdenv, lib, fetchurl, makeWrapper, python, cffi, cryptography, pyopenssl,
11
+
crcmod, google-compute-engine, with-gce ? false }:
12
13
let
14
+
pythonInputs = [ cffi cryptography pyopenssl crcmod ]
15
+
++ lib.optional (with-gce) google-compute-engine;
16
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
17
18
+
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
19
sources = name: system: {
20
i686-linux = {
21
+
url = "${baseUrl}/${name}-linux-x86.tar.gz";
22
sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp";
23
};
24
25
x86_64-darwin = {
26
+
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
27
sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g";
28
};
29
30
x86_64-linux = {
31
+
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
32
sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc";
33
};
34
}.${system};
+1
pkgs/top-level/all-packages.nix
+1
pkgs/top-level/all-packages.nix
+1
pkgs/top-level/python-packages.nix
+1
pkgs/top-level/python-packages.nix