git.iko.soy/typeable/nixpkgs
on master help sign in
flexget: move out of python-packages.nix

because it is an application and not a library.

commit361dae67d49ac20dc4e568fe6d32e0a0dbbb5f1a authorFrederik Rietdijk <fridh@fridh.nl> dateSat 31 Dec 2016, 09:52 (10 years ago) parent0cb52dc
3 files changed+5−35
nixos/modules/services/torrent/flexget.nix+3−3 pkgs/top-level/all-packages.nix+2 pkgs/top-level/python-packages.nix−32
nixos/modules/services/torrent/flexget.nix+3−3
@@ -4,7 +4,7 @@ with lib;
44
55let
66 cfg = config.services.flexget;
7− pkg = pkgs.python27Packages.flexget;
7+ pkg = pkgs.flexget;
88 ymlFile = pkgs.writeText "flexget.yml" ''
99 ${cfg.config}
1010
@@ -54,12 +54,12 @@ in {
5454
5555 config = mkIf cfg.enable {
5656
57− environment.systemPackages = [ pkgs.python27Packages.flexget ];
57+ environment.systemPackages = [ pkg ];
5858
5959 systemd.services = {
6060 flexget = {
6161 description = "FlexGet Daemon";
62− path = [ pkgs.pythonPackages.flexget ];
62+ path = [ pkg ];
6363 serviceConfig = {
6464 User = cfg.user;
6565 Environment = "TZ=${config.time.timeZone}";
pkgs/top-level/all-packages.nix+2
@@ -13009,6 +13009,8 @@ in
1300913009
1301013010 flacon = callPackage ../applications/audio/flacon { };
1301113011
13012+ flexget = callPackage ../applications/networking/flexget { };
13013+
1301213014 fldigi = callPackage ../applications/audio/fldigi { };
1301313015
1301413016 fluidsynth = callPackage ../applications/audio/fluidsynth {
pkgs/top-level/python-packages.nix−32
@@ -11488,38 +11488,6 @@ in {
1148811488 };
1148911489 };
1149011490
11491− flexget = buildPythonPackage rec {
11492− version = "1.2.337";
11493− name = "FlexGet-${version}";
11494− disabled = isPy3k;
11495−
11496− src = pkgs.fetchurl {
11497− url = "mirror://pypi/F/FlexGet/${name}.tar.gz";
11498− sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346";
11499− };
11500−
11501− doCheck = false;
11502−
11503− buildInputs = with self; [ nose ];
11504− propagatedBuildInputs = with self; [
11505− paver feedparser sqlalchemy pyyaml rpyc
11506− beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask
11507− cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3
11508− guessit pathpy apscheduler ]
11509− # enable deluge and transmission plugin support, if they're installed
11510− ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false)
11511− pythonpackages.deluge
11512− ++ stdenv.lib.optional (pkgs.transmission != null)
11513− self.transmissionrpc;
11514−
11515− meta = {
11516− homepage = http://flexget.com/;
11517− description = "Multipurpose automation tool for content like torrents";
11518− license = licenses.mit;
11519− maintainers = with maintainers; [ domenkozar ];
11520− };
11521− };
11522−
1152311491 # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
1152411492 graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
1152511493 else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };