jesec-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 rakshasa-rtorrent commit.)
conduit-nginx
AndersonTorres 2021-10-21 15:55:10 -03:00
parent 92b0e34180
commit 07e7d46e0c
4 changed files with 20 additions and 7 deletions

View File

@ -0,0 +1,9 @@
{ lib
, pkgs
, callPackage
}:
rec {
libtorrent = callPackage ./libtorrent.nix { };
rtorrent = callPackage ./rtorrent.nix { };
}

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "libtorrent-jesec";
pname = "jesec-libtorrent";
version = "0.13.8-r2";
src = fetchFromGitHub {

View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, gtest
, libtorrent-jesec
, libtorrent
, curl
, ncurses
, xmlrpc_c
@ -15,7 +15,7 @@ let
inherit (lib) optional;
in
stdenv.mkDerivation rec {
pname = "rtorrent-jesec";
pname = "jesec-rtorrent";
version = "0.9.8-r14";
src = fetchFromGitHub {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libtorrent-jesec curl ncurses ]
buildInputs = [ libtorrent curl ncurses ]
++ optional xmlRpcSupport xmlrpc_c
++ optional jsonRpcSupport nlohmann_json;

View File

@ -7166,7 +7166,13 @@ with pkgs;
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
jesec-rtorrent = recurseIntoAttrs
(callPackage ../tools/networking/p2p/jesec-rtorrent {
callPackage = newScope pkgs.jesec-rtorrent;
});
rtorrent-jesec = jesec-rtorrent.rtorrent;
libtorrent-jesec = jesec-rtorrent.libtorrent;
libmpack = callPackage ../development/libraries/libmpack { };
@ -9004,8 +9010,6 @@ with pkgs;
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
rubber = callPackage ../tools/typesetting/rubber { };
rubocop = rubyPackages.rubocop;