Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
2.6	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
2.7	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
3.2	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
3.3	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
3.4	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
docs	pythonDocs: recurseIntoAttrs does not recurse, bypass problem	2013-03-13 13:16:03 +01:00
python-linkme-wrapper.nix	preferLocalBuild: set to true for wrappers and fetchers	2014-02-10 21:04:17 +01:00
python-linkme-wrapper.sh	python: fix linkme-wrapper	2013-02-15 06:14:58 +01:00
wrapper.nix	pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv	2014-10-13 21:35:21 +02:00