From 3199dc10b71f0cfede08e8acaf8603596e03d98c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 21 Oct 2021 15:59:16 -0300
Subject: [PATCH] rakshasa-rtorrent: create subtree

RTorrent uses a companion library, libtorrent, and they should be synchronized
along the releases. They act like a small package set. Therefore it is a good
idea to treat them the same way in Nixpkgs code.

This commit should not change much of the things, because no code besides
rtorrent uses libtorrent.

(Yes, this the same message from jesec-rtorrent commit.)
---
 .../tools/networking/p2p/rakshasa-rtorrent/default.nix |  9 +++++++++
 .../default.nix => rakshasa-rtorrent/libtorrent.nix}   |  0
 .../default.nix => rakshasa-rtorrent/rtorrent.nix}     |  0
 pkgs/top-level/all-packages.nix                        | 10 +++++++---
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
 rename pkgs/tools/networking/p2p/{libtorrent/default.nix => rakshasa-rtorrent/libtorrent.nix} (100%)
 rename pkgs/tools/networking/p2p/{rtorrent/default.nix => rakshasa-rtorrent/rtorrent.nix} (100%)

diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
new file mode 100644
index 00000000000..56fec5333fc
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
@@ -0,0 +1,9 @@
+{ lib
+, pkgs
+, callPackage
+}:
+
+rec {
+  libtorrent = callPackage ./libtorrent.nix { };
+  rtorrent = callPackage ./rtorrent.nix { };
+}
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/libtorrent/default.nix
rename to pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/rtorrent/default.nix
rename to pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e335275eda1..b7df3f24117 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7164,7 +7164,13 @@ with pkgs;
 
   libnids = callPackage ../tools/networking/libnids { };
 
-  libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
+  rakshasa-rtorrent = recurseIntoAttrs
+    (callPackage ../tools/networking/p2p/rakshasa-rtorrent {
+      callPackage = newScope pkgs.rakshasa-rtorrent;
+    });
+
+  rtorrent = rakshasa-rtorrent.rtorrent;
+  libtorrent = rakshasa-rtorrent.libtorrent;
 
   jesec-rtorrent = recurseIntoAttrs
     (callPackage ../tools/networking/p2p/jesec-rtorrent {
@@ -9008,8 +9014,6 @@ with pkgs;
 
   rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
 
-  rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
-
   rubber = callPackage ../tools/typesetting/rubber { };
 
   rubocop = rubyPackages.rubocop;