Remove old sip and pyqt

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

4 files changed, 7 insertions, 49 deletions

diff --git a/pkgs/development/python-modules/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/4.7.nix
deleted file mode 100644
index eb09a32d00c6..000000000000
--- a/pkgs/development/python-modules/pyqt/4.7.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, python, sip, qt4}:
-
-stdenv.mkDerivation {
-  name = "pyqt-x11-gpl-4.7.2";
-  
-  src = fetchurl {
-    url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz;
-    sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv";
-  };
-  
-  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 = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 4357a4c0ed0d..eb09a32d00c6 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, sip, qt4}:
 
 stdenv.mkDerivation {
-  name = "pyqt-x11-gpl-4.5.4";
+  name = "pyqt-x11-gpl-4.7.2";
   
   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";
+    url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz;
+    sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv";
   };
   
   configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
diff --git a/pkgs/development/python-modules/python-sip/4.10.nix b/pkgs/development/python-modules/python-sip/4.10.nix
deleted file mode 100644
index c64d7be52f70..000000000000
--- a/pkgs/development/python-modules/python-sip/4.10.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, python }:
-
-stdenv.mkDerivation rec {
-  name = "sip-4.10.1";
-  
-  src = fetchurl {
-    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 = [ stdenv.lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index 3fb827e4600e..c64d7be52f70 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
-stdenv.mkDerivation {
-  name = "sip-4.8.2";
+stdenv.mkDerivation rec {
+  name = "sip-4.10.1";
   
   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";
+    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";