diff options
-rw-r--r-- | doc/quick-start.xml | 11 | ||||
-rw-r--r-- | nixos/tests/bittorrent.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/bittorrent/builder.sh | 27 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/bittorrent/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 1 |
5 files changed, 1 insertions, 64 deletions
diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 0f11a906d771..c0f96f871529 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -93,17 +93,6 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen> </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 don’t want cluttering up the Nix expression. But - external builders are mostly obsolete. - </para> - </listitem> - - <listitem> <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>. Lots of dependencies.</para> diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index b12a861f723a..c4a00ee507b2 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -28,7 +28,7 @@ in nodes = { tracker = { config, pkgs, ... }: - { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ]; + { environment.systemPackages = [ pkgs.transmission ]; # We need Apache on the tracker to serve the torrents. services.httpd.enable = true; diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh deleted file mode 100644 index 3f30aa5c851f..000000000000 --- a/pkgs/tools/networking/p2p/bittorrent/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix deleted file mode 100644 index 1d4f43445bf1..000000000000 --- a/pkgs/tools/networking/p2p/bittorrent/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 07c3126e5abe..ccd674a42d86 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -64,7 +64,6 @@ let binutils = linux; bind = linux; bitlbee = linux; - bittorrent = linux; blender = linux; bsdiff = all; btrfsProgs = linux; |