Jude Taylor 066412c7b0 clean up propagated stuff for x509-system		2015-07-10 10:41:08 -07:00
..
applications	calibre: fix build by using qt54	2015-07-09 22:23:39 +02:00
build-support	Set ‘allowSubstitutes = false’ on various derivations	2015-07-09 15:10:37 +02:00
data	Merge branch 'master.upstream' into staging.upstream	2015-07-08 14:11:16 -07:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-01 13:38:17 -07:00
development	clean up propagated stuff for x509-system	2015-07-10 10:41:08 -07:00
games	Merge branch 'master.upstream' into staging.upstream	2015-07-06 17:15:11 -07:00
misc	vimPlugins: change wombat256 source to github	2015-07-08 19:01:26 +12:00
os-specific	clean up propagated stuff for x509-system	2015-07-10 10:41:08 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-07-08 14:11:16 -07:00
shells	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
stdenv	unique host deps, otherwise we get 600000 char derivations	2015-07-08 14:15:03 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-07-08 14:11:16 -07:00
top-level	add security-tool	2015-07-10 10:41:07 -07:00