From e6f589d4bfe8b56443163815a0a60b91f2345257 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 18:04:03 +0000
Subject: [PATCH] * Some Python packages.

svn path=/nixpkgs/trunk/; revision=7339
---
 .../python-modules/ZopeInterface/default.nix         | 12 ++++++++++++
 pkgs/development/python-modules/twisted/default.nix  | 12 ++++++++++++
 pkgs/tools/networking/p2p/bittorrent/default.nix     |  6 +++---
 pkgs/top-level/all-packages.nix                      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/ZopeInterface/default.nix
 create mode 100644 pkgs/development/python-modules/twisted/default.nix

diff --git a/pkgs/development/python-modules/ZopeInterface/default.nix b/pkgs/development/python-modules/ZopeInterface/default.nix
new file mode 100644
index 000000000000..0fe40954115b
--- /dev/null
+++ b/pkgs/development/python-modules/ZopeInterface/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation {
+  name = "ZopeInterface-3.1.0c1";
+  src = fetchurl {
+    url = http://www.zope.org/Products/ZopeInterface/3.1.0c1/ZopeInterface-3.1.0c1.tgz;
+    md5 = "f34cb95f2fbdbe3f1850c95cefddbd2c";
+  };
+  buildInputs = [python];
+  buildPhase = "true";
+  installPhase = "python ./setup.py install --prefix=$out";
+}
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
new file mode 100644
index 000000000000..cbcadbb99cbe
--- /dev/null
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, python, ZopeInterface}:
+
+stdenv.mkDerivation {
+  name = "twisted-2.4.0";
+  src = fetchurl {
+    url = http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/Twisted-2.4.0.tar.bz2;
+    md5 = "42eb0c8fd0f8707a39fff1dd6adab27d";
+  };
+  buildInputs = [python ZopeInterface];
+  buildPhase = "true";
+  installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
+}
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
index cf84dcfa263b..204b3ec06056 100644
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ b/pkgs/tools/networking/p2p/bittorrent/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, pygtk, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "bittorrent-4.4.0";
+  name = "bittorrent-5.0.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/BitTorrent-4.4.0.tar.gz;
-    md5 = "74d4b48202c28f0b27e989b6d5f5b214";
+    url = http://download.bittorrent.com/dl/BitTorrent-5.0.3.tar.gz;
+    md5 = "592363a33c35e9f66759a736dbf7e038";
   };
   buildInputs = [python pygtk];
   inherit python pygtk makeWrapper;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ce243948716..58dc005e8141 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1961,10 +1961,18 @@ rec {
     inherit (gtkLibs) glib gtk;
   };
 
-  wxPython = import ../development/python-modules/wxPython-2.5 {
+  wxPython = import ../development/python-modules/wxPython {
     inherit fetchurl stdenv pkgconfig wxGTK python;
   };
 
+  twisted = import ../development/python-modules/twisted {
+    inherit fetchurl stdenv python ZopeInterface;
+  };
+
+  ZopeInterface = import ../development/python-modules/ZopeInterface {
+    inherit fetchurl stdenv python;
+  };
+
 
   ### SERVERS