public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-06 06:16:57 +00:00
committed by GitHub
parent 73a617ffa9 6aa26c8623
commit 860fd89a37
71 changed files with 2342 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+5 -5
View File
@@ -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;
@@ -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 { };