diff options
| author | Kim Lindberger <kim.lindberger@gmail.com> | 2021-06-18 17:15:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 17:15:08 +0200 |
| commit | 410496d0f378b7510060cd8bff4f77bd101b4af8 (patch) | |
| tree | 184746583670678e7e72ffbec15dc1c8f010a5bb /nixos/lib | |
| parent | 9f78f858f567c94218b4b9a534044c8c7e93e12b (diff) | |
| parent | 7a0c1728acd7d7f5d86a2721e6c5ed1188463597 (diff) | |
| download | nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar.gz nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar.bz2 nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar.lz nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar.xz nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.tar.zst nixpkgs-410496d0f378b7510060cd8bff4f77bd101b4af8.zip | |
Merge pull request #127309 from jakobrs/nixos-normalise-null
Resolve evaluation failure when filesystem device option is null
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/utils.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 1a51b149e56..f1332ab5593 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -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; }; |