diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-03-23 14:04:47 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-03-23 14:04:47 +0000 |
commit | 9dd466d123a3b909a3e8eaca0eb8a958af2aa84f (patch) | |
tree | 33430cf9fa37ec75a09de2bff41527f638fc3ede /pkgs/development/python-modules | |
parent | 1771bf00519e42f42888e6080d1f07d986fa53f2 (diff) | |
download | nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.gz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.bz2 nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.lz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.xz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.zst nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.zip |
* 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
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/pyqt/3.17.4.nix | 20 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/4.3.3.nix | 21 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/4.7.nix | 12 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/python-modules/python-sip/4.10.nix | 16 | ||||
-rw-r--r-- | pkgs/development/python-modules/python-sip/4.7.4.nix | 18 | ||||
-rw-r--r-- | pkgs/development/python-modules/python-sip/default.nix | 8 |
7 files changed, 31 insertions, 74 deletions
diff --git a/pkgs/development/python-modules/pyqt/3.17.4.nix b/pkgs/development/python-modules/pyqt/3.17.4.nix deleted file mode 100644 index 435997a203cc..000000000000 --- a/pkgs/development/python-modules/pyqt/3.17.4.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/python-modules/pyqt/4.3.3.nix b/pkgs/development/python-modules/pyqt/4.3.3.nix deleted file mode 100644 index 370366ba0e0b..000000000000 --- a/pkgs/development/python-modules/pyqt/4.3.3.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/python-modules/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/4.7.nix index f6e85c338cb4..2390ac771d47 100644 --- a/pkgs/development/python-modules/pyqt/4.7.nix +++ b/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; }; } diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index f2c72f0ff277..4357a4c0ed0d 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/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; }; } diff --git a/pkgs/development/python-modules/python-sip/4.10.nix b/pkgs/development/python-modules/python-sip/4.10.nix index cdf7cf9aa40c..c64d7be52f70 100644 --- a/pkgs/development/python-modules/python-sip/4.10.nix +++ b/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 ]; }; } diff --git a/pkgs/development/python-modules/python-sip/4.7.4.nix b/pkgs/development/python-modules/python-sip/4.7.4.nix deleted file mode 100644 index 759246ebf0d4..000000000000 --- a/pkgs/development/python-modules/python-sip/4.7.4.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index bd08b7e6a248..3fb827e4600e 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/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 ]; }; } |