aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/networking/p2p
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-28 12:32:57 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-28 12:32:57 -0400
commitf037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch)
treeaf8c8369954890db69195a1e9394ce16c7640d7f /pkgs/tools/networking/p2p
parentf08d6f0e2daf9f3d9daa070eee223855b33c430d (diff)
parent4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff)
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/tools/networking/p2p')
-rw-r--r--pkgs/tools/networking/p2p/libtorrent/default.nix10
-rw-r--r--pkgs/tools/networking/p2p/rtorrent/default.nix6
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 0690fe18bdea..87785f50e6fa 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "libtorrent-${version}";
- version = "0.13.6";
+ version = "20161212";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "rakshasa";
repo = "libtorrent";
- rev = "${version}";
- sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp";
+ rev = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87";
+ sha256 = "0y9759sxx5dyamyw8w58dsxq7bmnn57q7s2f4cw2zln2pp5gripw";
};
nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
- homepage = http://www.libtorrent.org/;
+ homepage = "http://rtorrent.net/downloads/";
description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
platforms = platforms.linux;
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index d96b5fe49a98..6ab462ac5a8c 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
name = "rtorrent-${version}";
- version = "0.9.6";
+ version = "20161023";
src = fetchFromGitHub {
owner = "rakshasa";
repo = "rtorrent";
- rev = "${version}";
- sha256 = "0iyxmjr1984vs7hrnxkfwgrgckacqml0kv4bhj185w9bhjqvgfnf";
+ rev = "226e670decf92e7adaa845a6982aca4f164ea740";
+ sha256 = "0cxyakc09bn6wjfj42gh508hc62awx825skzacpizx2bqs6v7xvb";
};
nativeBuildInputs = [ pkgconfig ];