Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
..
2.6	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
2.7	Merge branch 'origin/master' into stdenv-updates.	2013-10-18 18:57:24 +02:00
3.2	recurse into python33 and pypy packages	2013-07-29 14:52:19 +02:00
3.3	Update python3 from 3.3.2 -> 3.3.3	2013-12-28 21:04:50 +01:00
docs	pythonDocs: recurseIntoAttrs does not recurse, bypass problem	2013-03-13 13:16:03 +01:00
python-linkme-wrapper.nix	python-linkme-wrapper	2013-01-22 15:28:30 +01:00
python-linkme-wrapper.sh	python: fix linkme-wrapper	2013-02-15 06:14:58 +01:00
wrapper.nix	Partial revert of b09f8110db	2013-11-19 09:04:32 -05:00