Merge pull request #127309 from jakobrs/nixos-normalise-null
Resolve evaluation failure when filesystem device option is null
commit410496d0f378b7510060cd8bff4f77bd101b4af8
authorKim Lindberger <kim.lindberger@gmail.com>
dateFri 18 Jun 2021, 17:15 (5 years ago)
parent9f78f857a0c172
nixos/lib/utils.nix+1−1
@@ -27,7 +27,7 @@ rec {
2727 # *not* a parent of b.device. If we add a slash at the end of each string,
2828 # though, this is not a problem: "/aaa/" is not a prefix of "/aaaa/".
2929 normalisePath = path: "${path}${optionalString (!(hasSuffix "/" path)) "/"}";
30− normalise = mount: mount // { device = normalisePath mount.device;
30+ normalise = mount: mount // { device = normalisePath (toString mount.device);
3131 mountPoint = normalisePath mount.mountPoint;
3232 depends = map normalisePath mount.depends;
3333 };