From 78d9448fcff61f666d2cdd03af9c8c80795f01f4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 10 Nov 2022 09:36:31 +0100 Subject: types: make deviceDependencies optional --- types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types.nix b/types.nix index 2dd2151..ba7aa2f 100644 --- a/types.nix +++ b/types.nix @@ -130,7 +130,7 @@ rec { create :: types.devices -> str */ create = devices: let - sortedDeviceList = diskoLib.sortDevicesByDependencies (diskoLib.meta devices).deviceDependencies devices; + sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices; in '' set -efux ${concatStrings (map (dev: attrByPath (dev ++ [ "_create" ]) "" devices) sortedDeviceList)} @@ -141,7 +141,7 @@ rec { */ mount = devices: let fsMounts = diskoLib.deepMergeMap (dev: dev._mount.fs or {}) (flatten (map attrValues (attrValues devices))); - sortedDeviceList = diskoLib.sortDevicesByDependencies (diskoLib.meta devices).deviceDependencies devices; + sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices; in '' set -efux # first create the neccessary devices -- cgit v1.2.3