10 commits

Author	SHA1	Message	Date
Domen Kozar	541f2ad531	Revert "python: first fix towards cross-compiling" ... This reverts commit c89fe1c0ee.	2013-05-20 12:03:58 +02:00
Domen Kozar	c89fe1c0ee	python: first fix towards cross-compiling	2013-05-20 11:15:32 +02:00
Vladimír Čunát	ec3965d8d0	Revert Merge x-updates into master due to mesa bloat ... See #490 discussion. This reverts commit 1278859d31, reversing changes made to 0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)	2013-05-09 14:03:35 +02:00
Vladimír Čunát	8249695b61	Merge branch 'master' into x-updates ... Needed that to fix the tarball.	2013-04-11 23:31:33 +02:00
Domen Kozar	ec25d38261	python 3.3.1rc1 -> 3.3.1	2013-04-07 11:13:37 +02:00
Vladimír Čunát	eb2e46aab2	Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix	2013-04-04 21:43:40 +02:00
Cillian de Róiste	0ad1f78760	Python3: fix the download URL	2013-03-28 22:57:37 +01:00
Cillian de Róiste	a5e48c0f20	Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix ... http://bugs.python.org/issue15833 When Python 3.3.0 attempts to compile python bytecode in the system directories it raises and exception and stops. Since Python 3.3 is only required by the latest Blender, I hope it's OK to use the RC until the final release.	2013-03-28 01:10:23 +01:00
Peter Simons	270a0009be	python3: update to version 3.3.0	2013-03-26 01:16:15 +01:00
Vladimír Čunát	b3ce50d88a	add python33 (needed by new blender)	2013-02-16 18:11:32 +01:00