diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 89c7c6b8df8..291d038258f 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -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; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index a3d06a248c3..26eca0d24cc 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -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; @@ -40,21 +29,16 @@ in buildPythonPackage rec { }; p' weboob/browser/browsers.py weboob/browser/pages.py ''; - # Would fail with `Could not find executable: pyuic5`. - # That executable will be looked up from an environment variable - # in this format when available - # - # See: https://git.weboob.org/weboob/weboob/blob/1.3/setup.py#L32 - PYUIC5_EXECUTABLE = "${pyqt5}/bin/pyuic5"; - setupPyBuildFlags = ["--qt" "--xdg"]; checkInputs = [ nose ]; + nativeBuildInputs = [ pyqt5 ]; + 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a837bca465..5045aaa9255 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2689,7 +2689,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 { };