public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libtorrent, rtorrent: merge *-git into default, drop outdated *-git versions, cleanup 

This also gives the man page (it is outdated, though).
This commit is contained in:
Jan Malakhovski 2015-12-06 17:36:28 +00:00
parent 59823208a6
commit 7afce99e61
5 changed files with 45 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/networking/p2p/libtorrent/default.nix
View File

@ -1,21 +1,27 @@
{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }:
{ stdenv, fetchFromGitHub, pkgconfig
, libtool, autoconf, automake, cppunit
, openssl, libsigcxx, zlib }:
stdenv.mkDerivation rec {
name = "libtorrent-${version}";
version = "0.13.6";
src = fetchurl {
url = "http://rtorrent.net/downloads/${name}.tar.gz";
sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18";
src = fetchFromGitHub rec {
owner = "rakshasa";
repo = "libtorrent";
rev = "${version}";
sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp";
};
buildInputs = [ pkgconfig openssl libsigcxx zlib ];
buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ];
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
homepage = https://github.com/rakshasa/libtorrent/;
homepage = src.homepage;
description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
platforms = platforms.unix;
maintainers = with maintainers; [ simons ebzzry ];
maintainers = with maintainers; [ simons ebzzry codyopel ];
};
}

28
pkgs/tools/networking/p2p/libtorrent/git.nix
View File

@ -1,28 +0,0 @@
{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }:
stdenv.mkDerivation {
name = "libtorrent-git-2014-08-20";
src = fetchFromGitHub rec {
owner = "rakshasa";
repo = "libtorrent";
rev = "c60d2b9475804e41649356fa0301e9f770798f8d";
sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577";
};
buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ];
configureFlags = "--disable-dependency-tracking --enable-aligned";
preConfigure = ''
./autogen.sh
'';
meta = with stdenv.lib; {
homepage = "http://libtorrent.rakshasa.no/";
description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ codyopel ];
};
}

44
pkgs/tools/networking/p2p/rtorrent/default.nix
View File

@ -1,30 +1,50 @@
{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig
, libtool, autoconf, automake, cppunit
, libtorrent, ncurses, libsigcxx, curl
, zlib, openssl, xmlrpc_c
# This no longer works
, colorSupport ? false
}:
stdenv.mkDerivation rec {
name = "rtorrent-${version}";
version = "0.9.6";
src = fetchurl {
url = "http://rtorrent.net/downloads/${name}.tar.gz";
sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y";
src = fetchFromGitHub {
owner = "rakshasa";
repo = "rtorrent";
rev = "${version}";
sha256 = "0iyxmjr1984vs7hrnxkfwgrgckacqml0kv4bhj185w9bhjqvgfnf";
};
buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ];
buildInputs = [
pkgconfig libtool autoconf automake cppunit
libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c
];
# Optional patch adds support for custom configurable colors
# https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md
patches = stdenv.lib.optional colorSupport (fetchurl {
url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch";
sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965";
});
preConfigure = "./autogen.sh";
configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ];
# postInstall = ''
# mkdir -p $out/share/man/man1 $out/share/rtorrent
# mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
# mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
# '';
postInstall = ''
mkdir -p $out/share/man/man1 $out/share/doc/rtorrent
mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1
mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc
'';
meta = with stdenv.lib; {
homepage = https://github.com/rakshasa/rtorrent/;
homepage = src.homepage;
description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
platforms = platforms.unix;
maintainers = with maintainers; [ simons ebzzry ];
maintainers = with maintainers; [ simons ebzzry codyopel ];
};
}

63
pkgs/tools/networking/p2p/rtorrent/git.nix
View File

@ -1,63 +0,0 @@
{ stdenv, autoconf, automake, cppunit, curl, fetchFromGitHub
, fetchurl, libsigcxx, libtool, libtorrent-git, ncurses, openssl
, pkgconfig, zlib, xmlrpc_c
, colorSupport ? false
}:
# NOTICE: changes since 0.9.4 break the current configuration syntax, an
# example configuration file using the latest changes can be found at
# https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc
stdenv.mkDerivation {
name = "rtorrent-git-2014-07-02";
src = fetchFromGitHub {
owner = "rakshasa";
repo = "rtorrent";
rev = "7537a3c2a91d0915f1c4c89b01cd583629dc5fd4";
sha256 = "1xnyjjff575jfq9c542yq3rr9q03z5x6xbg84d000wkjphbq7h7q";
};
buildInputs = [
autoconf
automake
cppunit
libtorrent-git
ncurses
pkgconfig
libsigcxx
libtool
curl
zlib
openssl
xmlrpc_c
];
configureFlags = "--with-xmlrpc-c";
# Optional patch adds support for custom configurable colors
# https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md
patches = stdenv.lib.optional colorSupport (fetchurl {
url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch";
sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965";
});
preConfigure = ''
./autogen.sh
'';
# postInstall = ''
# mkdir -p $out/share/man/man1 $out/share/rtorrent
# mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
# mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
# '';
meta = with stdenv.lib; {
homepage = "http://libtorrent.rakshasa.no/";
description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ codyopel ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -2136,8 +2136,6 @@ let
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { };
libiberty = callPackage ../development/libraries/libiberty { };
libibverbs = callPackage ../development/libraries/libibverbs { };
@ -2931,8 +2929,6 @@ let
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { };
rubber = callPackage ../tools/typesetting/rubber { };
rxp = callPackage ../tools/text/xml/rxp { };