From 46dd27e02594bf868922f16d5aba8cbb661382b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 5 Jan 2019 22:42:48 +0100 Subject: [PATCH] pythonPackages.gcutil: Deprecate the package The package doesn't exist anymore (even the deprecation notice is gone [0]) and the build is currently broken: Collecting google-apputils==0.4.1 (from gcutil==1.16.1) Could not find a version that satisfies the requirement google-apputils==0.4.1 (from gcutil==1.16.1) (from versions: ) No matching distribution found for google-apputils==0.4.1 (from gcutil==1.16.1) [0]: https://download.huihoo.com/google/gdgdevkit/DVD1/developers.google.com/compute/docs/gcutil.1.html > "Warning: gcutil is deprecated. We encourage you to transition to > using gcloud compute ." --- .../python-modules/gcutil/default.nix | 41 ------------------- pkgs/top-level/python-packages.nix | 6 ++- 2 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/gcutil/default.nix diff --git a/pkgs/development/python-modules/gcutil/default.nix b/pkgs/development/python-modules/gcutil/default.nix deleted file mode 100644 index 85c0fbb4d60..00000000000 --- a/pkgs/development/python-modules/gcutil/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchurl -, gflags -, iso8601 -, ipaddr -, httplib2 -, google_apputils -, google_api_python_client -, isPy3k -}: - -buildPythonPackage rec { - name = "gcutil-1.16.1"; - disabled = isPy3k; - - src = fetchurl { - url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; - sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; - }; - - propagatedBuildInputs = [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ]; - - prePatch = '' - sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py - substituteInPlace setup.py \ - --replace "httplib2==0.8" "httplib2" \ - --replace "iso8601==0.1.4" "iso8601" \ - --replace "ipaddr==2.1.10" "ipaddr" \ - --replace "google-api-python-client==1.2" "google-api-python-client" \ - --replace "python-gflags==2.0" "python-gflags" - ''; - - meta = with stdenv.lib; { - description = "Command-line tool for interacting with Google Compute Engine"; - homepage = "https://cloud.google.com/compute/docs/gcutil/"; - license = licenses.asl20; - maintainers = with maintainers; [ phreedom ]; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 665c0a59f7c..697ebc3b508 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1732,7 +1732,11 @@ in { gateone = callPackage ../development/python-modules/gateone { }; - gcutil = callPackage ../development/python-modules/gcutil { }; + # TODO: Remove after 19.03 is branched off: + gcutil = throw '' + pythonPackages.gcutil is deprecated and can be replaced with "gcloud + compute" from the package google-cloud-sdk. + ''; GeoIP = callPackage ../development/python-modules/GeoIP { };