diff options
author | Jan Malakhovski <oxij@oxij.org> | 2015-08-17 17:52:45 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2015-09-18 18:48:50 +0000 |
commit | 6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a (patch) | |
tree | 55e2983e16662e1074e9e668998253d31b429d59 /nixos/modules/tasks | |
parent | 33ae3f2fe4baeb4db19d3c90dbb6cd35b9373004 (diff) | |
download | nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar.gz nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar.bz2 nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar.lz nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar.xz nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.tar.zst nixlib-6eadb16022b6e52f3cdb2167aaa7b82e221bfc1a.zip |
nixos: fix some types
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 6 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems.nix | 4 | ||||
-rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 0370e36fbec2..8b5dd22fd380 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -22,21 +22,21 @@ let blkDev = mkOption { default = null; example = "/dev/sda1"; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; label = mkOption { default = null; example = "rootfs"; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; description = "Label of the backing encrypted device."; }; keyFile = mkOption { default = null; example = "/root/.swapkey"; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; description = "File system location of keyfile."; }; }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ce21d9fe7621..ce9e3555b6cd 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -22,14 +22,14 @@ let device = mkOption { default = null; example = "/dev/sda"; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; description = "Location of the device."; }; label = mkOption { default = null; example = "root-partition"; - type = types.uniq (types.nullOr types.string); + type = types.nullOr types.str; description = "Label of the device (if any)."; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index a967fc77e686..9931c977e8f0 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -499,7 +499,7 @@ in interface = mkOption { example = "enp4s0"; - type = types.string; + type = types.str; description = "The interface the macvlan will transmit packets through."; }; @@ -605,7 +605,7 @@ in interface = mkOption { example = "enp4s0"; - type = types.string; + type = types.str; description = "The interface the vlan will transmit packets through."; }; |