Merge pull request #9859 from ebzzry/rtorrent-0.9.6

rtorrent: 0.9.4 -> 0.9.6

2 files changed, 18 insertions, 19 deletions

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 132762c3b54f..421e0b205db6 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,23 +1,21 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }:
 
-let
-  version = "0.13.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libtorrent-${version}";
+  version = "0.13.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "0ma910br5vxrfpm4f4w4942lpmhwvqjnnf9h8vpf52fw35qhjkkh";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx zlib ];
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/libtorrent/;
+    description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 64d518355725..d702e3b9700f 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rtorrent-0.9.4";
+  name = "rtorrent-${version}";
+  version = "0.9.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "113yrrac75vqi4g8r6bgs0ggjllj9bkg9shv08vqzdhkwqg2q2mw";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ];
@@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
   #   mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
   # '';
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/rtorrent/;
+    description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }