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

2018-05-14 22:53:10 -04:00
parent 8a70c71c97 fd5ca417f2
commit f2017c40ae
48 changed files with 1528 additions and 2268 deletions
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -675,6 +675,7 @@ rec {
    in
      { config, options, ... }:
      { options = setAttrByPath from (mkOption {
+          inherit visible;
          description = "Alias of <option>${showOption to}</option>.";
          apply = x: use (toOf config);
        });