readding some python packages I dropped somehow by accident.

This also updates some python libraries and fixes some things I forgot
to patch

svn path=/nixpkgs/trunk/; revision=21171

pkgs/development/python2-packages/default.nix

@@ -9,10 +9,8 @@ rec {
   # pythonPackages
   # only keep packages being known to build with this python version
   b = builtins.removeAttrs allPythonPackages
-          (["foolscap"
-            "nevow"
-            "setuptoolsTrial"
-            "simplejson"
+          ([ "setuptoolsTrial"
+             "simplejson"
            ]
            # these packages don't build with specific python versions..
            ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") [])
@@ -39,6 +37,65 @@ rec {
         inherit (b) setuptools;
       };
 
+    beautifulsoap = b.buildPythonPackage (rec {
+      name = "beautifulsoap-3.0.8";
+
+      src = fetchurl {
+        url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz";
+        sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7";
+      };
+
+      # No tests implemented
+      doCheck = false;
+
+      meta = {
+        homepage = http://www.crummy.com/software/BeautifulSoup/;
+
+        license = "bsd";
+
+        description = "Undemanding HTML/XML parser";
+      };
+    }); 
+
+    clientform = b.buildPythonPackage (rec {
+      name = "clientform-0.2.10";
+
+      src = fetchurl {
+        url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz";
+        sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm";
+      };
+
+      meta = {
+        homepage = http://wwwsearch.sourceforge.net/ClientForm/;
+
+        license = "bsd";
+
+        description = "Python module for handling HTML forms on the client side";
+      };
+    });
+
+    cssutils = b.buildPythonPackage (rec {
+      name = "cssutils-0.9.7a2";
+
+      src = fetchurl {
+        url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip;
+        sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07";
+      };
+
+      buildInputs = [ pkgs.unzip ];
+
+      # The tests fail - I don't know why
+      doCheck = false;
+
+      meta = {
+        description = "A Python package to parse and build CSS";
+
+        homepage = http://code.google.com/p/cssutils/;
+
+        license = "LGPLv3+";
+      };
+    });
+
     foursuite = import ./4suite {
       inherit fetchurl stdenv python;
     };
@@ -110,7 +167,7 @@ rec {
 
     pyopengl = import ./pyopengl {
       inherit fetchurl stdenv python;
-      inherit (b) setuptools;
+      inherit (b) buildPythonPackage;
       inherit (pkgs)  mesa freeglut pil;
     };
 
@@ -871,6 +928,22 @@ rec {
       inherit (b) setuptools;
     };
 
+    zopeInterface = b.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";
+      };
+    };
+
   };
 
 }.result

pkgs/development/python2-packages/pyopengl/default.nix

@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, python, setuptools, mesa, freeglut, pil }:
+{ fetchurl, stdenv, python, mesa, freeglut, pil, buildPythonPackage }:
 
 let version = "3.0.0b5";
 in
-  stdenv.mkDerivation {
+  buildPythonPackage {
     name = "pyopengl-${version}";
 
     src = fetchurl {
@@ -10,17 +10,7 @@ in
       sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3";
     };
 
-    # Note: We need `ctypes', available in Python 2.5+.
-    buildInputs = [ python ];
-    propagatedBuildInputs = [ setuptools mesa freeglut pil ];
-
-    configurePhase = "ensureDir $out/lib/python2.5/site-packages";
-    buildPhase     = "python setup.py build";
-
-    installPhase   = ''
-      PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \
-      python setup.py install --prefix=$out
-    '';
+    propagatedBuildInputs = [ mesa freeglut pil ];
 
     meta = {
       homepage = http://pyopengl.sourceforge.net/;

pkgs/development/python2-packages/pyqt/4.7.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, sip, qt4}:
 
 stdenv.mkDerivation {
-  name = "pyqt-x11-gpl-4.7.2";
+  name = "pyqt-x11-gpl-4.7.3";
   
   src = fetchurl {
-    url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz;
-    sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv";
+    url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.3.tar.gz;
+    sha256 = "0p12m2rjsm3igpqqmgn79my2h16vhxq8dma9ih1744hpnirdcjjp";
   };
   
   configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";

pkgs/development/python2-packages/python-sip/4.10.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "sip-4.10.1";
+  name = "sip-4.10.2";
   
   src = fetchurl {
     url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
-    sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h";
+    sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q";
   };
   
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";