From eb59c50308097c294b55b3ec93ad1ea3f466a052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 24 May 2009 21:27:30 +0000
Subject: [PATCH] Remove from `all-packages.nix' packages that are now in
 `python-packages.nix'.

svn path=/nixpkgs/trunk/; revision=15710
---
 pkgs/top-level/all-packages.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bb2df8f2cd..6e4db86cb14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4228,14 +4228,6 @@ let
     setuptools = setuptools.passthru.function {inherit python;};
   });
 
-  foolscap = import ../development/python-modules/foolscap {
-    inherit fetchurl stdenv python setuptools twisted pyopenssl;
-  };
-
-  nevow = import ../development/python-modules/nevow {
-    inherit fetchurl stdenv python setuptools twisted makeWrapper lib;
-  };
-
   numeric = import ../development/python-modules/numeric {
     inherit fetchurl stdenv python;
   };
@@ -4328,10 +4320,6 @@ let
     inherit python makeWrapper;
   };
 
-  simplejson = import ../development/python-modules/simplejson {
-    inherit fetchsvn stdenv python setuptools;
-  };
-
   wxPython = wxPython26;
 
   wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
@@ -4344,9 +4332,7 @@ let
     wxGTK = wxGTK28;
   };
 
-  twisted = import ../development/python-modules/twisted {
-    inherit fetchurl stdenv python ZopeInterface makeWrapper;
-  };
+  twisted = pythonPackages.twisted;
 
   ZopeInterface = import ../development/python-modules/ZopeInterface {
     inherit fetchurl stdenv python;