diff options
| author | aszlig <aszlig@nix.build> | 2020-09-14 23:41:28 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2020-09-14 23:51:16 +0200 |
| commit | f6561ac1edae7e795f1edaa96c73f4b34f0e9b04 (patch) | |
| tree | dce1b7b85df75bd785e9f36d6a9f7ad0cc0c9f57 /modules/core | |
| parent | 6b872d71f22ec01d146935c28f37c49722a23255 (diff) | |
Use attribute sets for boot.initrd.luks.devices
This was one of the places where types.loaOf was still in place and it got removed a while[1] ago and this in turn causes evaluation to fail for quite a few machines: The option value `boot.initrd.luks.devices' in `...' is not of type `attribute set of submodules'. I've not only changed all the machines to use attribute sets but also fixed the check in core/tests.nix, because comparing against a list when the actual type is an attribute set will result in all the LUKS tests to be part of *all* channels, no matter whether you're actually using LUKS. [1]: https://github.com/NixOS/nixpkgs/commit/20d491a317d9956ddca80913f07 Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch Cc: @sternenseemann
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/tests.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index 6ca1e255..0d581aec 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -383,7 +383,7 @@ let { check = config.boot.loader.grub.version == 1; path = ["nixos" "installer" "grub1"]; } - { check = config.boot.initrd.luks.devices != []; + { check = config.boot.initrd.luks.devices != {}; paths = [ ["nixos" "installer" "luksroot"] ["nixos" "installer" "luksroot-format1"] |