* Updated pyqt and sip because the old versions have disappeared.

* Removed some unused versions of those packages.
* Don't pass `lib' to packages (because we already have `stdenv.lib').
* Removed some `*_python26' variants because Python 2.6 is the default
  now.

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

pkgs/applications/misc/calibre/default.nix

@@ -1,6 +1,7 @@
-{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng,
-imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil,
-pil, cssutils, beautifulsoap, makeWrapper, unrar}:
+{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
+, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil
+, pil, cssutils, beautifulsoap, makeWrapper, unrar
+}:
 
 stdenv.mkDerivation rec {
   name = "calibre-0.6.43";
@@ -12,9 +13,11 @@ stdenv.mkDerivation rec {
 
   inherit python;
 
-  buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick
-    libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils
-    beautifulsoap ];
+  buildInputs =
+    [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
+      fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper
+      cssutils beautifulsoap
+    ];
 
   installPhase = ''
     export HOME=$TMPDIR/fakehome

pkgs/development/python-modules/pyqt/3.17.4.nix

@@ -1,20 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/p/python-qt3/python-qt3_3.17.4.orig.tar.gz;
-    sha256 = "0p76g64ww9nhg1sahphanwb7nkjmsvxyaqk8k8iaycnlc8040c8r";
-  };
-
-  buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib];
-  configureFlags = [" -q ${qt} "];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPythonConfigure" "doMakeInstall"];
-  extraPythonConfigureCommand = ''echo yes | \'';
-
-  name = "python-qt-" + version;
-  meta = {
-    description = "Qt bindings for Python";
-    license = "GPL";
-  };
-}

pkgs/development/python-modules/pyqt/4.3.3.nix

@@ -1,21 +0,0 @@
-args : with args;
-
-rec {
-  src = fetchurl {
-    url = mirror://debian/pool/main/p/python-qt4/python-qt4_4.3.3.orig.tar.gz;
-    sha256 = "0m8yzaz17nb8prm2kmy0mbiq4np515abi2xkadflsgwq1bj86qyk";
-  };
-
-  buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib];
-  configureFlags = [" -p $prefix/share/pyQt4/plugins " '' -e "$prefix/include/python$pythonVersion" ''];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPythonConfigure" "doMakeInstall"];
-  extraPythonConfigureCommand = ''echo yes | \'';
-
-  name = "python-qt-4.3.3";
-  meta = {
-    description = "Qt bindings for Python";
-    license = "GPL";
-  };
-}

pkgs/development/python-modules/pyqt/4.7.nix

