From ba5b0e244590c3f1c47dd14524d89e43039e0342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Mar 2021 16:20:42 +0100 Subject: [PATCH] pythonPackages.googleapis-common-protos: normalise package name --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- .../default.nix | 0 .../development/python-modules/grpc_google_iam_v1/default.nix | 4 ++-- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{googleapis_common_protos => googleapis-common-protos}/default.nix (100%) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 74d74d51c49..5c684ca126e 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-auth -, googleapis_common_protos +, googleapis-common-protos , grpcio , protobuf , pytz @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - googleapis_common_protos + googleapis-common-protos google-auth grpcio protobuf diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix similarity index 100% rename from pkgs/development/python-modules/googleapis_common_protos/default.nix rename to pkgs/development/python-modules/googleapis-common-protos/default.nix diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index 7291cd4b65e..9a74206f02e 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , grpcio -, googleapis_common_protos +, googleapis-common-protos , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72"; }; - propagatedBuildInputs = [ grpcio googleapis_common_protos ]; + propagatedBuildInputs = [ grpcio googleapis-common-protos ]; # non-standard test format, and python3 will load local google folder first # but tests cannot be ran if google folder is removed or moved diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index cc9444098de..4784dcdfa2f 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , protobuf -, googleapis_common_protos +, googleapis-common-protos , pytestCheckHook , pytz }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ protobuf ]; - checkInputs = [ pytestCheckHook pytz googleapis_common_protos ]; + checkInputs = [ pytestCheckHook pytz googleapis-common-protos ]; pythonImportsCheck = [ "proto" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc77de9a88d..d3dacdf4285 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2668,7 +2668,7 @@ in { }; }); - googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; google-apputils = callPackage ../development/python-modules/google-apputils { };