Merge pull request #169236 from winterqt/bump-jesec-rtorrent
jesec-rtorrent: 0.9.8-r15 -> 0.9.8-r16
This commit is contained in:
commit
8411006d6b
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jesec-rtorrent";
|
pname = "jesec-rtorrent";
|
||||||
version = "0.9.8-r15";
|
version = "0.9.8-r16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "rtorrent";
|
repo = "rtorrent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk=";
|
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
|
++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
|
||||||
++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
|
++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
|
||||||
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
gtest
|
gtest
|
||||||
];
|
];
|
|
@ -9,27 +9,31 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jesec-libtorrent";
|
pname = "jesec-libtorrent";
|
||||||
version = "0.13.8-r3";
|
version = "0.13.8-r4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "libtorrent";
|
repo = "libtorrent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk=";
|
hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
openssl
|
openssl
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
# Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4.
|
||||||
|
# doCheck = true;
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
gtest
|
gtest
|
||||||
];
|
];
|
|
@ -1,9 +0,0 @@
|
||||||
{ lib
|
|
||||||
, pkgs
|
|
||||||
, callPackage
|
|
||||||
}:
|
|
||||||
|
|
||||||
rec {
|
|
||||||
libtorrent = callPackage ./libtorrent.nix { };
|
|
||||||
rtorrent = callPackage ./rtorrent.nix { };
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
{ lib
|
|
||||||
, pkgs
|
|
||||||
, callPackage
|
|
||||||
}:
|
|
||||||
|
|
||||||
rec {
|
|
||||||
libtorrent = callPackage ./libtorrent.nix { };
|
|
||||||
rtorrent = callPackage ./rtorrent.nix { };
|
|
||||||
}
|
|
|
@ -7925,21 +7925,13 @@ with pkgs;
|
||||||
|
|
||||||
libnids = callPackage ../tools/networking/libnids { };
|
libnids = callPackage ../tools/networking/libnids { };
|
||||||
|
|
||||||
rakshasa-rtorrent = recurseIntoAttrs
|
rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent {
|
||||||
(callPackage ../tools/networking/p2p/rakshasa-rtorrent {
|
libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { };
|
||||||
callPackage = newScope pkgs.rakshasa-rtorrent;
|
};
|
||||||
});
|
|
||||||
|
|
||||||
rtorrent = rakshasa-rtorrent.rtorrent;
|
jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {
|
||||||
libtorrent = rakshasa-rtorrent.libtorrent;
|
libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };
|
||||||
|
};
|
||||||
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 { };
|
libmpack = callPackage ../development/libraries/libmpack { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue