Spencer Janssen 2a31397f53 stage-1: fix typo that breaks resume ... $d should be $sd, this causes resume from hibernate to fail if resumeDevice is not explicitly set in config. Introduced in commit: 'stage-1: Shut up warnings about swap devices that don't exist yet'		2015-07-30 16:30:20 -05: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	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	nixos: nix-daemon: update maxJobs description	2015-07-30 19:06:45 +02: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
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