Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c6e60578b6d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9fa2a21ba46d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 15, 2019

  1. pythonPackages.weboob: add pyqt5 as native input 

    Didn't notice it wasn't there. This should make it so we
don't have to set the environment variable anymore.

(cherry picked from commit 7267961)
    @worldofpeace
    worldofpeace authored and Robert Schütz committed Mar 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    497b023 View commit details

  2. python.pkgs.google_api_python_client: conditionally override for pyth… 

    …on2.7

(cherry picked from commit fb2af2a)
    @worldofpeace
    worldofpeace authored and Robert Schütz committed Mar 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9fa2a21 View commit details
1 change: 0 additions & 1 deletion pkgs/development/python-modules/google-api-python-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
24 changes: 4 additions & 20 deletions pkgs/development/python-modules/weboob/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
12 changes: 11 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2655,7 +2655,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 { };