Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0982ba4be99
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56207cdbd18f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 20, 2017

  1. libtorrent: update to current git HEAD to avoid build errors with rec… 

    …ent cppunit
    @peti
    peti committed Sep 20, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b0e6e2 View commit details

  2. rtorrent: update to current git HEAD to avoid build errors with recen… 

    …t cppunit

Fixes #29601.
    @peti
    peti committed Sep 20, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56207cd View commit details
Showing with 8 additions and 8 deletions.
  1. +5 −5 pkgs/tools/networking/p2p/libtorrent/default.nix
  2. +3 −3 pkgs/tools/networking/p2p/rtorrent/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/networking/p2p/libtorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,21 +6,21 @@

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";
};

buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ];

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;
6 changes: 3 additions & 3 deletions pkgs/tools/networking/p2p/rtorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};

buildInputs = [