nixos/modules: use defaultText where applicable
Primarily to fix rendering of these default values in the manual but it's also nice to avoid having to eval these things just to build the manual.
This commit is contained in:
parent
d69dce080d
commit
f9f354faad
|
@ -44,6 +44,7 @@ in
|
||||||
consolePackages = mkOption {
|
consolePackages = mkOption {
|
||||||
type = types.listOf types.package;
|
type = types.listOf types.package;
|
||||||
default = with pkgs.kbdKeymaps; [ dvp neo ];
|
default = with pkgs.kbdKeymaps; [ dvp neo ];
|
||||||
|
defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
|
||||||
description = ''
|
description = ''
|
||||||
List of additional packages that provide console fonts, keymaps and
|
List of additional packages that provide console fonts, keymaps and
|
||||||
other resources.
|
other resources.
|
||||||
|
|
|
@ -34,6 +34,7 @@ in
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
default = pkgs.jdk;
|
default = pkgs.jdk;
|
||||||
|
defaultText = "pkgs.jdk";
|
||||||
description = ''
|
description = ''
|
||||||
Java package to install. Typical values are pkgs.jdk or pkgs.jre.
|
Java package to install. Typical values are pkgs.jdk or pkgs.jre.
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -37,6 +37,7 @@ in {
|
||||||
|
|
||||||
packages = mkOption {
|
packages = mkOption {
|
||||||
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
|
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
|
||||||
|
defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]";
|
||||||
type = types.listOf types.package;
|
type = types.listOf types.package;
|
||||||
description = ''
|
description = ''
|
||||||
Packages to add to PATH for the Go.CD agent process.
|
Packages to add to PATH for the Go.CD agent process.
|
||||||
|
|
|
@ -68,6 +68,7 @@ in {
|
||||||
|
|
||||||
packages = mkOption {
|
packages = mkOption {
|
||||||
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
|
default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
|
||||||
|
defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]";
|
||||||
type = types.listOf types.package;
|
type = types.listOf types.package;
|
||||||
description = ''
|
description = ''
|
||||||
Packages to add to PATH for the Go.CD server's process.
|
Packages to add to PATH for the Go.CD server's process.
|
||||||
|
|
|
@ -25,7 +25,8 @@ in
|
||||||
DBs = mkOption {
|
DBs = mkOption {
|
||||||
type = types.listOf types.package;
|
type = types.listOf types.package;
|
||||||
default = with pkgs.dictdDBs; [ wiktionary wordnet ];
|
default = with pkgs.dictdDBs; [ wiktionary wordnet ];
|
||||||
example = [ pkgs.dictdDBs.nld2eng ];
|
defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]";
|
||||||
|
example = literalExample "[ pkgs.dictdDBs.nld2eng ]";
|
||||||
description = ''List of databases to make available.'';
|
description = ''List of databases to make available.'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,7 @@ in
|
||||||
type = types.path;
|
type = types.path;
|
||||||
description = "The Disnix package";
|
description = "The Disnix package";
|
||||||
default = pkgs.disnix;
|
default = pkgs.disnix;
|
||||||
|
defaultText = "pkgs.disnix";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -164,18 +164,21 @@ in {
|
||||||
packages.gitlab = mkOption {
|
packages.gitlab = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.gitlab;
|
default = pkgs.gitlab;
|
||||||
|
defaultText = "pkgs.gitlab";
|
||||||
description = "Reference to the gitlab package";
|
description = "Reference to the gitlab package";
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.gitlab-shell = mkOption {
|
packages.gitlab-shell = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.gitlab-shell;
|
default = pkgs.gitlab-shell;
|
||||||
|
defaultText = "pkgs.gitlab-shell";
|
||||||
description = "Reference to the gitlab-shell package";
|
description = "Reference to the gitlab-shell package";
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.gitlab-workhorse = mkOption {
|
packages.gitlab-workhorse = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.gitlab-workhorse;
|
default = pkgs.gitlab-workhorse;
|
||||||
|
defaultText = "pkgs.gitlab-workhorse";
|
||||||
description = "Reference to the gitlab-workhorse package";
|
description = "Reference to the gitlab-workhorse package";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ in {
|
||||||
description = "Package to use for flannel";
|
description = "Package to use for flannel";
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.flannel.bin;
|
default = pkgs.flannel.bin;
|
||||||
|
defaultText = "pkgs.flannel.bin";
|
||||||
};
|
};
|
||||||
|
|
||||||
publicIp = mkOption {
|
publicIp = mkOption {
|
||||||
|
|
|
@ -26,10 +26,11 @@ in
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.kde4.quasselDaemon;
|
default = pkgs.kde4.quasselDaemon;
|
||||||
|
defaultText = "pkgs.kde4.quasselDaemon";
|
||||||
description = ''
|
description = ''
|
||||||
The package of the quassel daemon.
|
The package of the quassel daemon.
|
||||||
'';
|
'';
|
||||||
example = pkgs.quasselDaemon;
|
example = literalExample "pkgs.quasselDaemon";
|
||||||
};
|
};
|
||||||
|
|
||||||
interfaces = mkOption {
|
interfaces = mkOption {
|
||||||
|
|
|
@ -50,6 +50,8 @@ in {
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
default = pkgs.hound;
|
default = pkgs.hound;
|
||||||
|
defaultText = "pkgs.hound";
|
||||||
|
type = types.package;
|
||||||
description = ''
|
description = ''
|
||||||
Package for running hound.
|
Package for running hound.
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -13,6 +13,7 @@ in {
|
||||||
opentracker package to use
|
opentracker package to use
|
||||||
'';
|
'';
|
||||||
default = pkgs.opentracker;
|
default = pkgs.opentracker;
|
||||||
|
defaultText = "pkgs.opentracker";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraOptions = mkOption {
|
extraOptions = mkOption {
|
||||||
|
|
|
@ -31,6 +31,8 @@ in {
|
||||||
};
|
};
|
||||||
pkg = mkOption {
|
pkg = mkOption {
|
||||||
default = pkgs.quassel-webserver;
|
default = pkgs.quassel-webserver;
|
||||||
|
defaultText = "pkgs.quassel-webserver";
|
||||||
|
type = types.package;
|
||||||
description = "The quassel-webserver package";
|
description = "The quassel-webserver package";
|
||||||
};
|
};
|
||||||
quasselCoreHost = mkOption {
|
quasselCoreHost = mkOption {
|
||||||
|
|
|
@ -188,6 +188,7 @@ in {
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.compton;
|
default = pkgs.compton;
|
||||||
|
defaultText = "pkgs.compton";
|
||||||
example = literalExample "pkgs.compton";
|
example = literalExample "pkgs.compton";
|
||||||
description = ''
|
description = ''
|
||||||
Compton derivation to use.
|
Compton derivation to use.
|
||||||
|
|
|
@ -51,6 +51,10 @@ in
|
||||||
url = "https://nixos.org/logo/nixos-hires.png";
|
url = "https://nixos.org/logo/nixos-hires.png";
|
||||||
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
|
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
|
||||||
};
|
};
|
||||||
|
defaultText = ''pkgs.fetchurl {
|
||||||
|
url = "https://nixos.org/logo/nixos-hires.png";
|
||||||
|
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
|
||||||
|
}'';
|
||||||
description = ''
|
description = ''
|
||||||
Logo which is displayed on the splash screen.
|
Logo which is displayed on the splash screen.
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in New Issue
Block a user