From ad7ab4344865b2fb3cd00aea2b949f543c1dd7f6 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Sat, 2 Sep 2017 19:00:14 +0100
Subject: [PATCH] pythonPackages.weboob: 1.1 -> 1.3

---
 .../python-modules/weboob/default.nix         | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +---------
 2 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/weboob/default.nix

diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix
new file mode 100644
index 000000000000..b71e4d3a4fff
--- /dev/null
+++ b/pkgs/development/python-modules/weboob/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage, fetchurl, stdenv, isPy27
+, nose, pillow, prettytable, pyyaml, dateutil, gdata
+, requests, mechanize, feedparser, lxml, gnupg, pyqt5
+, libyaml, simplejson, cssselect, futures, pdfminer
+, termcolor, google_api_python_client, html2text
+, unidecode
+}:
+
+buildPythonPackage rec {
+  pname = "weboob";
+  version = "1.3";
+  disabled = ! isPy27;
+
+  src = fetchurl {
+    url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz";
+    sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9";
+  };
+
+  setupPyBuildFlags = ["--qt" "--xdg"];
+
+  checkInputs = [ nose ];
+
+  propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
+    gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml
+    simplejson cssselect futures pdfminer termcolor google_api_python_client
+    html2text unidecode ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = {
+    homepage = http://weboob.org;
+    description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
+    license = stdenv.lib.licenses.agpl3;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c8ac62770b5..66ccc6b3b34f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20097,26 +20097,7 @@ EOF
     };
   };
 
-  weboob = buildPythonPackage rec {
-    name = "weboob-1.1";
-    disabled = ! isPy27;
-
-    src = pkgs.fetchurl {
-      url = "https://symlink.me/attachments/download/324/${name}.tar.gz";
-      sha256 = "0736c5wsck2abxlwvx8i4496kafk9xchkkzhg4dcfbj0isldih6b";
-    };
-
-    setupPyBuildFlags = ["--qt" "--xdg"];
-
-    propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ];
-
-    meta = {
-      homepage = http://weboob.org;
-      description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
-      license = licenses.agpl3;
-      maintainers = with maintainers; [ ];
-    };
-  };
+  weboob = callPackage ../development/python-modules/weboob { };
 
   datadiff = buildPythonPackage rec {
     name = "datadiff-1.1.6";