Vladimír Čunát a2e7770b51 Merge branch 'master' into staging ... There have been some larger security rebuilds on master.		2017-02-01 15:56:35 +01:00
..
applications	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00
build-support	Add a pkgs.dhallToNix utility	2017-01-26 20:11:49 -08:00
data	callHackage: update Hackage snapshot to a current version	2017-01-31 22:50:18 +01:00
desktops	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00
development	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00
games	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00
misc	Merge branch 'master' into staging	2017-01-30 18:39:36 +01:00
os-specific	Merge branch 'master' into staging	2017-01-30 18:39:36 +01:00
servers	Merge pull request #22320 from pradeepchhetri/consul	2017-01-31 14:51:55 -05:00
shells	es: add ttuegel to maintainers	2017-01-31 07:54:36 -06:00
stdenv	stdenv: make is64bit evaluate true on aarch64	2017-01-29 20:28:14 +02:00
test
tools	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00
top-level	Merge branch 'master' into staging	2017-02-01 15:56:35 +01:00