From 4ac0d7fb6b36865a5cb1794812957ab7df0362ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:17:00 +0100 Subject: [PATCH] deluge: move files to match common nixpkgs layout No other packages have an own directory for each version with only one file in each directory. --- .../networking/p2p/deluge/{1/default.nix => 1.nix} | 0 pkgs/applications/networking/p2p/deluge/{2 => }/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/networking/p2p/deluge/{1/default.nix => 1.nix} (100%) rename pkgs/applications/networking/p2p/deluge/{2 => }/default.nix (100%) diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1.nix similarity index 100% rename from pkgs/applications/networking/p2p/deluge/1/default.nix rename to pkgs/applications/networking/p2p/deluge/1.nix diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix similarity index 100% rename from pkgs/applications/networking/p2p/deluge/2/default.nix rename to pkgs/applications/networking/p2p/deluge/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceb9bb569616..c71776008acf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,11 +3331,11 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + deluge-2_x = callPackage ../applications/networking/p2p/deluge { pythonPackages = python3Packages; libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { pythonPackages = python2Packages; libtorrentRasterbar = libtorrentRasterbar-1_1_x; };