@@ -1,18 +1,22 @@
-{stdenv, fetchurl, lib, python, sip, qt4}:
+{stdenv, fetchurl, python, sip, qt4}:
 
 stdenv.mkDerivation {
-  name = "pyqt-x11-gpl-4.7";
+  name = "pyqt-x11-gpl-4.7.2";
+  
   src = fetchurl {
     url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.tar.gz;
     sha256 = "0hwp84igw639mgw344q2jmnjarhq5wk60ncn8h2jjg7k4vchbvkz";
   };
+  
   configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
+  
   buildInputs = [ python sip qt4 ];
+  
   meta = {
     description = "Python bindings for Qt";
     license = "GPL";
     homepage = http://www.riverbankcomputing.co.uk;
-    maintainers = [ lib.maintainers.sander ];
-    platforms = lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }

pkgs/development/python-modules/pyqt/default.nix

@@ -1,18 +1,22 @@
-{stdenv, fetchurl, lib, python, sip, qt4}:
+{stdenv, fetchurl, python, sip, qt4}:
 
 stdenv.mkDerivation {
   name = "pyqt-x11-gpl-4.5.4";
+  
   src = fetchurl {
     url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases
     sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k";
   };
+  
   configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
+  
   buildInputs = [ python sip qt4 ];
+  
   meta = {
     description = "Python bindings for Qt";
     license = "GPL";
     homepage = http://www.riverbankcomputing.co.uk;
-    maintainers = [ lib.maintainers.sander ];
-    platforms = lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }

pkgs/development/python-modules/python-sip/4.10.nix

@@ -1,16 +1,20 @@
-{stdenv, fetchurl, lib, python}:
+{ stdenv, fetchurl, python }:
 
-stdenv.mkDerivation {
-  name = "sip-4.10";
+stdenv.mkDerivation rec {
+  name = "sip-4.10.1";
+  
   src = fetchurl {
-    url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.10.tar.gz;
-    sha256 = "15nnwn0x92iz5vh5d16dlqvxl56i8y4n4va53gc3f7z4d557d2nh";
+    url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
+    sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h";
   };
+  
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
+  
   buildInputs = [ python ];
+  
   meta = {
     description = "Creates C++ bindings for Python modules";
     license = "GPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

pkgs/development/python-modules/python-sip/4.7.4.nix

@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/s/sip4-qt3/sip4-qt3_4.7.4.orig.tar.gz;
-    sha256 = "0g518b26346q9b0lm13rsgdbq14r4nckyjbf209ylakwx6zir4l5";
-  };
-
-  buildInputs = [python];
-  configureFlags = [ '' -e "$prefix/include/python$pythonVersion" ''];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPythonConfigure" "doMakeInstall"];
-      
-  name = "python-sip-4.7.4";
-  meta = {
-    description = "Python/C++ bindings generator";
-  };
-}

pkgs/development/python-modules/python-sip/default.nix

@@ -1,16 +1,20 @@
-{stdenv, fetchurl, lib, python}:
+{ stdenv, fetchurl, python }:
 
 stdenv.mkDerivation {
   name = "sip-4.8.2";
+  
   src = fetchurl {
     url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases
     sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf";
   };
+  
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
+  
   buildInputs = [ python ];
+  
   meta = {
     description = "Creates C++ bindings for Python modules";
     license = "GPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -5328,14 +5328,9 @@ let
     inherit fetchurl stdenv python zlib libjpeg freetype;
   };
 
-  pil_python26 = import ../development/python-modules/pil {
-    inherit fetchurl stdenv zlib libjpeg freetype;
-    python = python26;
-  };
-
   psyco = import ../development/python-modules/psyco {
-      inherit fetchurl stdenv python;
-    };
+    inherit fetchurl stdenv python;
+  };
 
   pycairo = import ../development/python-modules/pycairo {
     inherit fetchurl stdenv python pkgconfig cairo x11;
@@ -5373,47 +5368,29 @@ let
     inherit python openssl;
   };
 
-  pythonSip = builderDefsPackage (import ../development/python-modules/python-sip/4.7.4.nix) {
-    inherit python;
-  };
-
   rhpl = import ../development/python-modules/rhpl {
     inherit stdenv fetchurl rpm cpio python wirelesstools gettext;
   };
 
-  sip = import ../development/python-modules/python-sip {
-    inherit stdenv fetchurl lib python;
-  };
-
-  sip410 = import ../development/python-modules/python-sip/4.10.nix {
-    inherit stdenv fetchurl lib python;
-  };
-
-  sip_python26 = import ../development/python-modules/python-sip {
-    inherit stdenv fetchurl lib;
-    python = python26;
-  };
+  sip = sip48;
 
-  pyqt = builderDefsPackage (import ../development/python-modules/pyqt/4.3.3.nix) {
-    inherit pkgconfig python pythonSip glib;
-    inherit (xlibs) libX11 libXext;
-    qt = qt4;
+  sip48 = import ../development/python-modules/python-sip {
+    inherit stdenv fetchurl python;
   };
 
-  pyqt4 = import ../development/python-modules/pyqt {
-    inherit stdenv fetchurl lib python sip;
-    qt4 = qt45;
+  sip410 = import ../development/python-modules/python-sip/4.10.nix {
+    inherit stdenv fetchurl python;
   };
 
-  pyqt4_python26 = import ../development/python-modules/pyqt {
-    inherit stdenv fetchurl lib;
+  pyqt4 = pyqt45;
+  
+  pyqt45 = import ../development/python-modules/pyqt {
+    inherit stdenv fetchurl python sip;
     qt4 = qt45;
-    python = python26;
-    sip = sip_python26;
   };
 
   pyqt47 = import ../development/python-modules/pyqt/4.7.nix {
-    inherit stdenv fetchurl lib python;
+    inherit stdenv fetchurl python;
     qt4 = qt46;
     sip = sip410;
   };
@@ -6892,11 +6869,8 @@ let
 
   calibre = import ../applications/misc/calibre {
     inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo
-      qt4 makeWrapper unrar;
+      qt4 makeWrapper unrar sip pyqt4 pil;
     python = python26Full;
-    pyqt4 = pyqt4_python26;
-    sip = sip_python26;
-    pil = pil_python26;
     popplerQt4 = popplerQt45;
     inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap;
   };
@@ -6944,7 +6918,6 @@ let
 
   chromeWrapper = wrapFirefox chrome "chrome" "";
 
-
   cinelerra = import ../applications/video/cinelerra {
     inherit lib fetchurl sourceFromHead stdenv
       automake autoconf libtool