From 69e661230508bf2c4b7b8dbb0518de6c951986ce Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 21 Apr 2022 19:26:44 -0400
Subject: [PATCH] {jesec-,}rtorrent: don't use package sets

---
 .../p2p/jesec-rtorrent/default.nix}           |  0
 .../p2p/jesec-rtorrent/libtorrent.nix         |  0
 .../p2p/rakshasa-rtorrent/default.nix}        |  0
 .../p2p/rakshasa-rtorrent/libtorrent.nix      |  0
 .../networking/p2p/jesec-rtorrent/default.nix |  9 ---------
 .../p2p/rakshasa-rtorrent/default.nix         |  9 ---------
 pkgs/top-level/all-packages.nix               | 20 ++++++-------------
 7 files changed, 6 insertions(+), 32 deletions(-)
 rename pkgs/{tools/networking/p2p/jesec-rtorrent/rtorrent.nix => applications/networking/p2p/jesec-rtorrent/default.nix} (100%)
 rename pkgs/{tools => applications}/networking/p2p/jesec-rtorrent/libtorrent.nix (100%)
 rename pkgs/{tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix => applications/networking/p2p/rakshasa-rtorrent/default.nix} (100%)
 rename pkgs/{tools => applications}/networking/p2p/rakshasa-rtorrent/libtorrent.nix (100%)
 delete mode 100644 pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
 delete mode 100644 pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix

diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
rename to pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix
rename to pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
deleted file mode 100644
index 56fec5333fc7..000000000000
--- a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib
-, pkgs
-, callPackage
-}:
-
-rec {
-  libtorrent = callPackage ./libtorrent.nix { };
-  rtorrent = callPackage ./rtorrent.nix { };
-}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
deleted file mode 100644
index 56fec5333fc7..000000000000
--- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib
-, pkgs
-, callPackage
-}:
-
-rec {
-  libtorrent = callPackage ./libtorrent.nix { };
-  rtorrent = callPackage ./rtorrent.nix { };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 434d94509ab4..6d830daecdd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7926,21 +7926,13 @@ with pkgs;
 
   libnids = callPackage ../tools/networking/libnids { };
 
-  rakshasa-rtorrent = recurseIntoAttrs
-    (callPackage ../tools/networking/p2p/rakshasa-rtorrent {
-      callPackage = newScope pkgs.rakshasa-rtorrent;
-    });
+  rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent {
+    libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { };
+  };
 
-  rtorrent = rakshasa-rtorrent.rtorrent;
-  libtorrent = rakshasa-rtorrent.libtorrent;
-
-  jesec-rtorrent = recurseIntoAttrs
-    (callPackage ../tools/networking/p2p/jesec-rtorrent {
-      callPackage = newScope pkgs.jesec-rtorrent;
-    });
-
-  rtorrent-jesec = jesec-rtorrent.rtorrent;
-  libtorrent-jesec = jesec-rtorrent.libtorrent;
+  jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {
+    libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };
+  };
 
   libmpack = callPackage ../development/libraries/libmpack { };