From 149df7769af216aca95eb07a992387f7d578068b Mon Sep 17 00:00:00 2001 From: Grant Wu Date: Wed, 9 Aug 2017 02:54:22 -0400 Subject: [PATCH 1/2] libtorrentRasterbar 1.1.1 -> 1.1.4 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index b6aace0de2d..ed52902938d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1.1"; - sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; + version = "1.1.4"; + sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; }) From e77068d0825e19ad6d2b624d25dcc6aeceab3076 Mon Sep 17 00:00:00 2001 From: Grant Wu Date: Wed, 9 Aug 2017 02:57:29 -0400 Subject: [PATCH 2/2] Add note to libtorrent to prevent conflation with libtorrentRasterbar --- pkgs/tools/networking/p2p/libtorrent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 3ff02834247..d1827a6045d 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,3 +1,5 @@ +# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent +# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others { stdenv, fetchFromGitHub, pkgconfig , libtool, autoconf, automake, cppunit , openssl, libsigcxx, zlib }: