From bdfaf83f76f20b21e45433a9163a60b643f8a6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Mar 2021 16:21:18 +0100 Subject: [PATCH] pythonPackages.google-api-python-client: normalize package name --- pkgs/applications/audio/tuijam/default.nix | 2 +- pkgs/applications/misc/gcalcli/default.nix | 2 +- .../networking/instant-messengers/blink/default.nix | 2 +- pkgs/applications/networking/lieer/default.nix | 2 +- pkgs/development/python-modules/beancount/default.nix | 4 ++-- pkgs/development/python-modules/gdrivefs/default.nix | 4 ++-- pkgs/development/python-modules/goobook/default.nix | 4 ++-- .../development/python-modules/oauthenticator/default.nix | 4 ++-- pkgs/development/python-modules/pydrive/default.nix | 4 ++-- pkgs/development/python-modules/weboob/default.nix | 4 ++-- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 8 ++++---- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix index 4a215528b7c..d9b9012521c 100644 --- a/pkgs/applications/audio/tuijam/default.nix +++ b/pkgs/applications/audio/tuijam/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ gmusicapi - google_api_python_client + google-api-python-client mpv pydbus pygobject3 diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 20aefe2ab1d..e19e89ec6c0 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ dateutil gflags httplib2 parsedatetime six vobject - google_api_python_client oauth2client uritemplate + google-api-python-client oauth2client uritemplate libnotify ] ++ lib.optional (!isPy3k) futures; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 7ed3b167383..3ee835610f7 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -22,7 +22,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { cjson sipsimple twisted - google_api_python_client + google-api-python-client ]; buildInputs = [ diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 3ad2762a2cf..420b9b28ccf 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ notmuch oauth2client - google_api_python_client + google-api-python-client tqdm setuptools ]; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 29d676ad62a..2c4f495a7ff 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -6,7 +6,7 @@ , bottle , chardet , dateutil -, google_api_python_client +, google-api-python-client , lxml , oauth2client , ply @@ -34,7 +34,7 @@ buildPythonPackage rec { bottle chardet dateutil - google_api_python_client + google-api-python-client lxml oauth2client ply diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 6060dc3a5bb..836fdee4beb 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -8,7 +8,7 @@ , six , dateutil , fusepy -, google_api_python_client +, google-api-python-client }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google_api_python_client ]; + propagatedBuildInputs = [ dateutil fusepy google-api-python-client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index 83175b6c86a..42e2b84783f 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , docutils, installShellFiles -, google_api_python_client, simplejson, oauth2client, setuptools, xdg +, google-api-python-client, simplejson, oauth2client, setuptools, xdg }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ docutils installShellFiles ]; propagatedBuildInputs = [ - google_api_python_client simplejson oauth2client setuptools xdg + google-api-python-client simplejson oauth2client setuptools xdg ]; postInstall = '' diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 234c4edd1ae..839582e87f0 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, google_api_python_client +, google-api-python-client , google-auth-oauthlib , jupyterhub , mwoauth @@ -29,7 +29,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "oauthenticator/tests" ]; checkInputs = [ - google_api_python_client + google-api-python-client google-auth-oauthlib mwoauth pyjwt diff --git a/pkgs/development/python-modules/pydrive/default.nix b/pkgs/development/python-modules/pydrive/default.nix index aa0515323e2..5d1fc187c9f 100644 --- a/pkgs/development/python-modules/pydrive/default.nix +++ b/pkgs/development/python-modules/pydrive/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, google_api_python_client +, google-api-python-client , oauth2client , pyyaml }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_api_python_client + google-api-python-client oauth2client pyyaml ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 7c3d25068e3..861cb38389a 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -6,7 +6,7 @@ , futures , gdata , gnupg -, google_api_python_client +, google-api-python-client , html2text , libyaml , lxml @@ -56,7 +56,7 @@ buildPythonPackage rec { feedparser gdata gnupg - google_api_python_client + google-api-python-client html2text libyaml lxml diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bc9768a7345..acd274ab07e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -309,7 +309,7 @@ "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; + "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3dacdf4285..a8abeee52a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2655,12 +2655,12 @@ in { google-api-core = callPackage ../development/python-modules/google-api-core { }; - google_api_python_client = - let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + google-api-python-client = + let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; in if isPy3k then - google_api_python_client + google-api-python-client else # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google_api_python_client.overridePythonAttrs (old: rec { + google-api-python-client.overridePythonAttrs (old: rec { version = "1.7.6"; src = old.src.override { inherit version;