Merge branch 'core' into da/lib-with-dep-on-pkgs

This commit is contained in:
David Arnold 2021-03-01 15:16:45 -05:00
commit e37446efb6
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08

View file

@ -64,7 +64,10 @@ let
nixos = { nixos = {
exact = true; exact = true;
from = nodes.nixos.original; from = {
id = "nixos";
type = "indirect";
};
to = { to = {
inherit (nixos) lastModified narHash rev; inherit (nixos) lastModified narHash rev;
@ -72,17 +75,6 @@ let
type = "path"; type = "path";
}; };
}; };
override = {
exact = true;
from = nodes.override.original;
to = {
inherit (override) lastModified narHash rev;
path = override.outPath;
type = "path";
};
};
}; };
system.configurationRevision = lib.mkIf (self ? rev) self.rev; system.configurationRevision = lib.mkIf (self ? rev) self.rev;