Merge pull request #169236 from winterqt/bump-jesec-rtorrent

jesec-rtorrent: 0.9.8-r15 -> 0.9.8-r16
This commit is contained in:
Anderson Torres 2022-04-21 23:01:34 -03:00 committed by GitHub
commit 8411006d6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 38 deletions

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "jesec-rtorrent";
version = "0.9.8-r15";
version = "0.9.8-r16";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk=";
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
};
nativeBuildInputs = [
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
doCheck = true;
checkInputs = [
gtest
];

View file

@ -9,27 +9,31 @@
stdenv.mkDerivation rec {
pname = "jesec-libtorrent";
version = "0.13.8-r3";
version = "0.13.8-r4";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk=";
hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
openssl
zlib
];
doCheck = true;
# Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4.
# doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
'';
checkInputs = [
gtest
];

View file

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

View file

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

View file

@ -7925,21 +7925,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 { };