Mirrors/impermanence
2
0
Fork 0
mirror of https://github.com/nix-community/impermanence synced 2024-11-10 05:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

nixos: Fix collision detection logic

Browse source 
The logic for detecting whether a file or directory is specified
multiple times was not updated to account for the recent
file/filePath and directory/dirPath changes. This can lead to spurious
failures like the following if the same home-relative path is persisted
for different users:

       Failed assertions:
       - environment.persistence:
           The following directories were specified two or more
           times:
             .cache
             .config
             .local/share
             .local/state
             .gnupg
             .ssh

In addition, the assertion may falsely not trigger in the contrived
situation where the same entity is persisted both in a per-user
configuration (using the relative path) and the global configuration
(using the absolute path).

Fix these situations by checking the absolute paths again using
filePath and dirPath.
This commit is contained in:
Alois Wohlschlager 2023-04-23 16:14:43 +02:00
parent c3f7012dc3
commit 2d575226bf
No known key found for this signature in database
GPG key ID: E0F59EA5E5216914
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos.nix
View file

@ -686,10 +686,10 @@ in
'';
}
{
assertion = duplicates (catAttrs "file" files) == [ ];
assertion = duplicates (catAttrs "filePath" files) == [ ];
message =
let
offenders = duplicates (catAttrs "file" files);
offenders = duplicates (catAttrs "filePath" files);
in
''
environment.persistence:
@ -699,10 +699,10 @@ in
'';
}
{
assertion = duplicates (catAttrs "directory" directories) == [ ];
assertion = duplicates (catAttrs "dirPath" directories) == [ ];
message =
let
offenders = duplicates (catAttrs "directory" directories);
offenders = duplicates (catAttrs "dirPath" directories);
in
''
environment.persistence: