treewide: fold -> foldr

deprecated in NixOS/nixpkgs@f4d3694

Author: zowoq

modules/default.nix

@@ -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;
 

modules/misc/nixpkgs-disabled.nix

@@ -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.

modules/misc/nixpkgs.nix

@@ -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 {

modules/services/udiskie.nix

@@ -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 { };
 

modules/services/way-displays.nix

@@ -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