summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-09-01 18:04:59 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-09-01 18:07:12 +0200
commit799435b7cab97a39893a104999b3bc589e1172b1 (patch)
tree6f0282d2cc8512280400f242da82c317383ff674
parent86587ea95b8f0bb468f6e55bad929cdc6163028d (diff)
downloadnixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar.gz
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar.bz2
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar.lz
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar.xz
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.tar.zst
nixpkgs-799435b7cab97a39893a104999b3bc589e1172b1.zip
nixos/deluge: Fix deluge package attribute
Regression introduced by fa5e34324204fc626d9b644a37982bcedec9e4bc.

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
-rw-r--r--nixos/modules/services/torrent/deluge.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 2534f09b555..1ea6bf88d7a 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -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";
@@ -58,12 +58,12 @@ in {
       description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
-      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";