diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 22:48:27 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-31 18:19:00 +0200 |
commit | 478e7184f88db1364cc75107036f7c4decc0cc41 (patch) | |
tree | 5ff3d3a18e3aef9af4333c392a94751333754270 /nixos/modules/virtualisation | |
parent | 69d58ee24506e2b3b5aff347ae3b0791110340ec (diff) | |
download | nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.gz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.bz2 nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.lz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.xz nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.tar.zst nixpkgs-478e7184f88db1364cc75107036f7c4decc0cc41.zip |
nixos/modules: Remove all usages of types.string
And replace them with a more appropriate type Also fix up some minor module problems along the way
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/anbox.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/containers.nix | 8 | ||||
-rw-r--r-- | nixos/modules/virtualisation/kvmgt.nix | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/xen-dom0.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix index c63b971ead0..da5df358073 100644 --- a/nixos/modules/virtualisation/anbox.nix +++ b/nixos/modules/virtualisation/anbox.nix @@ -56,7 +56,7 @@ in dns = mkOption { default = "1.1.1.1"; - type = types.string; + type = types.str; description = '' Container DNS server. ''; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index b61558b2201..0c0d8551e4a 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -337,7 +337,7 @@ let networkOptions = { hostBridge = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "br0"; description = '' @@ -387,7 +387,7 @@ let }; hostAddress6 = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "fc00::1"; description = '' @@ -409,7 +409,7 @@ let }; localAddress6 = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "fc00::2"; description = '' @@ -565,7 +565,7 @@ in }; interfaces = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "eth1" "eth2" ]; description = '' diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index 289e26e1703..78753da5532 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -9,7 +9,7 @@ let vgpuOptions = { uuid = mkOption { - type = types.string; + type = types.str; description = "UUID of VGPU device. You can generate one with <package>libossp_uuid</package>."; }; }; @@ -23,7 +23,7 @@ in { ''; # multi GPU support is under the question device = mkOption { - type = types.string; + type = types.str; default = "0000:00:02.0"; description = "PCI ID of graphics card. You can figure it with <command>ls /sys/class/mdev_bus</command>."; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 70e575b6c0d..06d5c63476f 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -119,7 +119,7 @@ in virtualisation.xen.domains = { extraConfig = mkOption { - type = types.string; + type = types.lines; default = ""; description = '' |