git.iko.soy/typeable/nixpkgs
on master help sign in
flexget: move out of python-packages.nix
361dae6Frederik Rietdijk
nixos/modules/services/torrent/flexget.nix+3−3
compare with master
unifiedsplit
@@ -4,7 +4,7 @@ with lib;
4
4
5let
5let
6 cfg = config.services.flexget;
6 cfg = config.services.flexget;
7− pkg = pkgs.python27Packages.flexget;
7+ pkg = pkgs.flexget;
8 ymlFile = pkgs.writeText "flexget.yml" ''
8 ymlFile = pkgs.writeText "flexget.yml" ''
9 ${cfg.config}
9 ${cfg.config}
10
10
@@ -54,12 +54,12 @@ in {
54
54
55 config = mkIf cfg.enable {
55 config = mkIf cfg.enable {
56
56
57− environment.systemPackages = [ pkgs.python27Packages.flexget ];
57+ environment.systemPackages = [ pkg ];
58
58
59 systemd.services = {
59 systemd.services = {
60 flexget = {
60 flexget = {
61 description = "FlexGet Daemon";
61 description = "FlexGet Daemon";
62− path = [ pkgs.pythonPackages.flexget ];
62+ path = [ pkg ];
63 serviceConfig = {
63 serviceConfig = {
64 User = cfg.user;
64 User = cfg.user;
65 Environment = "TZ=${config.time.timeZone}";
65 Environment = "TZ=${config.time.timeZone}";
pkgs/top-level/all-packages.nix+2
@@ -13009,6 +13009,8 @@ in
13009
13009
13010 flacon = callPackage ../applications/audio/flacon { };
13010 flacon = callPackage ../applications/audio/flacon { };
13011
13011
13012+ flexget = callPackage ../applications/networking/flexget { };
13013+
13012 fldigi = callPackage ../applications/audio/fldigi { };
13014 fldigi = callPackage ../applications/audio/fldigi { };
13013
13015
13014 fluidsynth = callPackage ../applications/audio/fluidsynth {
13016 fluidsynth = callPackage ../applications/audio/fluidsynth {
pkgs/top-level/python-packages.nix−32
@@ -11488,38 +11488,6 @@ in {
11488 };
11488 };
11489 };
11489 };
11490
11490
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−
11523 # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
11491 # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
11524 graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
11492 graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
11525 else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };
11493 else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };