summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-07-28 12:59:30 +0000
committerGitHub <noreply@github.com>2021-07-28 12:59:30 +0000
commitd905ae22c60cafa7f94938c639d4518e1ddddcfa (patch)
tree7ca0cd1da3c774224a4043678b1d57fe0587e6fe
parentcb12f0cd037dc79aa0a3f4d67a4b48b6e904720d (diff)
parenta5e8f4817fa6fd3526e72120aeba22b1279d80a7 (diff)
downloadnixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar.gz
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar.bz2
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar.lz
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar.xz
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.tar.zst
nixpkgs-d905ae22c60cafa7f94938c639d4518e1ddddcfa.zip
Merge pull request #131752 from iAmMrinal0/update/google-cloud-sdk
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch6
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix8
2 files changed, 7 insertions, 7 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
index aec4be2ec19..f92896e81c9 100644
--- a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch
+++ b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch
@@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap
 index 0d88ffe..814a436 100644
 --- a/lib/googlecloudsdk/api_lib/sql/instances.py
 +++ b/lib/googlecloudsdk/api_lib/sql/instances.py
-@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone):
+@@ -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
@@ -14,7 +14,7 @@ index 0d88ffe..814a436 100644
 -          'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
 -      return proxy_path
 -    else:
--      raise exceptions.ToolException(
+-      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')
@@ -28,7 +28,7 @@ index 0d88ffe..814a436 100644
 +        'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
 +    return proxy_path
 +
-+  raise exceptions.ToolException(
++  raise sql_exceptions.SqlProxyNotFound(
 +      'A Cloud SQL Proxy SDK root could not be found. Please check your '
 +      'installation.')
  
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index f461a5c30ed..924c6c745ce 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,23 +21,23 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs";
+      sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk";
     };
 
     aarch64-darwin = {
       url = "${baseUrl}/${name}-darwin-arm.tar.gz";
-      sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr";
+      sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3";
+      sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "348.0.0";
+  version = "350.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);