Merge pull request #8754 from cheecheeo/tribler_update

Tribler update
This commit is contained in:
Pascal Wittmann 2015-07-13 11:16:55 +02:00
commit c41809a4da
2 changed files with 70 additions and 18 deletions

View file

@ -1,33 +1,44 @@
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar
, enablePlayer ? false, vlc ? null }:
let rev = "25411"; in
stdenv.mkDerivation {
name = "tribler-5.5.21-pre${rev}";
stdenv.mkDerivation rec {
name = "tribler-${version}";
version = "v6.4.3";
src = fetchsvn {
url = http://svn.tribler.org/abc/branches/release-5.5.x;
inherit rev;
sha256 = "17c9svy4zjchzihk6mf0kh4lnvaxjfmgfmimyby5w0d3cwbw49zx";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
buildInputs = [
pythonPackages.python
pythonPackages.wrapPython
makeWrapper
];
pythonPath =
[ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw
pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3
];
pythonPath = [
libtorrentRasterbar
pythonPackages.wxPython
pythonPackages.curses
pythonPackages.apsw
pythonPackages.twisted
pythonPackages.gmpy
pythonPackages.netifaces
pythonPackages.pil
pythonPackages.pycrypto
pythonPackages.pyasn1
pythonPackages.requests
pythonPackages.setuptools
pythonPackages.m2crypto
pythonPackages.sqlite3
];
installPhase =
''
substituteInPlace Tribler/Core/NATFirewall/guessip.py \
--replace /bin/netstat ${nettools}/bin/netstat \
--replace /sbin/ifconfig ${nettools}/sbin/ifconfig
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
wrapPythonPrograms
mkdir -p $out/share/tribler
cp -prvd Tribler $out/share/tribler/

View file

@ -3332,6 +3332,47 @@ let
propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
};
gmpy = buildPythonPackage rec {
name = "gmpy-1.17";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip";
md5 = "2bf419076b06e107167e219f60ac6d27";
};
buildInputs = [
pkgs.gcc
pkgs.gmp
];
meta = {
description = "GMP or MPIR interface to Python 2.4+ and 3.x";
homepage = http://code.google.com/p/gmpy/;
};
};
gmpy2 = buildPythonPackage rec {
name = "gmpy2-2.0.6";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
md5 = "7365d880953ba54c2cdcf171c7e19b2b";
};
buildInputs = [
pkgs.gcc
pkgs.gmp
pkgs.mpfr
pkgs.libmpc
];
meta = {
description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
homepage = http://code.google.com/p/gmpy/;
license = licenses.gpl3Plus;
};
};
gmusicapi = with pkgs; pythonPackages.buildPythonPackage rec {
name = "gmusicapi-4.0.0";