diff options
author | Mrinal Purohit <github@mrinalpurohit.in> | 2022-10-09 18:34:05 +0530 |
---|---|---|
committer | Mrinal Purohit <github@mrinalpurohit.in> | 2022-10-09 18:34:05 +0530 |
commit | c83582e4490c5168f829a96b8156f899ee0423f6 (patch) | |
tree | cb34d98b0616a8df30df83e6e28f2e2dc0a8a9f5 | |
parent | 4ece171482c59763505f16ee753c8fed0b7e2c3f (diff) | |
download | nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar.gz nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar.bz2 nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar.lz nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar.xz nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.tar.zst nixpkgs-c83582e4490c5168f829a96b8156f899ee0423f6.zip |
google-cloud-sdk: 404.0.0 -> 405.0.0
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch | 36 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/components.json | 208 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/data.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 2 | ||||
-rwxr-xr-x | pkgs/tools/admin/google-cloud-sdk/update.sh | 2 |
5 files changed, 116 insertions, 154 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch deleted file mode 100644 index f92896e81c9..00000000000 --- a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/api_lib/sql/instances.py -index 0d88ffe..814a436 100644 ---- a/lib/googlecloudsdk/api_lib/sql/instances.py -+++ b/lib/googlecloudsdk/api_lib/sql/instances.py -@@ -85,18 +85,19 @@ def GetRegionFromZone(gce_zone): - def _GetCloudSqlProxyPath(): - """Determines the path to the cloud_sql_proxy binary.""" - sdk_bin_path = config.Paths().sdk_bin_path -- if not sdk_bin_path: -- # Check if cloud_sql_proxy is located on the PATH. -- proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') -- if proxy_path: -- log.debug( -- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) -- return proxy_path -- else: -- raise sql_exceptions.SqlProxyNotFound( -- 'A Cloud SQL Proxy SDK root could not be found. Please check your ' -- 'installation.') -- return os.path.join(sdk_bin_path, 'cloud_sql_proxy') -+ if sdk_bin_path and os.path.isfile(os.path.join(sdk_bin_path, 'cloud_sql_proxy')): -+ return os.path.join(sdk_bin_path, 'cloud_sql_proxy') -+ -+ # Check if cloud_sql_proxy is located on the PATH. -+ proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') -+ if proxy_path: -+ log.debug( -+ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) -+ return proxy_path -+ -+ raise sql_exceptions.SqlProxyNotFound( -+ 'A Cloud SQL Proxy SDK root could not be found. Please check your ' -+ 'installation.') - - - def _RaiseProxyError(error_msg=None): diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 40332cb9d04..d3eafa9edf7 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20220923141408.tar.gz", + "source": "components/google-cloud-sdk-alpha-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "2022.09.23" + "build_number": 20220930201803, + "version_string": "2022.09.30" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "f4aebdd247726881bb16c12d2b33ff09574282653ec6a39c6dfd41508351ed8d", - "contents_checksum": "8a2e935650c2dbc309e1f6fa72ec964fb80bfc2f8fa5164916fcce00dbc7eb47", - "size": 76738516, - "source": "components/google-cloud-sdk-app-engine-java-20220923141408.tar.gz", + "checksum": "935ed84f8d7ca546bbf21fc6a85fdcf0dfabdc7c3f886a3c157eb8b02171c265", + "contents_checksum": "12fad2a7773798f1eef38edfb2507eff6fd25f08eec8245910ac559229dad295", + "size": 67584086, + "source": "components/google-cloud-sdk-app-engine-java-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "2.0.8" + "build_number": 20220930201803, + "version_string": "2.0.9" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20220923141408.tar.gz", + "source": "components/google-cloud-sdk-beta-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "2022.09.23" + "build_number": 20220930201803, + "version_string": "2022.09.30" } }, { @@ -2546,10 +2546,10 @@ }, { "data": { - "checksum": "7c98eaacbee43daec9ba3ce54133657c6e49ce089310a2fc780de549c678d1c7", - "contents_checksum": "7f3e86a3cf39f484009dac34ee13b66fd389927cd4b71566df227d740f67f07b", - "size": 36712826, - "source": "components/google-cloud-sdk-cloud-datastore-emulator-20220805142045.tar.gz", + "checksum": "0516a23050318952db2359bb3950af4d4eddb7a7c534238e20b4607de2dc7260", + "contents_checksum": "3f74aca0e88d3fb73266886178fa9f30ea24a78850c57931b0a2b677bffbee83", + "size": 36755687, + "source": "components/google-cloud-sdk-cloud-datastore-emulator-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -2566,8 +2566,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2.2.2" + "build_number": 20220930201803, + "version_string": "2.3.0" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.4.5" + "version_string": "1.4.6" } }, { "data": { - "checksum": "f2e205c542b4ec2225791878a7fc350b33118b4d42183ca1103f0e392593a8e4", - "contents_checksum": "8101181c7cff6d3ffb98d2cc209f151dfc64944470957161129740ca1c9b00e2", - "size": 29784440, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20220923141408.tar.gz", + "checksum": "d8d510eb38ca16cb9355ffbfefd1a4ba82ecaeba1d19cdc879bde80b4c9b72fa", + "contents_checksum": "bd28112af13c452531d558952ed9d112e565625aceb060a93ef51f460338efaf", + "size": 30014629, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "1.4.5" + "build_number": 20220930201803, + "version_string": "1.4.6" } }, { @@ -3322,10 +3322,10 @@ }, { "data": { - "checksum": "9f400edfce1cdaed0c64868bf07c766a37c16586b8c562d1e4998b718779c736", - "contents_checksum": "1e78cf08ebac768823adaf54ad0079cc22c75da881f34d09f9fb8f9e81ddcce2", - "size": 26095678, - "source": "components/google-cloud-sdk-core-20220923141408.tar.gz", + "checksum": "3ccb0556448ce7ac0bec590eb8f647f2109627c1fd4dcee431dda0a1c34792e8", + "contents_checksum": "f3212c2c5405098dcbb40862b43ad80e83fd614dc6ba5f9741e015482d492ed5", + "size": 26174125, + "source": "components/google-cloud-sdk-core-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -3346,8 +3346,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "2022.09.23" + "build_number": 20220930201803, + "version_string": "2022.09.30" } }, { @@ -4339,10 +4339,10 @@ }, { "data": { - "checksum": "9c53b485c9da6befa0f4edc4e822fa33b78aee0918c768e6491d540c1eef9cc8", - "contents_checksum": "e0e0264b5a04d814ca438ccf03c5712ad6288198a29edd7ee1ae2ba3d1249d61", - "size": 5175748, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220923141408.tar.gz", + "checksum": "3505a7a9ed17f608c3f0e65ee283745f907f36777d54801bc1341ee033b61848", + "contents_checksum": "69dd4b8e7c66affa372cc5ca8b260c59314ed434e2bd432464067b0f74071e9b", + "size": 5191373, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -4367,7 +4367,7 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, + "build_number": 20220930201803, "version_string": "" } }, @@ -4955,10 +4955,10 @@ }, { "data": { - "checksum": "7856f8122d27e23899e913ba4fad9700ee6c2abafc9abcf487248ba2db57321c", - "contents_checksum": "8bc4e63305e3309718a8f77c23552d310b167cb9e636e42b69c2b44f7b3657dd", + "checksum": "48538845cb3a01474e0a9d03f51a341d20ebb047be66b7ab315f53bb636d7b39", + "contents_checksum": "54f36ba2462a11e21f1590513d99b3f3fc6483d30794f20d1db47e7f8b1dceb8", "size": 48204, - "source": "components/google-cloud-sdk-kubectl-20220923141408.tar.gz", + "source": "components/google-cloud-sdk-kubectl-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -4982,7 +4982,7 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20220923141408, + "build_number": 20220930201803, "version_string": "1.22.14" } }, @@ -5782,15 +5782,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.1.0" + "version_string": "0.2.0" } }, { "data": { - "checksum": "2d038a49773005dbca959451cb68376ee7350d5ef6ef203da00238bbc92ba3ba", - "contents_checksum": "43a1da489e8b9c536778d69bbcca31c3e26ac8e8adee8305c25b5ccd9d5bcfb5", - "size": 12250253, - "source": "components/google-cloud-sdk-log-streaming-darwin-arm-20220923141408.tar.gz", + "checksum": "d971209e1f301f8b30dcd4528fe3d2ae68f9eca83c70eb7ab13d52f6087e0b7b", + "contents_checksum": "b73a447da0a1d592dc509ff91b0fbda77f10e04ae09b3f352bb1306efc753ede", + "size": 12283924, + "source": "components/google-cloud-sdk-log-streaming-darwin-arm-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -5814,16 +5814,16 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "0.1.0" + "build_number": 20220930201803, + "version_string": "0.2.0" } }, { "data": { - "checksum": "2e24ef158bf59bc13e64305464923e34a3c5a22eebed42994fd8bd2262c8de4e", - "contents_checksum": "14a71125b30e23301f0a52ec57ecf1fa8cd84f0c972bcec5d8ab53fbd5bb2b82", - "size": 12632972, - "source": "components/google-cloud-sdk-log-streaming-darwin-x86_64-20220923141408.tar.gz", + "checksum": "833f9fdab313c08665540bc5d2401724a9ed9ebc35041921efa2915702a8f0c7", + "contents_checksum": "77edf55ef147187bf69c36519d860ef55e30ec52eb5ba5fd5a9bf7af56b106c3", + "size": 12659152, + "source": "components/google-cloud-sdk-log-streaming-darwin-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -5847,16 +5847,16 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "0.1.0" + "build_number": 20220930201803, + "version_string": "0.2.0" } }, { "data": { - "checksum": "eb647953fb3921dbe63f2b5d642a524d4cca2212ef4235ac037d7622b6686521", - "contents_checksum": "8a83ad4a79e8269b11fc4f8b279f8e97c7a6318d4236663e166219fb76e7ae8d", - "size": 12118626, - "source": "components/google-cloud-sdk-log-streaming-linux-arm-20220923141408.tar.gz", + "checksum": "da3a490d1939a28ab2ca3ed22f9f8f6fb8e87d6194b79a226234c393dc2da60c", + "contents_checksum": "31d16602cd0af921ca4478572901f3654238614fc0166011f8f9d3631fdac588", + "size": 12145500, + "source": "components/google-cloud-sdk-log-streaming-linux-arm-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -5880,16 +5880,16 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "0.1.0" + "build_number": 20220930201803, + "version_string": "0.2.0" } }, { "data": { - "checksum": "c422d2a99e2354b6cf57717eeb33c39af64d458ea023909aeac65d8cf3a35991", - "contents_checksum": "bfecc7629c23e684ac4638b9ea54b887f31c5ffbbf62f42153915e133085da23", - "size": 14329668, - "source": "components/google-cloud-sdk-log-streaming-linux-x86_64-20220923141408.tar.gz", + "checksum": "1043b0c2801231d8f3786b6c5c1707fff8836e58f73b54328386ea0cad0ae2d3", + "contents_checksum": "a21494058aac658ec839de095acfecc0fb60392fbe01a5f39b77003b32928a80", + "size": 14359110, + "source": "components/google-cloud-sdk-log-streaming-linux-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -5913,16 +5913,16 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "0.1.0" + "build_number": 20220930201803, + "version_string": "0.2.0" } }, { "data": { - "checksum": "4f183757d5f71b19f2894dd357ead27a5cfc2463912e6fa2221521844e235cf4", - "contents_checksum": "10e1197c43d20fb5b3a53fa79b04323f7eaa42afb6e15fac35799f7de00be2eb", - "size": 12777192, - "source": "components/google-cloud-sdk-log-streaming-windows-x86_64-20220923141408.tar.gz", + "checksum": "cd74cd40547b6900fd30cd8d65c223fa0ca82c480d8795bd3577a655a6ed78fa", + "contents_checksum": "ab598f32f2ea987c4022fba99796e8a511fba8f1b87054727ed4bb97ab3ac66b", + "size": 12805415, + "source": "components/google-cloud-sdk-log-streaming-windows-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -5946,8 +5946,8 @@ }, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "0.1.0" + "build_number": 20220930201803, + "version_string": "0.2.0" } }, { @@ -6761,15 +6761,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.7.0" + "version_string": "0.8.0" } }, { "data": { - "checksum": "df4969bf88bcde124ccf58e3ea4f6c2856c3628a531e6873715dde4be033eed4", - "contents_checksum": "9e328cb6ada661dfb677c6e0568ae2298f0e59f21abbc63af33c30f569173245", - "size": 53471027, - "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20220826172526.tar.gz", + "checksum": "1af17af4f14968cfe08746e242b1372e813d6e26c5b44f883e0f75bbb222aa99", + "contents_checksum": "4935394ebd0bd00400c1a942255cb4cf471957825c9f4b8ee0cecccb13b7a105", + "size": 54037009, + "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -6793,16 +6793,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "0.7.0" + "build_number": 20220930201803, + "version_string": "0.8.0" } }, { "data": { - "checksum": "086f3d5c07cd656955422e74991555cc05e275d6e28f05f653ce16eeea81efd9", - "contents_checksum": "b4602929326859a98701b70ee6c9ba7d71b3af98fbdf02a881e1e983c1d377dd", - "size": 55622301, - "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20220826172526.tar.gz", + "checksum": "b8fb240838ed340c9ee5a0c40701a891851501599eb66f0ba424f9d654442be1", + "contents_checksum": "6ac3b7cc4d673de46c3f16e7b34235c95eb4c2d88cf4edc5c48b19eb9ab0f953", + "size": 56276984, + "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -6826,8 +6826,8 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "0.7.0" + "build_number": 20220930201803, + "version_string": "0.8.0" } }, { @@ -6865,10 +6865,10 @@ }, { "data": { - "checksum": "c78defd4007e3b3a1a87a5779b39d71145f6fc8fa86de5eec158caa28bb2607a", - "contents_checksum": "4298021866825f156ea46eb5db6dda3a2046fb3553c68a1813fd430e1126b4fc", - "size": 55278996, - "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20220826172526.tar.gz", + "checksum": "4627d1c93aa93e25fdb09768d135f52f66f8fdce026c3593d51af07abd6a4c1b", + "contents_checksum": "d3193e52e87303dc02628eadea9957bc455330aa7126bb9840ba4f5a64b290f0", + "size": 55917881, + "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -6892,16 +6892,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "0.7.0" + "build_number": 20220930201803, + "version_string": "0.8.0" } }, { "data": { - "checksum": "49f3e027472ae1ce14955e7a03847900a5fa25a75ec6dac9728aefa17441b0ef", - "contents_checksum": "986d2f4894422b26c9932507e91c656b7f264c55a544f7c1656e9a4a75ef4bd8", - "size": 55295288, - "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20220826172526.tar.gz", + "checksum": "35b38bb613a2ed5b1655e2f630d19c10bdce079d68dbb5eeb7f2b24beceb1403", + "contents_checksum": "155512a9cd59aa3aa041e6daf1f46cef6a9cd94c6712d996a10697509d938eae", + "size": 55923018, + "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -6925,16 +6925,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "0.7.0" + "build_number": 20220930201803, + "version_string": "0.8.0" } }, { "data": { - "checksum": "6e094c6fb35304bded5f23069152591bfeff44a53e263a09f2412dd193b86844", - "contents_checksum": "55b77011bbfe6163f84c590d8ae3b8f122a640024aa6c872ced74d0bdcc2f1e7", - "size": 36483380, - "source": "components/google-cloud-sdk-tests-20220923141408.tar.gz", + "checksum": "06e9626a4021b584bffa291943ee776759ea31fc3ca41c07eca5fe5ddb96567e", + "contents_checksum": "421c39a9249a3d555556ab491d77fdef1125f804d3db1d1068474be00aad49b2", + "size": 36530733, + "source": "components/google-cloud-sdk-tests-20220930201803.tar.gz", "type": "tar" }, "dependencies": [ @@ -6951,8 +6951,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220923141408, - "version_string": "2022.09.23" + "build_number": 20220930201803, + "version_string": "2022.09.30" } } ], @@ -6971,11 +6971,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20220923141408, + "revision": 20220930201803, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "404.0.0" + "version": "405.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 8a0c6ce570f..810a0b59fbf 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "404.0.0"; + version = "405.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86_64.tar.gz"; - sha256 = "0s2qr7krzd9z6s2i00qksxnxd1fcp318gxg8fm46rgh2r482k2k5"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-x86_64.tar.gz"; + sha256 = "07vy2driy3484g8k4kq7w7da37wqvp357nzdqcnk2rdxd7jm8pq0"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-x86_64.tar.gz"; - sha256 = "11kzzny8a3xs1lijwwkv60qnmcxbfgzpmrdcqbcf6957b5ml6rsl"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-darwin-x86_64.tar.gz"; + sha256 = "1k8fa1hgs1iircqkvq2m4v394p315ii0g6ij851vxmha06fn0mf3"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-arm.tar.gz"; - sha256 = "11yzs4cc9cn8xwv51mc2qmx84nbvv1zragsdy38wrmfpd5m27jx3"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-arm.tar.gz"; + sha256 = "0qxyi93q7xxxvjj2nrdc1bh47rravi6ah13bscaami2fw1xc6w4s"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-arm.tar.gz"; - sha256 = "03bc1hk3blky9x8wf3lhpblxv1zyq23wimzwd7bb00h35935x449"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-darwin-arm.tar.gz"; + sha256 = "133hr5qlp07whzm640mr87z29gcx51pxnm4gqbknwaz2kfw5m4d5"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86.tar.gz"; - sha256 = "0zhx9xbp090acdxlii7m94j792nlbvl4agjy35q1z8pi45hc7nl9"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-x86.tar.gz"; + sha256 = "0qxcs4pxv3vjc3na54yzqhc12gxbi9w80rb1nvxn6r39v8d195hk"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 356867b421a..8b70e1f07ff 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -42,8 +42,6 @@ in stdenv.mkDerivation rec { ./gcloud-path.patch # Disable checking for updates for the package ./gsutil-disable-updates.patch - # Try to use cloud_sql_proxy from SDK only if it actually exists, otherwise, search for one in PATH - ./cloud_sql_proxy_path.patch ]; installPhase = '' diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index 114342010f6..fab2457466e 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="404.0.0" +VERSION="405.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" |