b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #127309 from jakobrs/nixos-normalise-null

Browse source 
Resolve evaluation failure when filesystem device option is null
This commit is contained in:
Kim Lindberger 2021-06-18 17:15:08 +02:00 committed by GitHub
parent 9f78f858f5 7a0c1728ac
commit 410496d0f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/lib/utils.nix
View file

@ -27,7 +27,7 @@ rec {
# *not* a parent of b.device. If we add a slash at the end of each string,
# though, this is not a problem: "/aaa/" is not a prefix of "/aaaa/".
normalisePath = path: "${path}${optionalString (!(hasSuffix "/" path)) "/"}";
normalise = mount: mount // { device = normalisePath mount.device;
normalise = mount: mount // { device = normalisePath (toString mount.device);
mountPoint = normalisePath mount.mountPoint;
depends = map normalisePath mount.depends;
};