Merge remote-tracking branch 'upstream/staging' into deps-reorg

This commit is contained in:
John Ericson
2017-09-28 12:32:57 -04:00
789 changed files with 15725 additions and 8096 deletions
@@ -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;