JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old sip and pyqt

Browse Source 
svn path=/nixpkgs/trunk/; revision=21017
This commit is contained in:
Yury G. Kudryashov 2010-04-11 21:03:51 +00:00
parent 62bcea0382
commit 8ff59ce09c
5 changed files with 13 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/pyqt/4.7.nix
View File

@ -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;
};
}

6
pkgs/development/python-modules/pyqt/default.nix
View File

@ -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";

20
pkgs/development/python-modules/python-sip/4.10.nix
View File

@ -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 ];
};
}

8
pkgs/development/python-modules/python-sip/default.nix
View File

@ -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";

42
pkgs/top-level/all-packages.nix
View File

@ -4818,14 +4818,9 @@ let
qt4Support = false;
};
popplerQt45 = poppler.override {
popplerQt4 = poppler.override {
inherit qt4;
qt4Support = true;
qt4 = qt45;
};
popplerQt46 = poppler.override {
qt4Support = true;
qt4 = qt46;
};
popt = import ../development/libraries/popt {
@ -5362,24 +5357,12 @@ let
inherit stdenv fetchurl rpm cpio python wirelesstools gettext;
};
sip48 = import ../development/python-modules/python-sip {
sip = import ../development/python-modules/python-sip {
inherit stdenv fetchurl python;
};
sip410 = import ../development/python-modules/python-sip/4.10.nix {
inherit stdenv fetchurl python;
};
pyqt45 = import ../development/python-modules/pyqt {
inherit stdenv fetchurl python;
qt4 = qt45;
sip = sip48;
};
pyqt47 = import ../development/python-modules/pyqt/4.7.nix {
inherit stdenv fetchurl python;
qt4 = qt46;
sip = sip410;
pyqt4 = import ../development/python-modules/pyqt {
inherit stdenv fetchurl python qt4 sip;
};
pyx = import ../development/python-modules/pyx {
@ -6865,20 +6848,11 @@ let
calibre = makeOverridable (import ../applications/misc/calibre) {
inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo
qt4 makeWrapper unrar pil chmlib;
qt4 makeWrapper unrar pil chmlib popplerQt4 pyqt4 sip;
python = python26Full;
popplerQt4 = popplerQt45;
pyqt4 = pyqt45;
sip = sip48;
inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap;
};
calibreQt46 = calibre.override {
popplerQt4 = popplerQt46;
pyqt4 = pyqt47;
sip = sip410;
};
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib python
@ -8784,10 +8758,6 @@ let
kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
openexr = openexr_1_6_1;
qt4 = qt46;
popplerQt4 = popplerQt46;
sip = sip410;
pyqt4 = pyqt47;
});
### SCIENCE