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	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
deterministic-build.patch	Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by	2013-06-22 09:45:01 +03:00
nix-store-mtime.patch
remove-avoid-daemon-thread-shutdown.patch	python27: Remove avoid daemon thread shutdown #i21963	2014-10-16 11:28:37 +02:00
search-path.patch
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00