yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib.readFact: change order of arguments

Browse Source
This commit is contained in:
Jörg Thalheim
2024-07-09 14:44:35 +02:00
parent c8e0eeed7b
commit d4d62f8221
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/facts.nix
View File

@@ -4,10 +4,10 @@ let
allMachineNames = lib.mapAttrsToList (name: _: name) (builtins.readDir clanDir); allMachineNames = lib.mapAttrsToList (name: _: name) (builtins.readDir clanDir);
getFactPath = fact: machine: "${clanDir}/${machine}/facts/${fact}"; getFactPath = machine: fact: "${clanDir}/${machine}/facts/${fact}";
readFact = readFact =
fact: machine: machine: fact:
let let
path = getFactPath fact machine; path = getFactPath fact machine;
in in
@@ -24,7 +24,7 @@ let
fact: fact:
let let
machines = allMachineNames; machines = allMachineNames;
facts = lib.genAttrs machines (readFact fact); facts = lib.genAttrs machines (machine: readFact machine fact);
filteredFacts = lib.filterAttrs (_machine: fact: fact != null) facts; filteredFacts = lib.filterAttrs (_machine: fact: fact != null) facts;
in in
filteredFacts; filteredFacts;
@@ -51,7 +51,7 @@ let
let let
# machine -> fact -> factvalue # machine -> fact -> factvalue
machinesFactsAttrs = lib.genAttrs allMachineNames ( machinesFactsAttrs = lib.genAttrs allMachineNames (
machine: lib.genAttrs facts (fact: readFact fact machine) machine: lib.genAttrs facts (fact: readFact machine fact)
); );
# remove all machines which don't have all facts set # remove all machines which don't have all facts set
filteredMachineFactAttrs = lib.filterAttrs ( filteredMachineFactAttrs = lib.filterAttrs (