diff options
author | danbst <abcz2.uprola@gmail.com> | 2019-01-26 21:44:05 +0200 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2019-01-31 00:41:10 +0200 |
commit | 27982b408e465554b8831f492362bc87ed0ec02a (patch) | |
tree | 9d91ef0747a5e1ed4a425e3e86a1b7172a8a16e4 /nixos/modules | |
parent | aa2e63ce5ed6e24d73eaefe61489ece46f7460d7 (diff) | |
download | nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.gz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.bz2 nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.lz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.xz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.zst nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.zip |
types.optionSet: deprecate and remove last usages
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/profiles/minimal.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/nylon.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 22 | ||||
-rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 12 | ||||
-rw-r--r-- | nixos/modules/testing/service-runner.nix | 25 |
6 files changed, 34 insertions, 32 deletions
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 809bedc588f..f044e6f39ea 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -13,5 +13,5 @@ with lib; documentation.enable = mkDefault false; - services.nixosManual.enable = mkDefault false; + documentation.nixos.enable = mkDefault false; } diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 613b0e0fb51..b061ce34ed2 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -142,7 +142,6 @@ in description = "Collection of named nylon instances"; type = with types; loaOf (submodule nylonOpts); internal = true; - options = [ nylonOpts ]; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 90d08ca3131..95dc8a62a45 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -11,7 +11,7 @@ let userOptions = { - openssh.authorizedKeys = { + options.openssh.authorizedKeys = { keys = mkOption { type = types.listOf types.str; default = []; @@ -320,7 +320,7 @@ in }; users.users = mkOption { - options = [ userOptions ]; + type = with types; loaOf (submodule userOptions); }; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index c8ea1401528..5e27b24ac44 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -525,16 +525,18 @@ in }; fileSystems = mkOption { - options.neededForBoot = mkOption { - default = false; - type = types.bool; - description = '' - If set, this file system will be mounted in the initial - ramdisk. By default, this applies to the root file system - and to the file system containing - <filename>/nix/store</filename>. - ''; - }; + type = with lib.types; loaOf (submodule { + options.neededForBoot = mkOption { + default = false; + type = types.bool; + description = '' + If set, this file system will be mounted in the initial + ramdisk. By default, this applies to the root file system + and to the file system containing + <filename>/nix/store</filename>. + ''; + }; + }); }; }; diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 11ed5d7e4d0..2ffbb877706 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -12,28 +12,28 @@ let encryptedFSOptions = { - encrypted = { + options.encrypted = { enable = mkOption { default = false; type = types.bool; description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; - blkDev = mkOption { + options.blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; - label = mkOption { + options.label = mkOption { default = null; example = "rootfs"; type = types.nullOr types.str; description = "Label of the unlocked encrypted device. Set <literal>fileSystems.<name?>.device</literal> to <literal>/dev/mapper/<label></literal> to mount the unlocked device."; }; - keyFile = mkOption { + options.keyFile = mkOption { default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; @@ -47,10 +47,10 @@ in options = { fileSystems = mkOption { - options = [encryptedFSOptions]; + type = with lib.types; loaOf (submodule encryptedFSOptions); }; swapDevices = mkOption { - options = [encryptedFSOptions]; + type = with lib.types; listOf (submodule encryptedFSOptions); }; }; diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index 5ead75788e5..17d5e337690 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -92,23 +92,24 @@ let exit($mainRes & 127 ? 255 : $mainRes << 8); ''; + opts = { config, name, ... }: { + options.runner = mkOption { + internal = true; + description = '' + A script that runs the service outside of systemd, + useful for testing or for using NixOS services outside + of NixOS. + ''; + }; + config.runner = makeScript name config; + }; + in { options = { systemd.services = mkOption { - options = - { config, name, ... }: - { options.runner = mkOption { - internal = true; - description = '' - A script that runs the service outside of systemd, - useful for testing or for using NixOS services outside - of NixOS. - ''; - }; - config.runner = makeScript name config; - }; + type = with types; attrsOf (submodule opts); }; }; } |