b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #178624 from iAmMrinal0/update/google-cloud-sdk

Browse source
This commit is contained in:
Sandro 2022-08-18 21:31:23 +02:00 committed by GitHub
parent c3da217f14 52539e410c
commit 2d4758ed89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/tools/admin/google-cloud-sdk/data.nix
View file

@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "387.0.0";
version = "397.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86_64.tar.gz";
sha256 = "1hsp575xg7caxhldxmqxsds99mr0gs2qxgk7x7mr9jnjdq6nqmdg";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86_64.tar.gz";
sha256 = "1b7ggqc43xyszb583paky4gvph4ncvvwpdy1037dj1ckrd53bg00";
};
x86_64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-x86_64.tar.gz";
sha256 = "0qyd6z5clnd0slhsn9hc1xiic5rbssrps1n97jq94mv90rjp94jx";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-x86_64.tar.gz";
sha256 = "0iiyga7b4axkprif5gyqnr8sjkv9nap5lvabgfx5845br7hzr5ps";
};
aarch64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-arm.tar.gz";
sha256 = "0drxv1dzlnzmrs92j7a48iwvzfvdl9dl4hk688lj7cl51yndbyyz";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-arm.tar.gz";
sha256 = "102vw2f2q28c54hvn4hlp2da3zsib16z6hkz41079c1pmiybysi1";
};
aarch64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-arm.tar.gz";
sha256 = "0244k34lwj29smyds8qs7qdrvwwnvwh0v6giifbwzhlb40nw4k72";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-arm.tar.gz";
sha256 = "0hp60fpmsvhn046sp0wb52xszkmin5v235khbxb82wr0vsgnqd7z";
};
i686-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86.tar.gz";
sha256 = "0fb6qx1qjm9y013glinxdaf1x9ppwrb7szjx96maqb90zvq1jdcz";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz";
sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26";
};
};
}

12
pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
View file

@ -30,17 +30,15 @@ keep working.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
index 4330988d6..37424b841 100644
index 5975cb8f..b98e6721 100644
--- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py
+++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
@@ -352,7 +352,7 @@ def _AuthProvider(name='gcp',
@@ -396,7 +396,7 @@ def _AuthProvider(name='gcp',
if sdk_bin_path is None:
log.error(SDK_BIN_PATH_NOT_FOUND)
raise Error(SDK_BIN_PATH_NOT_FOUND)
- cmd_path = os.path.join(sdk_bin_path, bin_name)
+ cmd_path = bin_name
cfg = {
# Command for gcloud credential helper
--
2.21.0
try:
# Print warning if gke-gcloud-auth-plugin is not present or executable
_GetGkeGcloudPluginCommandAndPrintWarning()

2
pkgs/tools/admin/google-cloud-sdk/update.sh
View file

@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
VERSION="387.0.0"
VERSION="397.0.0"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"