dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #125014 from winterqt/bump-rtorrent

Browse Source
This commit is contained in:
Sandro 2021-06-04 10:21:46 +02:00 committed by GitHub
commit 69a95613aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
View File

@ -1,21 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "libtorrent-jesec";
version = "0.13.8-r1";
version = "0.13.8-r2";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
sha256 = "sha256-eIXVTbVOCRHcxSsLPvIm9F60t2upk5ORpDSOOYqTCJ4=";
};
patches = [
(fetchpatch {
name = "test-fallback";
url = "https://github.com/jesec/libtorrent/commit/a38205ce06aadc9908478ec3a9c8aefd9be06344.patch";
sha256 = "sha256-2TyQ9zYWZw6bzAfVZzTOQSkfIZnDU8ykgpRAFXscEH0=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl zlib ];
# https://github.com/jesec/libtorrent/issues/1
doCheck = false;
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
'';
checkInputs = [ gtest ];
meta = with lib; {

4
pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
View File

@ -16,13 +16,13 @@ let
in
stdenv.mkDerivation rec {
pname = "rtorrent-jesec";
version = "0.9.8-r13";
version = "0.9.8-r14";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo=";
};
nativeBuildInputs = [ cmake ];