From 396553d2587ebd8302203ea76f9b42f992cf5927 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 7 Oct 2018 10:47:34 +0200 Subject: lib.config: mergeAttrs -> recursiveUpdate --- lib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/default.nix') diff --git a/lib/default.nix b/lib/default.nix index 9361842..3132bfd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -18,7 +18,7 @@ let { }; config.devices = q: x: - foldl' mergeAttrs {} (mapAttrsToList (name: config-f { device = "/dev/${name}"; }) x.content); + foldl' recursiveUpdate {} (mapAttrsToList (name: config-f { device = "/dev/${name}"; }) x.content); config.luks = q: x: { boot.initrd.luks.devices.${x.name}.device = q.device; @@ -28,13 +28,13 @@ let { config-f { device = "/dev/${q.vgname}/${q.name}"; } x.content; config.lvm = q: x: - foldl' mergeAttrs {} (mapAttrsToList (name: config-f { inherit name; vgname = x.name; }) x.lvs); + foldl' recursiveUpdate {} (mapAttrsToList (name: config-f { inherit name; vgname = x.name; }) x.lvs); config.partition = q: x: config-f { device = q.device + toString q.index; } x.content; config.table = q: x: - foldl' mergeAttrs {} (imap (index: config-f (q // { inherit index; })) x.partitions); + foldl' recursiveUpdate {} (imap (index: config-f (q // { inherit index; })) x.partitions); create-f = q: x: create.${x.type} q x; -- cgit v1.2.3