Merge remote-tracking branch 'upstream/master' into staging

2016-04-28 00:13:53 +03:00
parent 7ac1ef05fa 49d1acb50f
commit 4ff8f377af
167 changed files with 48315 additions and 22496 deletions
@@ -36,7 +36,7 @@ in
      type = types.loaOf types.optionSet;
      default = {};
      example = literalExample ''
-        { hosts =
+        { example-configuration-file =
            { source = "/nix/store/.../etc/dir/file.conf.example";
              mode = "0440";
            };