From 67b7a89daf3e737bff7c6da8ef06f9c1baa3089d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 1 Mar 2010 13:12:52 +0000
Subject: [PATCH] Move `zope.interface' to `python-packages.nix'.

svn path=/nixpkgs/trunk/; revision=20305
---
 .../python-modules/ZopeInterface/default.nix    | 12 ------------
 pkgs/top-level/all-packages.nix                 |  4 +---
 pkgs/top-level/python-packages.nix              | 17 ++++++++++++++++-
 3 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ZopeInterface/default.nix

diff --git a/pkgs/development/python-modules/ZopeInterface/default.nix b/pkgs/development/python-modules/ZopeInterface/default.nix
deleted file mode 100644
index 6bcedcd0f17..00000000000
--- a/pkgs/development/python-modules/ZopeInterface/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, python}:
-
-stdenv.mkDerivation {
-  name = "ZopeInterface-3.3.0";
-  src = fetchurl {
-    url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz;
-    sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0";
-  };
-  buildInputs = [python];
-  buildPhase = "true";
-  installPhase = "python ./setup.py install --prefix=$out";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39c7a75725a..12b4980e9d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5377,9 +5377,7 @@ let
 
   twisted = pythonPackages.twisted;
 
-  ZopeInterface = import ../development/python-modules/ZopeInterface {
-    inherit fetchurl stdenv python;
-  };
+  ZopeInterface = pythonPackages.zopeInterface;
 
   zope = import ../development/python-modules/zope {
     inherit fetchurl stdenv;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4edf92dc644..32a0a9fe453 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -641,7 +641,7 @@ rec {
       sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70";
     };
 
-    propagatedBuildInputs = [ pkgs.ZopeInterface ];
+    propagatedBuildInputs = [ zopeInterface ];
 
     # Generate Twisted's plug-in cache.  Twited users must do it as well.  See
     # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
@@ -717,4 +717,19 @@ rec {
     };
   });
 
+  zopeInterface = buildPythonPackage {
+    name = "zope-interface-3.3.0";
+    src = fetchurl {
+      url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz;
+      sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Zope.Interface";
+      homepage = http://zope.org/Products/ZopeInterface;
+      license = "ZPL";
+    };
+  };
 }