diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
commit | f504af072bc5cf49da008e6970c214255d5f46ed (patch) | |
tree | f2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /pkgs/tools/networking/p2p | |
parent | 11ceef47699fb0911bea790e4b8059d97e95ad14 (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2 nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip |
Merge branch 'master' into staging-next
There's been some large rebuild on master. I don't really have time ATM to find what it was.
Diffstat (limited to 'pkgs/tools/networking/p2p')
-rw-r--r-- | pkgs/tools/networking/p2p/libtorrent/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/rtorrent/default.nix | 8 |
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 87cf6d172c0c..9c6f5eec11b7 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 = "20161212"; + version = "0.13.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"; - sha256 = "0y9759sxx5dyamyw8w58dsxq7bmnn57q7s2f4cw2zln2pp5gripw"; + rev = "v${version}"; + sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = "http://rtorrent.net/downloads/"; + inherit (src.meta) homepage; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 6ab462ac5a8c..658739c93aa0 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 = "20161023"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "226e670decf92e7adaa845a6982aca4f164ea740"; - sha256 = "0cxyakc09bn6wjfj42gh508hc62awx825skzacpizx2bqs6v7xvb"; + rev = "v${version}"; + sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; }; nativeBuildInputs = [ pkgconfig ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = https://rakshasa.github.io/rtorrent/; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; |