nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Substitute "types.uniq types.string" -> "types.str"

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-30 11:02:04 +01:00
parent 162b874469
commit 862e3dd977
35 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/development.xml
View File

@ -265,7 +265,7 @@ in
period = mkOption {
default = "15 02 * * *";
type = with types; uniq string;
type = types.str;
description = ''
This option defines (in the format used by cron) when the
locate database is updated.

2
nixos/modules/config/i18n.nix
View File

@ -55,7 +55,7 @@ in
description = "
The keyboard mapping table for the virtual consoles.
";
type = types.uniq types.string;
type = types.str;
};
};

4
nixos/modules/config/swap.nix
View File

@ -34,13 +34,13 @@ with utils;
device = mkOption {
example = "/dev/sda3";
type = types.uniq types.string;
type = types.str;
description = "Path of the device.";
};
label = mkOption {
example = "swap";
type = types.uniq types.string;
type = types.str;
description = ''
Label of the device. Can be used instead of <varname>device</varname>.
'';

2
nixos/modules/config/timezone.nix
View File

@ -9,7 +9,7 @@ with pkgs.lib;
timeZone = mkOption {
default = "CET";
type = with types; uniq string;
type = types.str;
example = "America/New_York";
description = "The time zone used when displaying times and dates.";
};

12
nixos/modules/config/users-groups.nix
View File

@ -12,12 +12,12 @@ let
options = {
name = mkOption {
type = with types; uniq string;
type = types.str;
description = "The name of the user account. If undefined, the name of the attribute set will be used.";
};
description = mkOption {
type = with types; uniq string;
type = types.str;
default = "";
description = "A short description of the user account.";
};
@ -29,7 +29,7 @@ let
};
group = mkOption {
type = with types; uniq string;
type = types.str;
default = "nogroup";
description = "The user's primary group.";
};
@ -41,13 +41,13 @@ let
};
home = mkOption {
type = with types; uniq string;
type = types.str;
default = "/var/empty";
description = "The user's home directory.";
};
shell = mkOption {
type = with types; uniq string;
type = types.str;
default = "/run/current-system/sw/sbin/nologin";
description = "The path to the user's shell.";
};
@ -107,7 +107,7 @@ let
options = {
name = mkOption {
type = with types; uniq string;
type = types.str;
description = "The name of the group. If undefined, the name of the attribute set will be used.";
};

10
nixos/modules/misc/version.nix
View File

@ -8,31 +8,31 @@ with pkgs.lib;
system.nixosVersion = mkOption {
internal = true;
type = types.uniq types.string;
type = types.str;
description = "NixOS version.";
};
system.nixosVersionSuffix = mkOption {
internal = true;
type = types.uniq types.string;
type = types.str;
description = "NixOS version suffix.";
};
system.nixosRevision = mkOption {
internal = true;
type = types.uniq types.string;
type = types.str;
description = "NixOS Git revision hash.";
};
system.nixosCodeName = mkOption {
internal = true;
type = types.uniq types.string;
type = types.str;
description = "NixOS release code name.";
};
system.defaultChannel = mkOption {
internal = true;
type = types.uniq types.string;
type = types.str;
default = https://nixos.org/channels/nixos-unstable;
description = "Default NixOS channel to which the root user is subscribed.";
};

2
nixos/modules/security/pam.nix
View File

@ -13,7 +13,7 @@ let
name = mkOption {
example = "sshd";
type = types.uniq types.string;
type = types.str;
description = "Name of the PAM service.";
};

10
nixos/modules/services/audio/fuppes.nix
View File

@ -21,7 +21,7 @@ with pkgs.lib;
name = mkOption {
example = "Media Center";
type = with types; uniq string;
type = types.str;
description = ''
Enables Fuppes (UPnP A/V Media Server). Can be used to watch
photos, video and listen to music from a phone/tv connected to the
@ -41,7 +41,7 @@ with pkgs.lib;
file = mkOption {
default = "/var/log/fuppes.log";
type = with types; uniq string;
type = types.str;
description = ''
File which will contains the log produced by the daemon.
'';
@ -50,7 +50,7 @@ with pkgs.lib;
config = mkOption {
example = "/etc/fuppes/fuppes.cfg";
type = with types; uniq string;
type = types.str;
description = ''
Mutable configuration file which can be edited with the web
interface. Due to possible modification, double quote the full
@ -69,7 +69,7 @@ with pkgs.lib;
database = mkOption {
default = "/var/lib/fuppes/fuppes.db";
type = with types; uniq string;
type = types.str;
description = ''
Database file which index all shared files.
'';
@ -88,7 +88,7 @@ with pkgs.lib;
user = mkOption {
default = "root"; # The default is not secure.
example = "fuppes";
type = with types; uniq string;
type = types.str;
description = ''
Name of the user which own the configuration files and under which
the fuppes daemon will be executed.

18
nixos/modules/services/logging/logcheck.nix
View File

@ -52,7 +52,7 @@ let
levelOption = mkOption {
default = "server";
type = types.uniq types.string;
type = types.str;
description = ''
Set the logcheck level. Either "workstation", "server", or "paranoid".
'';
@ -63,7 +63,7 @@ let
regex = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
description = ''
Regex specifying which log lines to ignore.
'';
@ -73,7 +73,7 @@ let
ignoreCronOptions = {
user = mkOption {
default = "root";
type = types.uniq types.string;
type = types.str;
description = ''
User that runs the cronjob.
'';
@ -81,7 +81,7 @@ let
cmdline = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
description = ''
Command line for the cron job. Will be turned into a regex for the logcheck ignore rule.
'';
@ -89,7 +89,7 @@ let
timeArgs = mkOption {
default = null;
type = types.nullOr (types.uniq types.string);
type = types.nullOr (types.str);
example = "02 06 * * *";
description = ''
"min hr dom mon dow" crontab time args, to auto-create a cronjob too.
@ -112,7 +112,7 @@ in
user = mkOption {
default = "logcheck";
type = types.uniq types.string;
type = types.str;
description = ''
Username for the logcheck user.
'';
@ -121,7 +121,7 @@ in
timeOfDay = mkOption {
default = "*";
example = "6";
type = types.uniq types.string;
type = types.str;
description = ''
Time of day to run logcheck. A logcheck will be scheduled at xx:02 each day.
Leave default (*) to run every hour. Of course when nothing special was logged,
@ -132,7 +132,7 @@ in
mailTo = mkOption {
default = "root";
example = "you@domain.com";
type = types.uniq types.string;
type = types.str;
description = ''
Email address to send reports to.
'';
@ -140,7 +140,7 @@ in
level = mkOption {
default = "server";
type = types.uniq types.string;
type = types.str;
description = ''
Set the logcheck level. Either "workstation", "server", or "paranoid".
'';

2
nixos/modules/services/logging/syslogd.nix
View File

@ -46,7 +46,7 @@ in
};
tty = mkOption {
type = types.uniq types.string;
type = types.str;
default = "tty10";
description = ''
The tty device on which syslogd will print important log

8
nixos/modules/services/mail/freepops.nix
View File

@ -35,7 +35,7 @@ in
bind = mkOption {
default = "0.0.0.0";
type = with types; uniq string;
type = types.str;
description = ''
Bind over an IPv4 address instead of any.
'';
@ -44,7 +44,7 @@ in
logFile = mkOption {
default = "/var/log/freepopsd";
example = "syslog";
type = with types; uniq string;
type = types.str;
description = ''
Filename of the log file or syslog to rely on the logging daemon.
'';
@ -53,7 +53,7 @@ in
suid = {
user = mkOption {
default = "nobody";
type = with types; uniq string;
type = types.str;
description = ''
User name under which freepopsd will be after binding the port.
'';
@ -61,7 +61,7 @@ in
group = mkOption {
default = "nogroup";
type = with types; uniq string;
type = types.str;
description = ''
Group under which freepopsd will be after binding the port.
'';

4
nixos/modules/services/misc/nix-gc.nix
View File

@ -22,7 +22,7 @@ in
dates = mkOption {
default = "03:15";
type = types.uniq types.string;
type = types.str;
description = ''
Specification (in the format described by
<citerefentry><refentrytitle>systemd.time</refentrytitle>
@ -34,7 +34,7 @@ in
options = mkOption {
default = "";
example = "--max-freed $((64 * 1024**3))";
type = types.uniq types.string;
type = types.str;
description = ''
Options given to <filename>nix-collect-garbage</filename> when the
garbage collector is run automatically.

2
nixos/modules/services/monitoring/dd-agent.nix
View File

@ -26,7 +26,7 @@ in {
example = "ae0aa6a8f08efa988ba0a17578f009ab";
type = types.uniq types.string;
type = types.str;
};
hostname = mkOption {

6
nixos/modules/services/monitoring/graphite.nix
View File

@ -32,13 +32,13 @@ in {
host = mkOption {
description = "Graphite web frontend listen address";
default = "127.0.0.1";
type = types.uniq types.string;
type = types.str;
};
port = mkOption {
description = "Graphite web frontend port";
default = "8080";
type = types.uniq types.string;
type = types.str;
};
};
@ -56,7 +56,7 @@ in {
LOG_UPDATES = False
LOG_CACHE_HITS = False
'';
type = types.uniq types.string;
type = types.str;
};
enableCache = mkOption {

8
nixos/modules/services/monitoring/statsd.nix
View File

@ -36,7 +36,7 @@ in
host = mkOption {
description = "Address that statsd listens on over UDP";
default = "127.0.0.1";
type = types.uniq types.string;
type = types.str;
};
port = mkOption {
@ -48,7 +48,7 @@ in
mgmt_address = mkOption {
description = "Address to run managment TCP interface on";
default = "127.0.0.1";
type = types.uniq types.string;
type = types.str;
};
mgmt_port = mkOption {
@ -65,7 +65,7 @@ in
graphiteHost = mkOption {
description = "Hostname or IP of Graphite server";
default = "127.0.0.1";
type = types.uniq types.string;
type = types.str;
};
graphitePort = mkOption {
@ -77,7 +77,7 @@ in
extraConfig = mkOption {
default = "";
description = "Extra configuration options for statsd";
type = types.uniq types.string;
type = types.str;
};
};

8
nixos/modules/services/monitoring/ups.nix
View File

@ -15,7 +15,7 @@ let
# This can be infered from the UPS model by looking at
# /nix/store/nut/share/driver.list
driver = mkOption {
type = types.uniq types.string;
type = types.str;
description = ''
Specify the program to run to talk to this UPS. apcsmart,
bestups, and sec are some examples.
@ -23,7 +23,7 @@ let
};
port = mkOption {
type = types.uniq types.string;
type = types.str;
description = ''
The serial port to which your UPS is connected. /dev/ttyS0 is
usually the first port on Linux boxes, for example.
@ -115,7 +115,7 @@ in
# This option is not used yet.
mode = mkOption {
default = "standalone";
type = types.uniq types.string;
type = types.str;
description = ''
The MODE determines which part of the NUT is to be started, and
which configuration files must be modified.
@ -142,7 +142,7 @@ in
schedulerRules = mkOption {
example = "/etc/nixos/upssched.conf";
type = types.uniq types.string;
type = types.str;
description = ''
File which contains the rules to handle UPS events.
'';

2
nixos/modules/services/networking/avahi-daemon.nix
View File

@ -50,7 +50,7 @@ in
};
hostName = mkOption {
type = types.uniq types.string;
type = types.str;
description = ''Host name advertised on the LAN.'';
};

2
nixos/modules/services/networking/cntlm.nix
View File

@ -39,7 +39,7 @@ in
};
netbios_hostname = mkOption {
type = types.uniq types.string;
type = types.str;
description = ''
The hostname of your machine.
'';

6
nixos/modules/services/networking/iodined.nix
View File

@ -32,21 +32,21 @@ in
};
ip = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
description = "Assigned ip address or ip range";
example = "172.16.10.1/24";
};
domain = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
description = "Domain or subdomain of which nameservers point to us";
example = "tunnel.mydomain.com";
};
extraConfig = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
description = "Additional command line parameters";
example = "-P mysecurepassword -l 192.168.1.10 -p 23";

4
nixos/modules/services/networking/wpa_supplicant.nix
View File

@ -53,7 +53,7 @@ in
};
driver = mkOption {
type = types.uniq types.string;
type = types.str;
default = "nl80211,wext";
description = "Force a specific wpa_supplicant driver.";
};
@ -74,7 +74,7 @@ in
};
group = mkOption {
type = types.uniq types.string;
type = types.str;
default = "wheel";
example = "network";
description = "Members of this group can control wpa_supplicant.";

12
nixos/modules/services/search/elasticsearch.nix
View File

@ -29,31 +29,31 @@ in {
host = mkOption {
description = "Elasticsearch listen address";
default = "127.0.0.1";
type = types.uniq types.string;
type = types.str;
};
port = mkOption {
description = "Elasticsearch port to listen for HTTP traffic";
default = "9200";
type = types.uniq types.string;
type = types.str;
};
tcp_port = mkOption {
description = "Elasticsearch port for the node to node communication";
default = "9300";
type = types.uniq types.string;
type = types.str;
};
cluster_name = mkOption {
description = "Elasticsearch name that identifies your cluster for auto-discovery";
default = "elasticsearch";
type = types.uniq types.string;
type = types.str;
};
extraConf = mkOption {
description = "Extra configuration for elasticsearch";
default = "";
type = types.uniq types.string;
type = types.str;
example = ''
node.name: "elasticsearch"
node.master: true
@ -77,7 +77,7 @@ in {
type: consolePattern
conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
'';
type = types.uniq types.string;
type = types.str;
};
};

2
nixos/modules/services/web-servers/lighttpd/default.nix
View File

@ -102,7 +102,7 @@ in
document-root = mkOption {
default = "/srv/www";
type = types.uniq types.string;
type = types.str;
description = ''
Document-root of the web server. Must be readable by the "lighttpd" user.
'';

4
nixos/modules/services/web-servers/lighttpd/gitweb.nix
View File

@ -25,7 +25,7 @@ in
projectroot = mkOption {
default = "/srv/git";
type = types.uniq types.string;
type = types.str;
description = ''
Path to git projects (bare repositories) that should be served by
gitweb. Must not end with a slash.
@ -34,7 +34,7 @@ in
extraConfig = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
description = ''
Verbatim configuration text appended to the generated gitweb.conf file.
'';

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -50,7 +50,7 @@ in
};
default = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
example = "none";
description = "Default desktop manager loaded if none have been chosen.";

2
nixos/modules/services/x11/display-managers/default.nix
View File

@ -249,7 +249,7 @@ in
};
execCmd = mkOption {
type = types.uniq types.string;
type = types.str;
example = "${pkgs.slim}/bin/slim";
description = "Command to start the display manager.";
};

2
nixos/modules/services/x11/window-managers/default.nix
View File

@ -40,7 +40,7 @@ in
};
default = mkOption {
type = types.uniq types.string;
type = types.str;
default = "none";
example = "wmii";
description = "Default window manager loaded if none have been chosen.";

2
nixos/modules/system/activation/top-level.nix
View File

@ -155,7 +155,7 @@ in
system.boot.loader.kernelFile = mkOption {
internal = true;
default = pkgs.stdenv.platform.kernelTarget;
type = types.uniq types.string;
type = types.str;
description = ''
Name of the kernel file to be passed to the bootloader.
'';

4
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -65,7 +65,7 @@ in
device = mkOption {
default = "";
example = "/dev/hda";
type = types.uniq types.string;
type = types.str;
description = ''
The device on which the GRUB boot loader will be installed.
The special value <literal>nodev</literal> means that a GRUB
@ -89,7 +89,7 @@ in
configurationName = mkOption {
default = "";
example = "Stable 2.6.21";
type = types.uniq types.string;
type = types.str;
description = ''
GRUB entry name instead of default.
'';

6
nixos/modules/system/boot/stage-2.nix
View File

@ -52,7 +52,7 @@ in
devSize = mkOption {
default = "5%";
example = "32m";
type = types.uniq types.string;
type = types.str;
description = ''
Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
for the accepted syntax.
@ -62,7 +62,7 @@ in
devShmSize = mkOption {
default = "50%";
example = "256m";
type = types.uniq types.string;
type = types.str;
description = ''
Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
for the accepted syntax.
@ -72,7 +72,7 @@ in
runSize = mkOption {
default = "25%";
example = "256m";
type = types.uniq types.string;
type = types.str;
description = ''
Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
for the accepted syntax.

16
nixos/modules/system/boot/systemd-unit-options.nix
View File

@ -19,7 +19,7 @@ rec {
description = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
description = "Description of this unit used in systemd messages and progress indicators.";
};
@ -167,13 +167,13 @@ rec {
};
script = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
description = "Shell commands executed as the service's main process.";
};
scriptArgs = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
description = "Arguments passed to the main process script.";
};
@ -230,7 +230,7 @@ rec {
};
startAt = mkOption {
type = types.uniq types.string;
type = types.str;
default = "";
example = "Sun 14:00:00";
description = ''
@ -296,13 +296,13 @@ rec {
what = mkOption {
example = "/dev/sda1";
type = types.uniq types.string;
type = types.str;
description = "Absolute path of device node, file or other resource. (Mandatory)";
};
where = mkOption {
example = "/mnt";
type = types.uniq types.string;
type = types.str;
description = ''
Absolute path of a directory of the mount point.
Will be created if it doesn't exist. (Mandatory)
@ -312,7 +312,7 @@ rec {
type = mkOption {
default = "";
example = "ext4";
type = types.uniq types.string;
type = types.str;
description = "File system type.";
};
@ -340,7 +340,7 @@ rec {
where = mkOption {
example = "/mnt";
type = types.uniq types.string;
type = types.str;
description = ''
Absolute path of a directory of the mount point.
Will be created if it doesn't exist. (Mandatory)

10
nixos/modules/system/boot/systemd.nix
View File

@ -389,7 +389,7 @@ in
type = types.attrsOf types.optionSet;
options = {
text = mkOption {
type = types.uniq types.string;
type = types.str;
description = "Text of this systemd unit.";
};
enable = mkOption {
@ -473,7 +473,7 @@ in
systemd.defaultUnit = mkOption {
default = "multi-user.target";
type = types.uniq types.string;
type = types.str;
description = "Default unit started when the system boots.";
};
@ -488,13 +488,13 @@ in
services.journald.console = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
description = "If non-empty, write log messages to the specified TTY device.";
};
services.journald.rateLimitInterval = mkOption {
default = "10s";
type = types.uniq types.string;
type = types.str;
description = ''
Configures the rate limiting interval that is applied to all
messages generated on the system. This rate limiting is applied
@ -518,7 +518,7 @@ in
services.logind.extraConfig = mkOption {
default = "";
type = types.uniq types.string;
type = types.str;
example = "HandleLidSwitch=ignore";
description = ''
Extra config options for systemd-logind. See man logind.conf for

2
nixos/modules/tasks/cpu-freq.nix
View File

@ -10,7 +10,7 @@ with pkgs.lib;
powerManagement.cpuFreqGovernor = mkOption {
default = "";
example = "ondemand";
type = types.uniq types.string;
type = types.str;
description = ''
Configure the governor used to regulate the frequence of the
available CPUs. By default, the kernel configures the

4
nixos/modules/tasks/filesystems.nix
View File

@ -15,7 +15,7 @@ let
mountPoint = mkOption {
example = "/mnt/usb";
type = types.uniq types.string;
type = types.str;
description = "Location of the mounted the file system.";
};
@ -36,7 +36,7 @@ let
fsType = mkOption {
default = "auto";
example = "ext3";
type = types.uniq types.string;
type = types.str;
description = "Type of the file system.";
};

10
nixos/modules/tasks/network-interfaces.nix
View File

@ -14,14 +14,14 @@ let
name = mkOption {
example = "eth0";
type = types.uniq types.string;
type = types.str;
description = "Name of the interface.";
};
ipAddress = mkOption {
default = null;
example = "10.0.0.1";
type = types.nullOr (types.uniq types.string);
type = types.nullOr (types.str);
description = ''
IP address of the interface. Leave empty to configure the
interface using DHCP.
@ -41,7 +41,7 @@ let
subnetMask = mkOption {
default = "";
example = "255.255.255.0";
type = types.uniq types.string;
type = types.str;
description = ''
Subnet mask of the interface, specified as a bitmask.
This is deprecated; use <option>prefixLength</option>
@ -52,7 +52,7 @@ let
macAddress = mkOption {
default = null;
example = "00:11:22:33:44:55";
type = types.nullOr (types.uniq types.string);
type = types.nullOr (types.str);
description = ''
MAC address of the interface. Leave empty to use the default.
'';
@ -72,7 +72,7 @@ let
virtualOwner = mkOption {
default = "root";
type = types.uniq types.string;
type = types.str;
description = ''
In case of a virtual device, the user who owns it.
'';

2
nixos/modules/tasks/scsi-link-power-management.nix
View File

@ -10,7 +10,7 @@ with pkgs.lib;
powerManagement.scsiLinkPolicy = mkOption {
default = "";
example = "min_power";
type = types.uniq types.string;
type = types.str;
description = ''
Configure the SCSI link power management policy. By default,
the kernel configures "max_performance".