remove bittorrent package since it's obsolete

This commit is contained in:
Domen Kožar 2014-09-05 22:49:18 +02:00
parent 718106e958
commit b420eeba44
5 changed files with 1 additions and 64 deletions

View File

@ -92,17 +92,6 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
hackery.</para> hackery.</para>
</listitem> </listitem>
<listitem>
<para>BitTorrent (wxPython-based): <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
Uses an external <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
script</link>, which can be useful if you have lots of code
that you dont want cluttering up the Nix expression. But
external builders are mostly obsolete.
</para>
</listitem>
<listitem> <listitem>
<para>Thunderbird: <link <para>Thunderbird: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.

View File

@ -28,7 +28,7 @@ in
nodes = nodes =
{ tracker = { tracker =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ]; { environment.systemPackages = [ pkgs.transmission ];
# We need Apache on the tracker to serve the torrents. # We need Apache on the tracker to serve the torrents.
services.httpd.enable = true; services.httpd.enable = true;

View File

@ -1,27 +0,0 @@
source $stdenv/setup
# Workaround for:
# File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
# elif path == '' or path.endswith('/'):
# AttributeError: 'NoneType' object has no attribute 'endswith'
export HOME=$TMP
buildPhase() {
python setup.py build
}
installPhase() {
python setup.py install --prefix=$out
# Create wrappers that set the environment correctly.
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
done
}
genericBuild

View File

@ -1,24 +0,0 @@
{ gui ? false
, stdenv, fetchurl, makeWrapper
, python, wxPython ? null, pycrypto, twisted
}:
assert gui -> wxPython != null;
stdenv.mkDerivation {
name = "bittorrent-5.2.2";
builder = ./builder.sh;
src = fetchurl {
url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz;
sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9";
};
buildInputs = [ python pycrypto twisted makeWrapper ]
++ stdenv.lib.optional gui wxPython;
meta = {
description = "The original client for the BitTorrent peer-to-peer file sharing protocol";
};
}

View File

@ -64,7 +64,6 @@ let
binutils = linux; binutils = linux;
bind = linux; bind = linux;
bitlbee = linux; bitlbee = linux;
bittorrent = linux;
blender = linux; blender = linux;
bsdiff = all; bsdiff = all;
btrfsProgs = linux; btrfsProgs = linux;