From f6561ac1edae7e795f1edaa96c73f4b34f0e9b04 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Sep 2020 23:41:28 +0200 Subject: 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 Cc: @Profpatsch Cc: @sternenseemann --- machines/profpatsch/mikiya.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'machines/profpatsch/mikiya.nix') diff --git a/machines/profpatsch/mikiya.nix b/machines/profpatsch/mikiya.nix index db3b6865..74acc76b 100644 --- a/machines/profpatsch/mikiya.nix +++ b/machines/profpatsch/mikiya.nix @@ -11,10 +11,7 @@ let }; systemDevice = "/dev/disk/by-id/ata-MKNSSDCR60GB-DX_MKN1140A0000025162"; - systemPartition = { - name = "mikiya-root"; - device = "/dev/disk/by-uuid/56910867-ed83-438a-b67c-c057e662c89e"; - }; + systemPartition = "/dev/disk/by-uuid/56910867-ed83-438a-b67c-c057e662c89e"; rootDevice = "/dev/mapper/mikiya-root"; raidDevices = lib.imap (mkDevice "raid") [ @@ -51,7 +48,7 @@ in { ]; # decrypt root device - luks.devices = [systemPartition]; + luks.devices.mikiya-root.device = systemPartition; }; }; -- cgit 1.4.1