diff options
| -rw-r--r-- | pkgs/applications/networking/flexget/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/python-modules/guessit/2.0.nix | 31 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
3 files changed, 9 insertions, 35 deletions
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index cc89f09d6402..ecad7549117d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -20,6 +20,14 @@ let sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv"; }; }); + + guessit = super.guessit.overridePythonAttrs (old: rec { + version = "2.1.4"; + src = old.src.override { + inherit version; + sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; + }; + }); }; in @@ -48,7 +56,7 @@ buildPythonApplication rec { chardet beautifulsoup4 html5lib PyRSS2Gen pynzb rpyc jinja2 jsonschema requests dateutil - pathpy guessit_2_0 APScheduler + pathpy guessit APScheduler terminaltables colorclass cherrypy flask flask-restful flask-restplus flask-compress diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix deleted file mode 100644 index d95d0880adfb..000000000000 --- a/pkgs/development/python-modules/guessit/2.0.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestrunner -, dateutil -, babelfish -, rebulk -}: - -buildPythonPackage rec { - pname = "guessit"; - version = "3.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b"; - }; - - # Tests require more packages. - doCheck = false; - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ - dateutil babelfish rebulk - ]; - - meta = { - homepage = https://pypi.python.org/pypi/guessit; - license = lib.licenses.lgpl3; - description = "A library for guessing information from video files"; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cbd5f0b468b..6ac09121fac2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6317,9 +6317,6 @@ in { guessit = callPackage ../development/python-modules/guessit { }; - # used by flexget - guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { }; - rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; |