Skip to content

Commit

Permalink
nixos/deluge: Fix deluge package attribute
Browse files Browse the repository at this point in the history
Regression introduced by fa5e343.

The deluge package no longer resides in pythonPackages but now is a
top-level package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @grantwwu, @fpletz
  • Loading branch information
aszlig committed Sep 1, 2017
1 parent 86587ea commit 799435b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions nixos/modules/services/torrent/deluge.nix
Expand Up @@ -42,9 +42,9 @@ in {
after = [ "network.target" ];
description = "Deluge BitTorrent Daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.pythonPackages.deluge ];
path = [ pkgs.deluge ];
serviceConfig = {
ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
ExecStart = "${pkgs.deluge}/bin/deluged -d";
# To prevent "Quit & shutdown daemon" from working; we want systemd to manage it!
Restart = "on-success";
User = "deluge";
Expand All @@ -58,12 +58,12 @@ in {
description = "Deluge BitTorrent WebUI";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.pythonPackages.deluge ];

This comment has been minimized.

Copy link
@roconnor

roconnor Sep 2, 2017

Contributor

Did you miss this line?

This comment has been minimized.

Copy link
@aszlig

aszlig Sep 2, 2017

Author Member

@roconnor: Oh, yes I did, thanks for the notification!

This comment has been minimized.

Copy link
@aszlig

aszlig Sep 2, 2017

Author Member

Fixed in 880a040.

serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
serviceConfig.ExecStart = "${pkgs.deluge}/bin/deluge --ui web";
serviceConfig.User = "deluge";
serviceConfig.Group = "deluge";
};

environment.systemPackages = [ pkgs.pythonPackages.deluge ];
environment.systemPackages = [ pkgs.deluge ];

users.extraUsers.deluge = {
group = "deluge";
Expand Down

0 comments on commit 799435b

Please sign in to comment.