aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-05 17:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Lib/Attrsets]: attempt to fix merge with priority

Browse source
This commit is contained in:
Antoine Viallon 2024-10-11 22:58:01 +02:00
parent 1c7ee1e60a
commit ecff52be0a
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/attrsets.nix
View file

@ -7,7 +7,15 @@ rec {
else else
lib.modules.defaultOverridePriority lib.modules.defaultOverridePriority
; ;
comparePriority = a: b: (getPriority a) - (getPriority b); _getContent = x:
if isAttrs x && (attrByPath [ "_type" ] "" x) == "override" then
getAttr "content" x
else
x
;
# lower priority = higher precedence. If (comparePriority a b) is positive, b has higher precedence.
comparePriority = a: b: myLib.debug.traceValWithPrefix "comparePriority" (getPriority a) - (getPriority b);
mergeAttrsRecursiveWithPriority = a: b: mergeAttrsRecursiveWithPriority = a: b:
let let
_prio = comparePriority a b; _prio = comparePriority a b;
@ -15,9 +23,9 @@ rec {
if _prio == 0 then if _prio == 0 then
_mergeAttrsRecursive mergeAttrsRecursiveWithPriority a b _mergeAttrsRecursive mergeAttrsRecursiveWithPriority a b
else if _prio > 0 then else if _prio > 0 then
a _getContent b
else else
b _getContent a
; ;
mergeAttrsRecursive = a: b: _mergeAttrsRecursive _mergeAttrsRecursive a b; mergeAttrsRecursive = a: b: _mergeAttrsRecursive _mergeAttrsRecursive a b;