From 5b7525c631891a51529795fc037eb6a98ba1afde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 24 May 2009 21:25:29 +0000
Subject: [PATCH] Move Twisted to `buildPythonPackage'.

svn path=/nixpkgs/trunk/; revision=15709
---
 .../python-modules/twisted/default.nix        | 17 -------------
 pkgs/top-level/python-packages.nix            | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/python-modules/twisted/default.nix

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
deleted file mode 100644
index a34907e261c..00000000000
--- a/pkgs/development/python-modules/twisted/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, python, ZopeInterface, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "twisted-8.1.0";
-  src = fetchurl {
-    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-  };
-  buildInputs = [python];
-
-  propagatedBuildInputs = [ZopeInterface makeWrapper];
-
-  installPhase = ''
-     python ./setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
-     for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done
-  '';
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c961a5b2d12..6c6c5eacbc1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -67,6 +67,30 @@ rec {
     };
   });
 
+  twisted = buildPythonPackage {
+    name = "twisted-8.1.0";
+
+    src = fetchurl {
+      url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+      sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+    };
+
+    propagatedBuildInputs = [ pkgs.ZopeInterface ];
+
+    meta = {
+      homepage = http://twistedmatrix.com/;
+
+      description = "Twisted, an event-driven networking engine written in Python";
+
+      longDescription = ''
+        Twisted is an event-driven networking engine written in Python
+        and licensed under the MIT license.
+      '';
+
+      license = "MIT";
+    };
+  };
+
   foolscap = buildPythonPackage (rec {
     name = "foolscap-0.3.2";