···36363737 askPassword = mkOption {
3838 type = types.str;
3939+ default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
3940 description = ''Program used by SSH to ask for passwords.'';
4041 };
4142···225226 '';
226227227228 environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
228228-229229- programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
230229231230 };
232231}
+1-2
nixos/modules/programs/venus.nix
···9999 };
100100101101 outputTheme = mkOption {
102102+ default = "${pkgs.venus}/themes/classic_fancy";
102103 type = types.path;
103104 description = ''
104105 Directory containing a config.ini file which is merged with this one.
···167168 serviceConfig.Group = "${cfg.group}";
168169 startAt = cfg.dates;
169170 };
170170-171171- services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
172171173172 };
174173}
+1-2
nixos/modules/services/amqp/activemq/default.nix
···3232 '';
3333 };
3434 configurationDir = mkOption {
3535+ default = "${activemq}/conf";
3536 description = ''
3637 The base directory for ActiveMQ's configuration.
3738 By default, this directory is searched for a file named activemq.xml,
···124125 ${cfg.extraJavaOptions} ActiveMQBroker "${cfg.configurationURI}"
125126 '';
126127 };
127127-128128- services.activemq.configurationDir = mkDefault "${activemq}/conf";
129128130129 };
131130
+23-8
nixos/modules/services/misc/nixos-manual.nix
···1717 nixpkgs.system = config.nixpkgs.system;
1818 };
19192020- eval = evalModules {
2121- modules = [ versionModule ] ++ baseModules;
2222- args = (config._module.args) // { modules = [ ]; };
2323- };
2424-2020+ /* For the purpose of generating docs, evaluate options with each derivation
2121+ in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
2222+ It isn't perfect, but it seems to cover a vast majority of use cases.
2323+ Caveat: even if the package is reached by a different means,
2424+ the path above will be shown and not e.g. `${config.services.foo.package}`. */
2525 manual = import ../../../doc/manual {
2626 inherit pkgs;
2727 version = config.system.nixosVersion;
2828 revision = config.system.nixosRevision;
2929- options = eval.options;
2929+ options =
3030+ let
3131+ scrubbedEval = evalModules {
3232+ modules = [ versionModule ] ++ baseModules;
3333+ args = (config._module.args) // { modules = [ ]; };
3434+ specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
3535+ };
3636+ scrubDerivations = namePrefix: pkgSet: mapAttrs
3737+ (name: value:
3838+ let wholeName = "${namePrefix}.${name}"; in
3939+ if isAttrs value then
4040+ scrubDerivations wholeName value
4141+ // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
4242+ else value
4343+ )
4444+ pkgSet;
4545+ in scrubbedEval.options;
3046 };
31473248 entry = "${manual.manual}/share/doc/nixos/index.html";
···81978298 services.nixosManual.browser = mkOption {
8399 type = types.path;
100100+ default = "${pkgs.w3m-nox}/bin/w3m";
84101 description = ''
85102 Browser used to show the manual.
86103 '';
···117134118135 services.mingetty.helpLine = mkIf cfg.showManual
119136 "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
120120-121121- services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
122137123138 };
124139
+1-3
nixos/modules/services/misc/subsonic.nix
···97979898 transcoders = mkOption {
9999 type = types.listOf types.path;
100100+ default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
100101 description = ''
101102 List of paths to transcoder executables that should be accessible
102103 from Subsonic. Symlinks will be created to each executable inside
···152153 };
153154154155 users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
155155-156156- services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
157157-158156 };
159157}
···5252 default = "opendns";
5353 type = types.nullOr types.string;
5454 description = ''
5555- The name of the upstream DNSCrypt resolver to use.
5555+ The name of the upstream DNSCrypt resolver to use. See
5656+ <literal>${resolverListFile}</literal> for alternative resolvers
5757+ (e.g., if you are concerned about logging and/or server
5858+ location).
5659 '';
5760 };
5861 customResolver = mkOption {
···87878888 background = mkOption {
8989 type = types.str;
9090+ default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
9091 description = ''
9192 The background image or color to use.
9293 '';
···152153 };
153154154155 users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
155155-156156- services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
157157-158156 services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..
159157 services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
160158 };