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

google-cloud-sdk: remove from python-modules

Browse Source 
It is not a python module just an application using/based on python.
This commit is contained in:
Andreas Rammhold 2019-09-09 15:36:26 +02:00
parent 4fdbdcede0
commit e023b3b1d9
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,13 +7,15 @@
# 3) used by `google-cloud-sdk` only on GCE guests # 3) used by `google-cloud-sdk` only on GCE guests
# #
{ stdenv, lib, fetchurl, makeWrapper, python, cffi, cryptography, pyopenssl, { stdenv, lib, fetchurl, makeWrapper, python, with-gce ? false }:
crcmod, google-compute-engine, with-gce ? false }:
let let
pythonInputs = [ cffi cryptography pyopenssl crcmod ] pythonEnv = python.withPackages (p: with p; [
++ lib.optional (with-gce) google-compute-engine; cffi
pythonEnv = python.withPackages (_: pythonInputs); cryptography
pyopenssl
crcmod
] ++ lib.optional (with-gce) google-compute-engine);
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads"; baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
sources = name: system: { sources = name: system: {

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

@ -3505,8 +3505,8 @@ in
google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
google-cloud-sdk = python2.pkgs.google-cloud-sdk; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
google-cloud-sdk-gce = python2.pkgs.google-cloud-sdk-gce; google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; };
google-fonts = callPackage ../data/fonts/google-fonts { }; google-fonts = callPackage ../data/fonts/google-fonts { };

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

@ -2376,9 +2376,6 @@ in {
python-gitlab = callPackage ../development/python-modules/python-gitlab { }; python-gitlab = callPackage ../development/python-modules/python-gitlab { };
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 { }; google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
google-music = callPackage ../development/python-modules/google-music { }; google-music = callPackage ../development/python-modules/google-music { };