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

python.pkgs.google_api_python_client: conditionally override for python2.7

Browse Source
This commit is contained in:
worldofpeace 2019-03-14 13:37:17 -04:00 committed by Robert Schütz
parent 72679615a1
commit fb2af2a574
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/python-modules/google-api-python-client/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "google-api-python-client";
version = "1.7.8";
#disabled = !isPy3k; # TODO: Python 2.7 was deprecated but weboob still depends on it.
src = fetchPypi {
inherit pname version;

15
pkgs/development/python-modules/weboob/default.nix
View File

@ -6,18 +6,7 @@
, unidecode
}:
let
# Support for Python 2.7 was dropped in 1.7.7
google_api_python_client_python27 = google_api_python_client.overrideDerivation
(oldAttrs: rec {
pname = "google-api-python-client";
version = "1.7.6";
src = fetchPypi {
inherit pname version;
sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
};
});
in buildPythonPackage rec {
buildPythonPackage rec {
pname = "weboob";
version = "1.3";
disabled = ! isPy27;
@ -49,7 +38,7 @@ in buildPythonPackage rec {
propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml
simplejson cssselect futures pdfminer termcolor
google_api_python_client_python27 html2text unidecode ];
google_api_python_client html2text unidecode ];
checkPhase = ''
nosetests

12
pkgs/top-level/python-packages.nix
View File

@ -2685,7 +2685,17 @@ in {
google_api_core = callPackage ../development/python-modules/google_api_core { };
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 else
# Python 2.7 support was deprecated but is still needed by weboob
google_api_python_client.overridePythonAttrs (old: rec {
version = "1.7.6";
src = old.src.override {
inherit version;
sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
};
});
google_apputils = callPackage ../development/python-modules/google_apputils { };