flexget: 1.2.337 -> 2.8.17

This commit is contained in:
Peter Marheine 2017-01-04 08:34:16 +00:00 committed by Frederik Rietdijk
parent d5ffb897a2
commit c1cbae5a1e
3 changed files with 19 additions and 53 deletions

View file

@ -513,6 +513,7 @@
takikawa = "Asumu Takikawa <asumu@igalia.com>"; takikawa = "Asumu Takikawa <asumu@igalia.com>";
taktoa = "Remy Goldschmidt <taktoa@gmail.com>"; taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>"; taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
tari = "Peter Marheine <peter@taricorp.net>";
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>"; tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
teh = "Tom Hunger <tehunger@gmail.com>"; teh = "Tom Hunger <tehunger@gmail.com>";
telotortium = "Robert Irelan <rirelan@gmail.com>"; telotortium = "Robert Irelan <rirelan@gmail.com>";

View file

@ -9,23 +9,30 @@
with pythonPackages; with pythonPackages;
buildPythonPackage rec { buildPythonPackage rec {
version = "1.2.337"; version = "2.8.17";
name = "FlexGet-${version}"; name = "FlexGet-${version}";
disabled = isPy3k;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/F/FlexGet/${name}.tar.gz"; url = "https://github.com/Flexget/Flexget/archive/${version}.tar.gz";
sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346"; sha256 = "925e6bf62dfae73194dbf8b963ff2b60fb500f2457463b744086706da94dabd7";
}; };
# Requires vcrpy
doCheck = false; doCheck = false;
checkPhase = ''
py.test
'';
buildInputs = [ nose ]; buildInputs = [ pytest mock ];
propagatedBuildInputs = [ propagatedBuildInputs = [
paver feedparser sqlalchemy pyyaml rpyc feedparser sqlalchemy pyyaml
beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask beautifulsoup4 html5lib pyrss2gen pynzb
cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 rpyc jinja2 requests2 dateutil jsonschema
guessit pathpy apscheduler ] pathpy pathlib guessit apscheduler
terminaltables colorclass
cherrypy flask flask-restful flask-restplus
flask-compress flask_login flask-cors
pyparsing safe future ]
# enable deluge and transmission plugin support, if they're installed # enable deluge and transmission plugin support, if they're installed
++ lib.optional (config.deluge or false) deluge ++ lib.optional (config.deluge or false) deluge
++ lib.optional (transmission != null) transmissionrpc; ++ lib.optional (transmission != null) transmissionrpc;
@ -34,6 +41,6 @@ buildPythonPackage rec {
homepage = http://flexget.com/; homepage = http://flexget.com/;
description = "Multipurpose automation tool for content like torrents"; description = "Multipurpose automation tool for content like torrents";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ domenkozar ]; maintainers = with lib.maintainers; [ domenkozar tari ];
}; };
} }

View file

@ -2191,26 +2191,6 @@ in {
}; };
}); });
# flexget needs beatifulsoup < 4.4 for now
beautifulsoup_4_1_3 = buildPythonPackage (rec {
name = "beautifulsoup4-4.1.3";
src = pkgs.fetchurl {
url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz";
sha256 = "0cbcml88bkx9gf1wznxa0kqz1wpyakfbyh9gmxw0wljhda1q0zk1";
};
meta = {
homepage = http://crummy.com/software/BeautifulSoup/bs4/;
description = "HTML and XML parser";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
disabled = isPy3k;
});
beaker = buildPythonPackage rec { beaker = buildPythonPackage rec {
name = "Beaker-${version}"; name = "Beaker-${version}";
version = "1.8.0"; version = "1.8.0";
@ -6147,28 +6127,6 @@ in {
}; };
}); });
# flexget requires 2.1
dateutil_2_1 = buildPythonPackage (rec {
name = "dateutil-2.1";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c";
};
propagatedBuildInputs = with self; [ self.six ];
buildInputs = [ pkgs.glibcLocales ];
LC_ALL="en_US.UTF-8";
meta = {
description = "Powerful extensions to the standard datetime module";
homepage = http://pypi.python.org/pypi/python-dateutil;
license = "BSD-style";
};
});
ddar = buildPythonPackage { ddar = buildPythonPackage {
name = "ddar-1.0"; name = "ddar-1.0";