From 9e95d55c5b4626c43525e92ea9209c33765232aa Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 30 May 2021 20:58:24 -0400 Subject: [PATCH 1/2] libtorrent-jesec: 0.13.8-r1 -> 0.13.8-r2 --- .../p2p/libtorrent-jesec/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix index 3858d87e7ed..0fd16f4799d 100644 --- a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix @@ -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; { From 09674732ee0a23034eb9bac24437351677fc4168 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 30 May 2021 20:58:50 -0400 Subject: [PATCH 2/2] rtorrent-jesec: 0.9.8-r13 -> 0.9.8-r14 --- pkgs/tools/networking/p2p/rtorrent-jesec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix index 5b973a84ebc..eeff6e91399 100644 --- a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix @@ -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 ];