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/services/hardware | |
parent | 69d58ee24506e2b3b5aff347ae3b0791110340ec (diff) | |
download | nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.gz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.bz2 nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.lz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.xz nixlib-478e7184f88db1364cc75107036f7c4decc0cc41.tar.zst nixlib-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/services/hardware')
-rw-r--r-- | nixos/modules/services/hardware/freefall.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/hardware/sane.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/hardware/tcsd.nix | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix index 066ccaa4d7cf..83f1e8c84f28 100644 --- a/nixos/modules/services/hardware/freefall.nix +++ b/nixos/modules/services/hardware/freefall.nix @@ -28,7 +28,7 @@ in { }; devices = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "/dev/sda" ]; description = '' Device paths to all internal spinning hard drives. diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 223adfee96e8..6c341bcbf240 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -43,7 +43,7 @@ in { }; blacklistDevices = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; description = '' @@ -52,7 +52,7 @@ in { }; blacklistPlugins = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "test" ]; example = [ "udev" ]; description = '' diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index fe05c5a5c06f..3f52658ff013 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -76,7 +76,7 @@ in }; hardware.sane.configDir = mkOption { - type = types.string; + type = types.str; internal = true; description = "The value of SANE_CONFIG_DIR."; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d4b0a9495d75..3876280ee6bc 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -49,13 +49,13 @@ in user = mkOption { default = "tss"; - type = types.string; + type = types.str; description = "User account under which tcsd runs."; }; group = mkOption { default = "tss"; - type = types.string; + type = types.str; description = "Group account under which tcsd runs."; }; @@ -65,19 +65,19 @@ in description = '' The location of the system persistent storage file. The system persistent storage file holds keys and data across - restarts of the TCSD and system reboots. + restarts of the TCSD and system reboots. ''; }; firmwarePCRs = mkOption { default = "0,1,2,3,4,5,6,7"; - type = types.string; + type = types.str; description = "PCR indices used in the TPM for firmware measurements."; }; kernelPCRs = mkOption { default = "8,9,10,11,12"; - type = types.string; + type = types.str; description = "PCR indices used in the TPM for kernel measurements."; }; |