Vladimír Čunát b4af993c3f Merge branch 'master' into staging ...

Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh

2014-11-14 14:28:23 +01:00

..

default.nix

python: add python.interpreter attribute

2014-11-13 00:42:36 +01:00

setup-hook.sh

Cleanup: Use += to append to envHooks

2014-08-09 12:47:05 +02:00