Unverified Commit 1c7635ce authored by Marcus Ramberg's avatar Marcus Ramberg Committed by GitHub
Browse files

google-cloud-sdk: 501.0.0 -> 506.0.0 (#375140)

parents cc6fd182 610753a1

pkgs/tools/admin/google-cloud-sdk/components.json

+222 −195

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/admin/google-cloud-sdk/data.nix

+11 −11
Original line number Diff line number Diff line 
# DO NOT EDIT! This file is generated automatically by update.sh

{ }:

{

  version = "501.0.0";

  version = "506.0.0";

  googleCloudSdkPkgs = {

    x86_64-linux = {

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-501.0.0-linux-x86_64.tar.gz";

      sha256 = "1naswkfjjmmhb6n3zsma246pang3cnadwqgi683fimznmcc228sa";

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-506.0.0-linux-x86_64.tar.gz";

      sha256 = "0mc8mbqgg3mrid7xvyhhlcmwpi35d887fad3avbbffd4xf9l6spz";

    };

    x86_64-darwin = {

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-501.0.0-darwin-x86_64.tar.gz";

      sha256 = "1k5is68s6y6bxmq8mhdsd2pfqw0rx9maakqis7wxnzvfpwdmamqc";

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-506.0.0-darwin-x86_64.tar.gz";

      sha256 = "1mvhynl775jv1x59b60ka1bz8jnb3cr96mck678xc03wr8vqb1ds";

    };

    aarch64-linux = {

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-501.0.0-linux-arm.tar.gz";

      sha256 = "1926lc0wbf06qwm0936jj3l98j82d6llljwsly99yrqwyfibi0h0";

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-506.0.0-linux-arm.tar.gz";

      sha256 = "16yg58ijb89hfn5sg7bdayh3dj9xcvv318r9bil3qy2g1h3m8373";

    };

    aarch64-darwin = {

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-501.0.0-darwin-arm.tar.gz";

      sha256 = "19zjb4l067q81jg4djv4x1l95scdbk4kp3bj3dxm1rxaz3ik0jcl";

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-506.0.0-darwin-arm.tar.gz";

      sha256 = "0hpv0z4hg1rbgac8vpayxfgl2xxlp63yyk78b6qjfnwcnpv0v98m";

    };

    i686-linux = {

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-501.0.0-linux-x86.tar.gz";

      sha256 = "03vggxqfml0hl7jyjcmp51c5vw88d5zrsc18782rb533dd586g0n";

      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-506.0.0-linux-x86.tar.gz";

      sha256 = "1bbjvcg2smnh19985g9zc8cjgm6dnkpg5wvnspz7hvjdr1c5qqc8";

    };

  };

}

pkgs/tools/admin/google-cloud-sdk/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec { 
    ./gcloud-path.patch

    # Disable checking for updates for the package

    ./gsutil-disable-updates.patch

    # Revert patch including extended Python version constraint

    ./gsutil-revert-version-constraint.patch

  ];



  installPhase = ''

pkgs/tools/admin/google-cloud-sdk/gsutil-revert-version-constraint.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff --git a/platform/gsutil/gsutil.py b/platform/gsutil/gsutil.py

index 30b8a5ac..a02f0ba5 100755

--- a/platform/gsutil/gsutil.py

+++ b/platform/gsutil/gsutil.py

@@ -27,14 +27,8 @@ import warnings

 # TODO: gsutil-beta: Distribute a pylint rc file.

 

 ver = sys.version_info

-if (ver.major == 2 and ver.minor < 7) or (ver.major == 3 and (ver.minor < 5 or ver.minor > 11)):

-  sys.exit(

-    "Error: gsutil requires Python version 2.7 or 3.5-3.11, but a different version is installed.\n"

-    "You are currently running Python {}.{}\n"

-    "Follow the steps below to resolve this issue:\n"

-    "\t1. Switch to Python 3.5-3.11 using your Python version manager or install an appropriate version.\n"

-    "\t2. If you are unsure how to manage Python versions, visit [https://cloud.google.com/storage/docs/gsutil_install#specifications] for detailed instructions.".format(ver.major, ver.minor)

-  )

+if (ver.major == 2 and ver.minor < 7) or (ver.major == 3 and ver.minor < 5):

+  sys.exit('gsutil requires python 2.7 or 3.5+.')

 

 # setup a string to load the correct httplib2

 if sys.version_info.major == 2:

pkgs/tools/admin/google-cloud-sdk/update.sh

+9 −9
Original line number Diff line number Diff line
@@ -27,19 +27,19 @@ function genMainSrc() { 
  googleCloudSdkPkgs = {

EOF



    echo "    x86_64-linux ="

    echo -n "    x86_64-linux ="

    genMainSrc "linux" "x86_64"



    echo "    x86_64-darwin ="

    echo -n "    x86_64-darwin ="

    genMainSrc "darwin" "x86_64"



    echo "    aarch64-linux ="

    echo -n "    aarch64-linux ="

    genMainSrc "linux" "arm"



    echo "    aarch64-darwin ="

    echo -n "    aarch64-darwin ="

    genMainSrc "darwin" "arm"



    echo "    i686-linux ="

    echo -n "    i686-linux ="

    genMainSrc "linux" "x86"



    echo "  };"