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.
wip/yesman
Joachim Fasting 8 years ago
parent d69dce080d
commit f9f354faad
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
  1. 1
      nixos/modules/config/i18n.nix
  2. 1
      nixos/modules/programs/java.nix
  3. 1
      nixos/modules/services/continuous-integration/gocd-agent/default.nix
  4. 1
      nixos/modules/services/continuous-integration/gocd-server/default.nix
  5. 3
      nixos/modules/services/misc/dictd.nix
  6. 1
      nixos/modules/services/misc/disnix.nix
  7. 3
      nixos/modules/services/misc/gitlab.nix
  8. 1
      nixos/modules/services/networking/flannel.nix
  9. 3
      nixos/modules/services/networking/quassel.nix
  10. 2
      nixos/modules/services/search/hound.nix
  11. 1
      nixos/modules/services/torrent/opentracker.nix
  12. 2
      nixos/modules/services/web-apps/quassel-webserver.nix
  13. 1
      nixos/modules/services/x11/compton.nix
  14. 4
      nixos/modules/system/boot/plymouth.nix

@ -44,6 +44,7 @@ in
consolePackages = mkOption {
type = types.listOf types.package;
default = with pkgs.kbdKeymaps; [ dvp neo ];
defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
description = ''
List of additional packages that provide console fonts, keymaps and
other resources.

@ -34,6 +34,7 @@ in
package = mkOption {
default = pkgs.jdk;
defaultText = "pkgs.jdk";
description = ''
Java package to install. Typical values are pkgs.jdk or pkgs.jre.
'';

@ -37,6 +37,7 @@ in {
packages = mkOption {
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;
description = ''
Packages to add to PATH for the Go.CD agent process.

@ -68,6 +68,7 @@ in {
packages = mkOption {
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;
description = ''
Packages to add to PATH for the Go.CD server's process.

@ -25,7 +25,8 @@ in
DBs = mkOption {
type = types.listOf types.package;
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.'';
};

@ -41,6 +41,7 @@ in
type = types.path;
description = "The Disnix package";
default = pkgs.disnix;
defaultText = "pkgs.disnix";
};
};

@ -164,18 +164,21 @@ in {
packages.gitlab = mkOption {
type = types.package;
default = pkgs.gitlab;
defaultText = "pkgs.gitlab";
description = "Reference to the gitlab package";
};
packages.gitlab-shell = mkOption {
type = types.package;
default = pkgs.gitlab-shell;
defaultText = "pkgs.gitlab-shell";
description = "Reference to the gitlab-shell package";
};
packages.gitlab-workhorse = mkOption {
type = types.package;
default = pkgs.gitlab-workhorse;
defaultText = "pkgs.gitlab-workhorse";
description = "Reference to the gitlab-workhorse package";
};

@ -20,6 +20,7 @@ in {
description = "Package to use for flannel";
type = types.package;
default = pkgs.flannel.bin;
defaultText = "pkgs.flannel.bin";
};
publicIp = mkOption {

@ -26,10 +26,11 @@ in
package = mkOption {
type = types.package;
default = pkgs.kde4.quasselDaemon;
defaultText = "pkgs.kde4.quasselDaemon";
description = ''
The package of the quassel daemon.
'';
example = pkgs.quasselDaemon;
example = literalExample "pkgs.quasselDaemon";
};
interfaces = mkOption {

@ -50,6 +50,8 @@ in {
package = mkOption {
default = pkgs.hound;
defaultText = "pkgs.hound";
type = types.package;
description = ''
Package for running hound.
'';

@ -13,6 +13,7 @@ in {
opentracker package to use
'';
default = pkgs.opentracker;
defaultText = "pkgs.opentracker";
};
extraOptions = mkOption {

@ -31,6 +31,8 @@ in {
};
pkg = mkOption {
default = pkgs.quassel-webserver;
defaultText = "pkgs.quassel-webserver";
type = types.package;
description = "The quassel-webserver package";
};
quasselCoreHost = mkOption {

@ -188,6 +188,7 @@ in {
package = mkOption {
type = types.package;
default = pkgs.compton;
defaultText = "pkgs.compton";
example = literalExample "pkgs.compton";
description = ''
Compton derivation to use.

@ -51,6 +51,10 @@ in
url = "https://nixos.org/logo/nixos-hires.png";
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
};
defaultText = ''pkgs.fetchurl {
url = "https://nixos.org/logo/nixos-hires.png";
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
}'';
description = ''
Logo which is displayed on the splash screen.
'';

Loading…
Cancel
Save