Thomas Tuegel ebe0befd86 Merge branch 'quassel'		2015-07-30 21:51:37 -05:00
..
config	nixos: let's not forget types in the timezone module	2015-07-31 01:57:47 +00:00
hardware	types.uniq types.str -> types.str	2015-06-15 18:12:32 +02:00
installer	Merge pull request #8978 from dezgeg/pr-arm-images	2015-07-29 14:13:57 +02:00
misc	Add read-only options	2015-07-30 13:44:50 +02:00
profiles	Replaces https://github.com/NixOS/nixpkgs/pull/8368	2015-06-17 19:26:17 +02:00
programs	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
security	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
services	Merge branch 'quassel'	2015-07-30 21:51:37 -05:00
system	stage-1: fix typo that breaks resume	2015-07-30 16:30:20 -05:00
tasks	Don't include wireless tools in containers	2015-07-22 12:51:21 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Use ConditionVirtualization to disable some services in containers	2015-07-22 12:23:40 +02:00
module-list.nix	Merge pull request #8799 from ryantm/master	2015-07-24 10:11:26 +02:00
rename.nix	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07:00