Author: eelco
Date: Fri Mar 4 19:57:52 2011
New Revision: 26164
URL: https://svn.nixos.org/websvn/nix/?rev=26164&sc=1
Log:
* Revert PyQt and sip because the upgrade breaks KDE, but use
tarballs on nixos.org.
Modified:
nixpkgs/trunk/pkgs/development/python-modules/pyqt/default.nix
nixpkgs/trunk/pkgs/development/python-modules/python-sip/default.nix
Modified: nixpkgs/trunk/pkgs/development/python-modules/pyqt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/python-modules/pyqt/default.nix Fri Mar
4 19:37:56 2011 (r26163)
+++ nixpkgs/trunk/pkgs/development/python-modules/pyqt/default.nix Fri Mar
4 19:57:52 2011 (r26164)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper
}:
stdenv.mkDerivation rec {
- name = "PyQt-x11-gpl-4.8.3";
+ name = "PyQt-x11-gpl-4.8.1";
src = fetchurl {
- url =
"http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";;
- sha256 = "0r6nqdbr8hls8bywr9wahgda6sh1pzmhb51fz8fl8zsdpffzwnca";
+ url = "http://nixos.org/tarballs/${name}.tar.gz";;
+ sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
};
preConfigure = ''
Modified: nixpkgs/trunk/pkgs/development/python-modules/python-sip/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/python-modules/python-sip/default.nix
Fri Mar 4 19:37:56 2011 (r26163)
+++ nixpkgs/trunk/pkgs/development/python-modules/python-sip/default.nix
Fri Mar 4 19:57:52 2011 (r26164)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "sip-4.12.1";
+ name = "sip-4.11.2";
src = fetchurl {
- url =
"http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";;
- sha256 = "1dc16f8m52qc824ksvyfhkdmsjbxyq82g5dr2xn8x9f26246xmp9";
+ url = "http://nixos.org/tarballs/${name}.tar.gz";;
+ sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
};
configurePhase = "python ./configure.py -d
$out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
