Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let
let
f = w: x: builtins.trace "warning: ${w}" x;
in
lib.fold f res res.config.warnings;
lib.foldr f res res.config.warnings;

extendedLib = import ./lib/stdlib-extended.nix lib;

Expand Down
2 changes: 1 addition & 1 deletion modules/misc/nixpkgs-disabled.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ let
traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
in
traceXIfNot isConfig;
merge = args: lib.fold (def: mergeConfig def.value) { };
merge = args: lib.foldr (def: mergeConfig def.value) { };
};

# Copied from nixpkgs.nix.
Expand Down
2 changes: 1 addition & 1 deletion modules/misc/nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
in
traceXIfNot isConfig;
merge = args: lib.fold (def: mergeConfig def.value) { };
merge = args: lib.foldr (def: mergeConfig def.value) { };
};

overlayType = lib.mkOptionType {
Expand Down
2 changes: 1 addition & 1 deletion modules/services/udiskie.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
types
;

mergeSets = sets: lib.lists.fold lib.attrsets.recursiveUpdate { } sets;
mergeSets = sets: lib.lists.foldr lib.attrsets.recursiveUpdate { } sets;

yaml = pkgs.formats.yaml { };

Expand Down
2 changes: 1 addition & 1 deletion modules/services/way-displays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
mkOption
types
;
mergeSets = sets: lists.fold attrsets.recursiveUpdate { } sets;
mergeSets = sets: lists.foldr attrsets.recursiveUpdate { } sets;
cfg = config.services.way-displays;
yaml = pkgs.formats.yaml { };
in
Expand Down