William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream		2015-07-13 15:11:31 -07:00
..
config	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
hardware	types.uniq types.str -> types.str	2015-06-15 18:12:32 +02:00
installer	nixos-install: Don't barf if btrfs is missing	2015-07-13 17:55:49 +02:00
misc	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07: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 'master.upstream' into staging.upstream	2015-07-13 15:11:31 -07:00
system	Set ‘allowSubstitutes = false’ on various derivations	2015-07-09 15:10:37 +02:00
tasks	Some more type cleanup	2015-06-15 18:18:46 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	nixos docker: fix service and test	2015-07-05 13:57:23 +02:00
module-list.nix	Merge pull request #8639 from sjmackenzie/zerotierone	2015-07-08 02:15:14 +03:00
rename.nix	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07:00