summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-15 18:18:46 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-15 18:18:46 +0200
commit6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc (patch)
tree7ab1646f34c7437c6cb41442a398163e00cb98bb /nixos/modules/system
parentc63bc92d4c040fb7999185e1948b29c3c84bacf9 (diff)
downloadnixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar.gz
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar.bz2
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar.lz
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar.xz
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.tar.zst
nixlib-6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc.zip
Some more type cleanup
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/luksroot.nix2
-rw-r--r--nixos/modules/system/boot/stage-1.nix2
-rw-r--r--nixos/modules/system/boot/systemd-unit-options.nix4
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 03070bef483a..3799e5d7ddb6 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -211,7 +211,7 @@ in
     };
 
     boot.initrd.luks.cryptoModules = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default =
         [ "aes" "aes_generic" "blowfish" "twofish"
           "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 8b58eccdcec7..893861a2eed2 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -358,7 +358,7 @@ in
     boot.initrd.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 57831a5e6ef3..a7a334dec285 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -42,13 +42,13 @@ in rec {
 
     requiredBy = mkOption {
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Units that require (i.e. depend on and need to go down with) this unit.";
     };
 
     wantedBy = mkOption {
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Units that want (i.e. depend on) this unit.";
     };