diff options
author | Winter <winter@winter.cafe> | 2022-04-21 19:26:44 -0400 |
---|---|---|
committer | Winter <winter@winter.cafe> | 2022-04-21 19:26:44 -0400 |
commit | 69e661230508bf2c4b7b8dbb0518de6c951986ce (patch) | |
tree | 06684fc5db88ed531feaa5107bed00fb18e902c7 /pkgs | |
parent | 659b91df0a8115c767b74b2667c2218e279c1c62 (diff) |
{jesec-,}rtorrent: don't use package sets
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/p2p/jesec-rtorrent/default.nix (renamed from pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix (renamed from pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix (renamed from pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix (renamed from pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/jesec-rtorrent/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
7 files changed, 6 insertions, 32 deletions
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 7fe444228d374..7fe444228d374 100644 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix +++ b/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 index d46e4a159399a..d46e4a159399a 100644 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/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 index f166f6d0e29f2..f166f6d0e29f2 100644 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix +++ b/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 index fff4cbb36cf62..fff4cbb36cf62 100644 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix +++ b/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 56fec5333fc77..0000000000000 --- 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 56fec5333fc77..0000000000000 --- 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 434d94509ab45..6d830daecdd98 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 = rakshasa-rtorrent.rtorrent; - libtorrent = rakshasa-rtorrent.libtorrent; - - jesec-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/jesec-rtorrent { - callPackage = newScope pkgs.jesec-rtorrent; - }); + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; + }; - 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 { }; |