From 0c75ad784c83196861918042348bee6edb87afb1 Mon Sep 17 00:00:00 2001
From: Robert Schütz <rschuetz17@gmail.com>
Date: Sun, 23 Dec 2018 16:30:57 +0100
Subject: flexget: 2.17.14 -> 2.17.20 (#52681)

---
 pkgs/applications/networking/flexget/default.nix | 43 ++++++++----------------
 1 file changed, 14 insertions(+), 29 deletions(-)

(limited to 'pkgs/applications/networking/flexget')

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 3fec84d224f09..8508ab10e1ad6 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -1,8 +1,4 @@
-{ lib, python
-, delugeSupport ? true, deluge ? null
-}:
-
-assert delugeSupport -> deluge != null;
+{ lib, python36 }:
 
 # Flexget have been a trouble maker in the past,
 # if you see flexget breaking when updating packages, don't worry.
@@ -10,17 +6,9 @@ assert delugeSupport -> deluge != null;
 # -- Mic92
 
 let
-  python' = python.override { inherit packageOverrides; };
+  python' = python36.override { inherit packageOverrides; };
 
   packageOverrides = self: super: {
-    sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
-      version = "1.2.6";
-      src = old.src.override {
-        inherit version;
-        sha256 = "1nwylglh256mbwwnng6n6bzgxshyz18j12hw76sghbprp74hrc3w";
-      };
-    });
-
     guessit = super.guessit.overridePythonAttrs (old: rec {
       version = "3.0.3";
       src = old.src.override {
@@ -36,14 +24,16 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.17.14";
+  version = "2.17.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wh12nspjzsgb0a7qp67s4k8wssbhhf500s8x8mx2smb1mgy4xzz";
+    sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3";
   };
 
   postPatch = ''
+    # build for the correct python version
+    substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' ""
     # remove dependency constraints
     sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
   '';
@@ -52,25 +42,20 @@ buildPythonApplication rec {
   doCheck = false;
 
   propagatedBuildInputs = [
+    # See https://github.com/Flexget/Flexget/blob/master/requirements.in
     feedparser sqlalchemy pyyaml
-    chardet beautifulsoup4 html5lib
+    beautifulsoup4 html5lib
     PyRSS2Gen pynzb rpyc jinja2
-    jsonschema requests dateutil
+    requests dateutil jsonschema
     pathpy guessit APScheduler
     terminaltables colorclass
     cherrypy flask flask-restful
     flask-restplus flask-compress
-    flask_login flask-cors safe
-    pyparsing future zxcvbn-python
-    werkzeug tempora cheroot rebulk
-    portend transmissionrpc aniso8601
-    babelfish certifi click futures
-    idna itsdangerous markupsafe
-    plumbum pytz six tzlocal urllib3
-    webencodings werkzeug zxcvbn-python
-    backports_functools_lru_cache
-  ] ++ lib.optional (pythonOlder "3.4") pathlib
-    ++ lib.optional delugeSupport deluge;
+    flask_login flask-cors
+    pyparsing zxcvbn-python future
+    # Optional requirements
+    deluge-client
+  ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
   meta = with lib; {
     homepage    = https://flexget.com/;
-- 
cgit 1.4.1