1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-02 15:11:03 +01:00

treewide: fold -> foldr

deprecated in f4d36941eb
This commit is contained in:
zowoq 2025-11-26 19:48:27 +10:00 committed by Austin Horstman
parent f4cb25928f
commit ceb884e4f3
5 changed files with 5 additions and 5 deletions

View file

@ -18,7 +18,7 @@ let
let let
f = w: x: builtins.trace "warning: ${w}" x; f = w: x: builtins.trace "warning: ${w}" x;
in in
lib.fold f res res.config.warnings; lib.foldr f res res.config.warnings;
extendedLib = import ./lib/stdlib-extended.nix lib; extendedLib = import ./lib/stdlib-extended.nix lib;

View file

@ -46,7 +46,7 @@ let
traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false; traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
in in
traceXIfNot isConfig; traceXIfNot isConfig;
merge = args: lib.fold (def: mergeConfig def.value) { }; merge = args: lib.foldr (def: mergeConfig def.value) { };
}; };
# Copied from nixpkgs.nix. # Copied from nixpkgs.nix.

View file

@ -43,7 +43,7 @@ let
traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false; traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
in in
traceXIfNot isConfig; traceXIfNot isConfig;
merge = args: lib.fold (def: mergeConfig def.value) { }; merge = args: lib.foldr (def: mergeConfig def.value) { };
}; };
overlayType = lib.mkOptionType { overlayType = lib.mkOptionType {

View file

@ -11,7 +11,7 @@ let
types types
; ;
mergeSets = sets: lib.lists.fold lib.attrsets.recursiveUpdate { } sets; mergeSets = sets: lib.lists.foldr lib.attrsets.recursiveUpdate { } sets;
yaml = pkgs.formats.yaml { }; yaml = pkgs.formats.yaml { };

View file

@ -17,7 +17,7 @@ let
mkOption mkOption
types types
; ;
mergeSets = sets: lists.fold attrsets.recursiveUpdate { } sets; mergeSets = sets: lists.foldr attrsets.recursiveUpdate { } sets;
cfg = config.services.way-displays; cfg = config.services.way-displays;
yaml = pkgs.formats.yaml { }; yaml = pkgs.formats.yaml { };
in in